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

# Conflicts:
#	miniprogram/module/care/pages/offlineTreatment/offlineTreatment.wxml

miniprogram/module/article/pages/success-page/success-page.scss

@@ -1,6 +1,6 @@
 @import "../../../../themes/page.scss";
 @import "../../searc-list.scss";
-/* module/diet/pages/diet-info/diet-info.wxss */
+/* module/diet/pages/success-page/success-page.wxss */
 
 .page-scroll__container {
   background: white;

miniprogram/module/article/pages/success-page/success-page.ts

@@ -24,7 +24,10 @@ Page({
     }
   },
     onBackOrderList() {
-      wx.redirectTo({ url: '/module/article/pages/order-list/order-list' });
+      // wx.redirectTo({ url: '/module/article/pages/order-list/order-list' });
+      // 先到「我的」再自动进订单列表，这样订单列表返回时栈上是「我的」
+      wx.setStorageSync("fromSuccessToOrderList", "1");
+      wx.redirectTo({ url: "/pages/mine/mine" });
     },
     async load() {
       wx.showLoading({ title: '加载中' });

miniprogram/module/care/pages/careDetail/careDetail.wxml

@@ -112,7 +112,7 @@
               </view>
               <view class="scheme-row light">
                 <text class="text-gray">数量：</text>
-                <text>{{item.totalMeasure}}{{item.conditioningProgramDetail.cpFixedPricingRule.convertUnit}}</text>
+                <text>{{item.totalMeasure}}{{item.pricingUnit}}</text>
 
               </view>
               <view class="scheme-row between">

miniprogram/module/care/pages/offlineTreatment/offlineTreatment.wxml

@@ -25,15 +25,15 @@
             </view>
             <view class="row">
               <text class="sub-label">频次：</text>
-              每{{item.frequencyType}}天{{item.frequencyMeasure}}{{item.convertUnit ? item.convertUnit : '次'}}
+              每{{item.frequencyType}}天{{item.frequencyMeasure}}{{item.convertUnit?item.convertUnit: '次'}}
             </view>
             <view class="row">
               <text class="sub-label">下次时间：</text>
-              {{item.arrangeDate ? item.arrangeDate : '-'}} {{item.arrangeTime ? item.arrangeTime : ''}}{{item.applyTime ? '(已预约)' : ''}}
+              {{item.arrangeDate?item.arrangeDate: '-'}} {{item.arrangeTime ?item.arrangeTime: ''}}{{item.applyTime?'(已预约)':''}}
             </view>
             <view class="row" wx:if="{{item.pieTime}}">
               <text class="sub-label">机构：</text>
-              {{item.conditioningProgramSupplierName ? item.conditioningProgramSupplierName : '-'}}
+              {{item.conditioningProgramSupplierName || '-'}}
             </view>
             <view class="divider"></view>
           </view>

miniprogram/module/health/components/care-record/care-record.ts

@@ -27,7 +27,7 @@ Component({
       const name = e.currentTarget.dataset.name;
       if (id) {
         wx.navigateTo({
-          url: `/module/care/pages/careDetail/careDetail?id=${id}&name=${name}`,
+          url: `/module/care/pages/careDetail/careDetail?id=${id}&name=${name ? name : ''}`,
         });
       } else {
         wx.showToast({

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

@@ -53,7 +53,7 @@ Component({
     goToProductPage() {
       wx.setStorageSync('healthAnalysisReportId', this.data.id);
       if (this.data.id) {
-        wx.navigateTo({
+        wx.redirectTo({
           url: `/module/order/pages/select-goods/select-goods?healthAnalysisReportId=${this.data.id}`,
           fail: (err) => {
             getTickleContext.call(this).showWarnMessage(err.errMsg || "跳转失败");

miniprogram/module/order/pages/confirme-order/confirme-order.ts

@@ -226,17 +226,12 @@ Page({
           this.setData({ isPaymentLoading: false });
           if (error?.errMsg === 'requestPayment:fail cancel') {
             // 支付取消跳到支付订单页面
-            setTimeout(() => {
-              wx.redirectTo({
-                url: '/module/article/pages/order-list/order-list',
-              });
-              return;
-            }, 2000);
+            wx.navigateBack({ delta: 1 });
           }
-          wx.showToast({
-            title: error?.errMsg || error?.message || "支付失败，请重试",
-            icon: "none",
-          });
+          // wx.showToast({
+          //   title: error?.errMsg || error?.message || "支付失败，请重试",
+          //   icon: "none",
+          // });
         });
       } else {
         wx.showToast({

miniprogram/module/order/pages/order-detail/order-detail.ts

@@ -184,19 +184,14 @@ Page({
         }, (error: any) => {
           this.setData({ isPaymentLoading: false });
           if (error?.errMsg === 'requestPayment:fail cancel') {
-            // 支付取消跳到支付订单页面
-            setTimeout(() => {
-              wx.redirectTo({
-                url: '/module/article/pages/order-list/order-list',
-              });
-              return;
-            }, 2000);
+          // 支付取消跳到支付订单页面
+            wx.navigateBack({ delta: 1 });
           }
           console.log(error, '支付失败');
-          wx.showToast({
-            title: error?.errMsg || error?.message || "支付失败，请重试",
-            icon: "none",
-          });
+          // wx.showToast({
+          //   title: error?.errMsg || error?.message || "支付失败，请重试",
+          //   icon: "none",
+          // });
         });
       } else {
         wx.showToast({

miniprogram/module/order/pages/other-detail/other-detail.ts

@@ -215,18 +215,13 @@ Page({
         }, (error: any) => {
           this.setData({ isPaymentLoading: false });
           if (error?.errMsg === 'requestPayment:fail cancel') {
-            // 支付取消跳到支付订单页面
-            setTimeout(() => {
-              wx.redirectTo({
-                url: '/module/article/pages/order-list/order-list',
-              });
-              return;
-            }, 2000);
+           // 支付取消跳到支付订单页面
+            wx.navigateBack({ delta: 1 });
           }
-          wx.showToast({
-            title: error.errMsg || "支付失败，请重试",
-            icon: "none",
-          });
+          // wx.showToast({
+          //   title: error.errMsg,
+          //   icon: "none",
+          // });
         });
       } else {
         wx.showToast({

miniprogram/pages/home/home.wxml

@@ -113,7 +113,8 @@
                     </view>
                     <view>频次：每{{item.frequencyType}}天{{item.frequencyMeasure}}{{item.convertUnit?item.convertUnit:'次'}}</view>
                     <view>开具医生：{{item.operateBy}}</view>
-                    <view wx:if="{{item.sellType==='2'}}" class="ins-box"><text>机构：</text><text class="copyable-text" catchlongpress="onCopyInstitutionName" data-name="{{item.conditioningProgramSupplierName}}">{{item.conditioningProgramSupplierName??'-'}}</text></view>
+                    <view wx:if="{{item.sellType==='2'}}" class="ins-box"><text>机构：</text><text class="copyable-text" catchlongpress="onCopyInstitutionName" data-name="{{item.conditioningProgramSupplierName}}">
+                    {{item.conditioningProgramSupplierName?item.conditioningProgramSupplierName:'-'}}</text></view>
                   </view>
                 </view>
                 <view data-id="{{item.id}}" wx:if="{{item.sellType!=='2'}}" class="verify-record" bindtap="isGoPunchcard" data-signinTime="{{item.signinTime}}">{{

miniprogram/pages/mine/mine.ts

@@ -223,6 +223,14 @@ Page({
   onShow() {
     // 如果需要每次显示页面时刷新数据，可以在这里调用 load
     this.load();
+    // 从支付成功页点「返回订单列表」时，自动打开订单列表，返回时回到本页
+    const fromSuccess = wx.getStorageSync("fromSuccessToOrderList");
+    if (fromSuccess) {
+      wx.removeStorageSync("fromSuccessToOrderList");
+      wx.navigateTo({
+        url: "/module/article/pages/order-list/order-list?tab=all",
+      });
+    }
   },
   // 足迹
   toFootPrintPage() {