Browse Source

Merge branch 'dev' of http://172.20.2.8:9091/data_center_platform/MY_MiniApp_Doctor_H5 into dev

liudan 1 week ago
parent
commit
35f2b1e460

+ 5 - 2
src/pages.json

@@ -154,7 +154,8 @@
 		"selectedColor": "#1C86EE",
 		"borderStyle": "white",
 		"backgroundColor": "#fff",
-		"current": 1,
+		/* 消息 Tab 暂不展示,默认选中工作台。恢复消息 Tab 时请改回 1。 */
+		"current": 0,
 		"list": [
 			{
 				"pagePath": "pages/tabBar/home/home",
@@ -162,12 +163,14 @@
 				"iconPath": "static/assets/images/workbench.png",
 				"selectedIconPath": "static/assets/images/workbenchS.png"
 			},
+			/* 消息 Tab 暂时隐藏,保留配置以便后续恢复。
 			{
 				"pagePath": "pages/tabBar/messageCenter/messageCenter",
 				"text": "消息",
 				"iconPath": "static/assets/images/message.png",
 				"selectedIconPath": "static/assets/images/messageS.png"
 			},
+			*/
 			{
 				"pagePath": "pages/tabBar/login/login",
 				"text": "我的",
@@ -469,4 +472,4 @@
 			"van-skeleton": "./wxcomponents/vant/skeleton/index"
 		}
 	}
-}
+}

+ 1 - 13
src/pages/entryWrite/page/Entry/prescription/prescription.vue

@@ -12,12 +12,7 @@
                     <text class="topTitle__sub">西药 <text class="money">¥{{ wesMedAmount }}</text></text>
                     <text class="topTitle__sub">草药 <text class="money">¥{{ herbsAmount }}</text></text>
                 </view>
-                <button
-                    v-if="patientData.changeDataFlag != 'N'"
-                    :class="['addtext', { 'addtext--disabled': !hasMainDiag }]"
-                    :disabled="!hasMainDiag"
-                    @tap="addChange"
-                >
+                <button v-if="patientData.changeDataFlag != 'N'" class="addtext" @tap="addChange">
                     + 添加医嘱
                 </button>
             </view>
@@ -1868,13 +1863,6 @@ export default {
     border: initial;
 }
 
-.addtext--disabled {
-    background-color: #c0c4cc !important;
-    color: #fff !important;
-    opacity: 0.7;
-    pointer-events: none;
-}
-
 .medData {
     border-bottom: 1rpx solid #f0f2f5;
     color: #4b5563;

+ 5 - 0
src/utils/unreadMessage.js

@@ -114,11 +114,16 @@ function markAsRead(receiveID, opts) {
  */
 function updateMessageRedDot(total) {
     try {
+        // 消息 Tab 暂时隐藏,避免未读消息红点显示在当前索引 1 的“我的”Tab 上。
+        uni.hideTabBarRedDot({ index: 1 });
+
+        /* 恢复消息 Tab 后,取消以下注释以恢复未读红点展示逻辑。
         if (total > 0) {
             uni.showTabBarRedDot({ index: 1 });
         } else {
             uni.hideTabBarRedDot({ index: 1 });
         }
+        */
     } catch (e) {
         console.warn('[unreadMessage] updateMessageRedDot failed:', e);
     }