黄琪勇 5 tháng trước cách đây
mục cha
commit
d86d86b915

+ 1 - 1
miniprogram/config.ts

@@ -1,4 +1,4 @@
-const environmentVariable = "test";
+const environmentVariable = "dev";
 const apiUrlInfo = {
   dev: "https://dev.kt.colexiu.com",
   test: "https://test.kt.colexiu.com",

+ 3 - 3
miniprogram/pages/index/index.ts

@@ -194,9 +194,6 @@ Page({
       wx.navigateTo({
         url: `../orders/order-detail?orderInfo=${info}&instrumentsInfo=${instrumentsInfo}&memberInfo=${memberInfo}`,
         success: () => {
-          that.setData({
-            memberInfo: {}
-          })
         }
       })
     }, 300)()
@@ -229,6 +226,9 @@ Page({
   onShow() {
     if (!this.data.isFromPreviewImage && !this.data.popupShow) {
       this.onInit()
+      this.setData({
+        memberInfo: {}
+      })
     } else {
       this.setData({
         isFromPreviewImage: false

+ 1 - 1
miniprogram/pages/orders/order-detail.ts

@@ -128,7 +128,7 @@ Page({
     // 清除上一个页面的弹窗 有弹窗的时候数据返回回去数据才会刷新
     const pages = getCurrentPages();
     const prevPage = pages[pages.length - 2];
-    prevPage.setData({ popupShow: false });
+    prevPage.setData({ popupShow: false, memberInfo: {} });
     try {
       const { salePrice, shopId, name, id, orderNo } = this.data.goodsInfo
       if (orderNo) {

+ 20 - 2
miniprogram/pages/orders/orders.ts

@@ -238,7 +238,16 @@ Page({
         this.onExecutePay(paymentConfig, paymentType, orderNo)
       } else {
         this.onPayError()
-        this.getList()
+        this.setData(
+          {
+            page: 1,
+            maxPage: 1,
+            recordList: [],
+          },
+          () => {
+            this.getList();
+          }
+        );
       }
     } catch {
       wx.hideLoading()
@@ -259,7 +268,16 @@ Page({
         if (res.data.code === 200) {
           this.onPaying(paymentType, res.data.data.reqParams, orderNo)
         } else {
-          this.getList()
+          this.setData(
+            {
+              page: 1,
+              maxPage: 1,
+              recordList: [],
+            },
+            () => {
+              this.getList();
+            }
+          );
           this.onPayError(res.data.message)
         }
       },