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

.idea/workspace.xml

@@ -4,10 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ade0a8c5-0639-4f05-956a-aae1181b5d18" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/app.config.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/app.config.ts" afterDir="false" />
-    </list>
+    <list default="true" id="ade0a8c5-0639-4f05-956a-aae1181b5d18" name="更改" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -29,7 +26,7 @@
     "ModuleVcsDetector.initialDetectionPerformed": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.git.unshallow": "true",
-    "git-widget-placeholder": "release/2.0.1",
+    "git-widget-placeholder": "develop",
     "junie.onboarding.icon.badge.shown": "true",
     "last_opened_file_path": "/Users/zhangtiantian/Desktop/six-health.applet",
     "node.js.detected.package.eslint": "true",
@@ -58,6 +55,7 @@
       <workItem from="1749202494220" duration="720000" />
       <workItem from="1749523832830" duration="2478000" />
       <workItem from="1754882475936" duration="7606000" />
+      <workItem from="1773195628315" duration="675000" />
     </task>
     <servers />
   </component>

miniprogram/module/article/pages/order-list/order-list.ts

@@ -8,12 +8,22 @@ import {
   orderCancelMethod,
   orderPayMethod,
 } from "../../request";
+import I18nBehavior from "../../../../i18n/behavior";
 
 // module/article/pages/order-list/order-list.ts
