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

# Conflicts:
#	.idea/workspace.xml

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>