Merge branch 'story-237' of ssh://121.43.162.141:10022/six.fe/health.applet into story-238

# Conflicts:
#	miniprogram/pages/home/home.wxml

miniprogram/app.json

@@ -136,8 +136,7 @@
     "t-navbar": "tdesign-miniprogram/navbar/navbar",
     "t-message": "tdesign-miniprogram/message/message",
     "popup-user-auth": "./components/popup-user-auth/popup-user-auth",
-    "popup-privacy": "./components/popup-privacy/popup-privacy",
-    "towxml": "./towxml/towxml"
+    "popup-privacy": "./components/popup-privacy/popup-privacy"
   },
   "requiredPrivateInfos": [
     "getFuzzyLocation",

miniprogram/module/chats/components/message-consult/message-consult.json

@@ -5,7 +5,8 @@
   "usingComponents": {
     "t-cell": "tdesign-miniprogram/cell/cell",
     "t-icon": "tdesign-miniprogram/icon/icon",
-    "user-avatar": "../../../../components/user-avatar/user-avatar"
+    "user-avatar": "../../../../components/user-avatar/user-avatar",
+    "towxml": "../../towxml/towxml"
   }
 }
 

miniprogram/module/chats/towxml/decode.json

@@ -0,0 +1,13 @@
+{
+  "component": true,
+  "usingComponents": {
+    "decode": "./decode",
+    "audio-player": "./audio-player/audio-player",
+    "echarts": "./echarts/echarts",
+    "latex": "./latex/latex",
+    "table": "./table/table",
+    "todogroup": "./todogroup/todogroup",
+    "yuml": "./yuml/yuml",
+    "img": "./img/img"
+  }
+}

miniprogram/pages/mine/mine.ts

@@ -15,9 +15,7 @@ const i18n = {
   },
   orderText: {
     mineOrder: "我的服务",
-    paying: "待确认",
-    paid: "已确认",
-    paySuccess: "已完成",
+    payStatusList:['待确认','已确认','已完成','全部'],
   },
 };
 
@@ -35,21 +33,21 @@ Page({
     mineOrderList: [
       {
         url: "../../assets/icon/obligation@3x.png",
-        name: i18n.orderText.paying,
+        // name: i18n.orderText.paying,
         count: 0,
         type: 1,
         tab: "pending",
       },
       {
         url: "../../assets/icon/delivery@3x.png",
-        name: i18n.orderText.paid,
+        // name: i18n.orderText.paid,
         count: 0,
         type: 2,
         tab: "paid",
       },
       {
         url: "../../assets/icon/deal@3x.png",
-        name: i18n.orderText.paySuccess,
+        // name: i18n.orderText.paySuccess,
         count: 0,
         type: 3,
         tab: "completed",

miniprogram/pages/mine/mine.wxml

@@ -23,8 +23,7 @@
           <t-badge :count="{{item.count}}" offset="{{ [2, -2] }}">
             <image src="{{item.url}}" class="status-img" />
           </t-badge>
-
-          <view class="content-title">{{item.name}}</view>
+          <view class="content-title">{{i18n.orderText.payStatusList[index]}}</view>
         </view>
       </view>
     </view>

miniprogram/towxml/decode.json

@@ -1,13 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "decode": "/towxml/decode",
-    "audio-player": "/towxml/audio-player/audio-player",
-    "echarts": "/towxml/echarts/echarts",
-    "latex": "/towxml/latex/latex",
-    "table": "/towxml/table/table",
-    "todogroup": "/towxml/todogroup/todogroup",
-    "yuml": "/towxml/yuml/yuml",
-    "img": "/towxml/img/img"
-  }
-}