+const i18n = {
+  orderText: {
+    mineOrder: "我的服务",
+    paying: "待确认",
+    paid: "已确认",
+    paySuccess: "已完成",
+  },
+};
 Page({
-  behaviors: [PageContainerBehavior, tickleBehavior],
+  behaviors: [PageContainerBehavior, tickleBehavior,I18nBehavior],
   properties: {},
   data: {
+    i18n,
     showConfirm: false,
     currentTab: "all", // 当前选中的标签
     orders: [],

miniprogram/module/article/pages/order-list/order-list.wxml

@@ -1,10 +1,10 @@
 <!--module/diet/pages/delivery-address/delivery-address.wxml-->
-<t-navbar title="我的订单" left-arrow bindtap="goMine" />
+<t-navbar title="{{i18n.orderText.mineOrder}}" left-arrow bindtap="goMine" />
 <t-tabs value="{{currentTab}}" bindchange="onTabChange">
   <t-tab-panel label="全部" value="all" />
-  <t-tab-panel label="待付款" value="pending" />
-  <t-tab-panel label="已付款" value="paid" />
-  <t-tab-panel label="交易成功" value="completed" />
+  <t-tab-panel label="{{i18n.orderText.paying}}" value="pending" />
+  <t-tab-panel label="{{i18n.orderText.paid}}" value="paid" />
+  <t-tab-panel label="{{i18n.orderText.paySuccess}}" value="completed" />
     <!-- <t-tab-panel label="交易关闭" value=closed" /> -->
 </t-tabs>
 

miniprogram/module/health/pages/scheme/scheme.ts

@@ -22,6 +22,7 @@ Component({
     i18n: {
       report: { title: '报告' },
       scheme: { title: '方案', date: '' },
+      orderText:{goPay:'去确认'}
     },
     dataset: null,
     schemeId: "",

miniprogram/module/health/pages/scheme/scheme.wxml

@@ -48,7 +48,7 @@
   
   <!-- 底部固定去购买按钮 -->
   <view class="scheme-bottom-buy-btn" style="padding-bottom: {{container.safeBottomOffset-10}}px;" bindtap="goToProductPage" wx:if="{{true}}">
-    <view class="buy-btn-text">去购买</view>
+    <view class="buy-btn-text">{{i18n.orderText.goPay}}</view>
   </view>
 </view>
 <t-message id="{{$messageId}}"></t-message>

miniprogram/module/order/pages/select-goods/select-goods.ts

@@ -3,10 +3,11 @@ import PageContainerBehavior from "../../../../core/behavior/page-container.beha
 import tickleBehavior, {
   getTickleContext,
 } from "../../../../core/behavior/tickle.behavior";
+import I18nBehavior from "../../../../i18n/behavior";
 import { getOfflineTreatmentListMethod } from "../../request";
 // module/order/pages/select-goods/select-goods.ts
 Component({
-  behaviors: [PageContainerBehavior, DictionariesBehavior, tickleBehavior],
+  behaviors: [PageContainerBehavior, DictionariesBehavior, tickleBehavior,I18nBehavior],
   lifetimes: {
     attached() {
       const healthAnalysisReportId = wx.getStorageSync('healthAnalysisReportId'); 
@@ -32,6 +33,12 @@ Component({
     selectAll: true,
     selectedCount: 0,
     totalPrice: 0,
+    i18n: {
+      orderText: {
+        selectGoods: '选择',
+        payMeant:'确认'
+      }
+    }
   },
   observers: {
     'goodsList': function () {

miniprogram/module/order/pages/select-goods/select-goods.wxml

@@ -1,5 +1,5 @@
 <!--module/order/pages/select-goods/select-goods.wxml-->
-<t-navbar title="选择商品" left-arrow />
+<t-navbar title="{{i18n.orderText.selectGoods}}" left-arrow />
 <scroll-view class="page-scroll__container" type="list" scroll-y style="{{containerStyle}}">
   <view class="info-box"></view>
   <!-- 商品列表 -->
@@ -51,6 +51,6 @@
     <text class="footer-price">¥{{totalPrice}}</text>
   </view>
   <view class="footer-right">
-    <view class="checkout-btn" bind:tap="onCheckout">结算</view>
+    <view class="checkout-btn" bind:tap="onCheckout">{{i18n.orderText.payMeant}}</view>
   </view>
 </view>

miniprogram/pages/mine/mine.ts

@@ -2,20 +2,29 @@ import I18nBehavior from "../../i18n/behavior";
 import { getPatients, getPatientPhone } from "../home/request";
 import { toCertificationPage } from "../home/router";
 import { getOrderList, getRecordCountMethod } from "../home/request";
+
+const i18n = {
+  consultChat: { title: "记录" },
+  offlineTreatment: { title: "线下" },
+  healthTeach: { title: "分享文章" },
+  health: { title: "档案" },
+  home: {
+    __showRecord__: false,
+    tea: "茶",
+    tonic: "菜谱",
+  },
+  orderText: {
+    mineOrder: "我的服务",
+    paying: "待确认",
+    paid: "已确认",
+    paySuccess: "已完成",
+  },
+};
+
 Page({
   behaviors: [I18nBehavior],
   data: {
-    i18n: {
-      consultChat: { title: '记录' },
-      offlineTreatment: { title: '线下' },
-      healthTeach: { title: '分享文章' },
-      health: { title: '档案' },
-      home: {
-        __showRecord__: false,
-        tea: '茶',
-        tonic: '菜谱',
-      }
-    },
+    i18n,
     patients: [] as (App.Patient.Model & { isDefault: "Y" | "N" })[],
     patient: null as App.Patient.Model | null,
     patientDescription: "",
@@ -26,21 +35,21 @@ Page({
     mineOrderList: [
       {
         url: "../../assets/icon/obligation@3x.png",
-        name: "待付款",
+        name: i18n.orderText.paying,
         count: 0,
         type: 1,
         tab: "pending",
       },
       {
         url: "../../assets/icon/delivery@3x.png",
-        name: "已付款",
+        name: i18n.orderText.paid,
         count: 0,
         type: 2,
         tab: "paid",
       },
       {
         url: "../../assets/icon/deal@3x.png",
-        name: "交易成功",
+        name: i18n.orderText.paySuccess,
         count: 0,
         type: 3,
         tab: "completed",

miniprogram/pages/mine/mine.wxml

@@ -17,7 +17,7 @@
     </view>
 
     <view class="order-container">
-      <view class="title">我的订单</view>
+      <view class="title">{{i18n.orderText.mineOrder}}</view>
       <view class="content-container">
         <view class="content-box" catch:tap="toOrderListPage" wx:for="{{mineOrderList}}" wx:key="{{item.type}}" data-tab="{{item.tab}}">
           <t-badge :count="{{item.count}}" offset="{{ [2, -2] }}">