bug-597,bug-596

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/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/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() {