From 045cc559ee9ebeb037cb40d31eb0ad502f6ee6dc Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Wed, 14 Dec 2022 17:35:41 +0800 Subject: [PATCH] 测试优化 --- packageA/pages/cart2_ser/cart2_ser.js | 3 +++ packageA/pages/chongzhiDetails/chongzhiDetails.js | 5 ++++- packageA/pages/details_serviceCard/details_serviceCard.js | 3 +++ packageA/pages/myGift/myGift.js | 3 +++ packageA/pages/myGiftDetails/myGiftDetails.js | 3 +++ packageC/pages/presell/cart/cart.js | 3 +++ packageD/pages/user/deposit/prepaid/prepaid.js | 4 +++- packageD/pages/user/integral/integral.js | 4 +++- pages/cart/cart_wk/cart_wk.js | 3 +++ pages/giftpack/public/buy_com.js | 3 +++ pages/user/index/index.js | 39 ++++++++++++++++++++++----------------- pages/user/order_list/order_list.js | 3 +++ utils/pay.js | 2 ++ utils/pay2.js | 3 +++ 14 files changed, 61 insertions(+), 20 deletions(-) diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index d1c6436..33d35d4 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -685,6 +685,9 @@ Page({ //------调起支付框-------- weixinPay: function(n, success, fail) { if (!n) return false; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(n.timeStamp), nonceStr: n.nonceStr, diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.js b/packageA/pages/chongzhiDetails/chongzhiDetails.js index 9f3a239..d1703b3 100644 --- a/packageA/pages/chongzhiDetails/chongzhiDetails.js +++ b/packageA/pages/chongzhiDetails/chongzhiDetails.js @@ -217,7 +217,10 @@ Page({ //------调起支付框-------- weixinPay: function (n, success, fail) { - if(!n) return false; + if(!n) return false; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(n.timeStamp), nonceStr: n.nonceStr, diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js index 58d8e54..04c47ae 100644 --- a/packageA/pages/details_serviceCard/details_serviceCard.js +++ b/packageA/pages/details_serviceCard/details_serviceCard.js @@ -530,6 +530,9 @@ Page({ weixinPay: function(n, success, fail) { if (!n) return false; let order_id = this.data.details.order_id; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(n.timeStamp), nonceStr: n.nonceStr, diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js index 0d0c2af..a96d9c9 100644 --- a/packageA/pages/myGift/myGift.js +++ b/packageA/pages/myGift/myGift.js @@ -295,6 +295,9 @@ Page({ success:function(res) { if (res.data.code == 0 && res.data.data) { res = res.data.data; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(res.timeStamp), nonceStr: res.nonceStr, diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js index 6fef320..a031e86 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.js +++ b/packageA/pages/myGiftDetails/myGiftDetails.js @@ -235,6 +235,9 @@ Page({ success:function(res) { if (res.data.code == 0 && res.data.data) { res = res.data.data; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(res.timeStamp), nonceStr: res.nonceStr, diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 1d27fc8..92acd2c 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -2391,6 +2391,9 @@ Page({ weixinPay: function (n, success, fail) { if (!n) return false; var th = this; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(n.timeStamp), nonceStr: n.nonceStr, diff --git a/packageD/pages/user/deposit/prepaid/prepaid.js b/packageD/pages/user/deposit/prepaid/prepaid.js index afe3e57..24b8c98 100644 --- a/packageD/pages/user/deposit/prepaid/prepaid.js +++ b/packageD/pages/user/deposit/prepaid/prepaid.js @@ -182,7 +182,9 @@ Page({ //------调起支付框-------- weixinPay: function (n, success, fail) { - if(!n) return false; + if(!n) return false; + + getApp().globalData.no_clear=1; wx.requestPayment({ timeStamp: String(n.timeStamp), diff --git a/packageD/pages/user/integral/integral.js b/packageD/pages/user/integral/integral.js index b856599..b4c5134 100644 --- a/packageD/pages/user/integral/integral.js +++ b/packageD/pages/user/integral/integral.js @@ -283,7 +283,9 @@ Page({ //------调起支付框-------- weixinPay: function (n, success, fail) { - if(!n) return false; + if(!n) return false; + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(n.timeStamp), nonceStr: n.nonceStr, diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index ddca7b3..fe743b7 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -896,6 +896,9 @@ Page({ weixinPay: function (n, success, fail) { if (!n) return false; var th = this; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(n.timeStamp), nonceStr: n.nonceStr, diff --git a/pages/giftpack/public/buy_com.js b/pages/giftpack/public/buy_com.js index 064d8a5..9c9dbbb 100644 --- a/pages/giftpack/public/buy_com.js +++ b/pages/giftpack/public/buy_com.js @@ -255,6 +255,9 @@ module.exports = { if (!res) return false; var money=that.data.payMoney; var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(res.timeStamp), nonceStr: res.nonceStr, diff --git a/pages/user/index/index.js b/pages/user/index/index.js index cb9194b..4876943 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -175,6 +175,9 @@ Page({ /*------会员登录------*/ var e = getApp().globalData.userInfo; + + + if (e != undefined && e != null && e.mobile) { @@ -186,21 +189,20 @@ Page({ vipid: e.erpvipid, }; - - var url = '/api/weshop/delphiapi/pageErpApi?accdb='+getApp().globalData.config.erpid; - getApp().request.promiseGet(url, { - data: portrait_req - }) - .then((res) => { - if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { - this.setData({has_rj:1}) - }else { - this.setData({has_rj:-1}) - } - + getApp().getConfig(()=>{ + var url = '/api/weshop/delphiapi/pageErpApi?accdb='+getApp().globalData.config.erpid; + getApp().request.promiseGet(url, { + data: portrait_req }) + .then((res) => { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { + th.setData({has_rj:1}) + }else { + th.setData({has_rj:-1}) + } - + }) + }) } @@ -492,12 +494,15 @@ Page({ setTimeout(function () { th.setData({ is_show_recommend:true }) - if (getApp().globalData.user_id) getApp().requestCardNum(th); var goods_list = th.selectComponent("#goods_recommend"); //组件的id - goods_list.init(); - goods_list.get_list(); - }, 800) + + if(goods_list){ + goods_list.init(); + goods_list.get_list(); + } + + }, 1000) } diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 272c54d..4280e7f 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -2537,6 +2537,9 @@ Page({ weixinPay: function(n, success, fail) { if (!n) return false; // let order_id = item.order_id; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(n.timeStamp), nonceStr: n.nonceStr, diff --git a/utils/pay.js b/utils/pay.js index 114e7d5..9de93af 100644 --- a/utils/pay.js +++ b/utils/pay.js @@ -70,6 +70,8 @@ module.exports = { weixinPay: function(n, e, a) { if(!n) return false; + getApp().globalData.no_clear=1; + //有的话用最新的支付方式 if(n.orderInfo) { wx.requestOrderPayment({ diff --git a/utils/pay2.js b/utils/pay2.js index cf7f027..cc67d43 100644 --- a/utils/pay2.js +++ b/utils/pay2.js @@ -43,6 +43,9 @@ module.exports = { }, weixinPay: function(n, succ,fail) { if(!n) return false; + + getApp().globalData.no_clear=1; + wx.requestPayment({ timeStamp: String(n.timeStamp), nonceStr: n.nonceStr, -- libgit2 0.21.4