测试优化

yvan.ni
1 parent 25388e8d
Showing 14 changed files with 61 additions and 20 deletions
packageA/pages/cart2_ser/cart2_ser.js
packageA/pages/chongzhiDetails/chongzhiDetails.js
packageA/pages/details_serviceCard/details_serviceCard.js
packageA/pages/myGift/myGift.js
packageA/pages/myGiftDetails/myGiftDetails.js
packageC/pages/presell/cart/cart.js
packageD/pages/user/deposit/prepaid/prepaid.js
packageD/pages/user/integral/integral.js
pages/cart/cart_wk/cart_wk.js
pages/giftpack/public/buy_com.js
pages/user/index/index.js
pages/user/order_list/order_list.js
utils/pay.js
utils/pay2.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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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),
@@ -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,
@@ -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,
@@ -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,
@@ -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)
 		}
@@ -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,
@@ -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({
@@ -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,