From 912dffb09ec6db9d2676089645fa98c4a57ed3a9 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 15 Jan 2021 14:14:48 +0800
Subject: [PATCH] 1.   拼团的重复支付 2.   会员首页的脚本错误纠正

---
 pages/cart/cart2_pt/cart2_pt.js | 21 +++++++++++++++------
 pages/user/index/index.js       | 15 +++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index ed7c615..2096ab6 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -585,7 +585,7 @@ Page({
           'content-type': 'application/json'
         },// 设置请求的 header
         success: function (res) {
-          th.data.is_summit_ing=0;  //是否提交中
+         
           wx.hideLoading();
           if (res.statusCode == 200) {
               var data=res.data;
@@ -613,15 +613,18 @@ Page({
                     // }, 1);
                     util_pay.pay(data.data, function() {
                         setTimeout(function () {
-                            wx.navigateTo({
+                            wx.redirectTo({
                                //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data,
-															 url: "/pages/team/team_success/team_success?ordersn=" + data.data,
+							   url: "/pages/team/team_success/team_success?ordersn=" + data.data,
                             })
                         },1000)
                     }, function () {
                         //支付失败
                         setTimeout(function () {
-                            wx.navigateBack({ delta: 1 })
+                            //wx.navigateBack({ delta: 1 })
+							wx.redirectTo({
+							  url: "/pages/user/order_list/order_list",
+							})
                         },1000)
 
                     },oo.stoid,1);
@@ -647,9 +650,12 @@ Page({
                               url: "/pages/user/order_list/order_list",
                             })--*/
                             var url="/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data;
-                            getApp().goto(url);
+                            wx.redirectTo({
+								url: url  
+							})
+							
                         }else{
-                            wx.navigateTo({
+                            wx.redirectTo({
                               url: "/pages/team/team_success/team_success?ordersn=" + data.data,
                             })
                         }
@@ -661,13 +667,16 @@ Page({
                 }
               }
               else{
+				 th.data.is_summit_ing=0;  //是否提交中
                  getApp().confirmBox(data.msg);
               }
           } else {
+			th.data.is_summit_ing=0;  //是否提交中
             console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
           }
         },
         fail: function () {
+		  th.data.is_summit_ing=0;  //是否提交中	
           wx.hideLoading();
           console.log("index.js wx.request CheckCallUser fail");
         },
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 5bab8c8..e9b1a5e 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -143,12 +143,15 @@ Page({
         /*-----获取线下会员的预存款和优惠券的数量-----*/
         rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, {
           success: function(su) {
-            var data = su.data.data;
-			if(!data) data={};
-            data.cashcount = parseInt(data.cashcount);
-            s.setData({
-              udata: data,
-            });
+			 if(su.data.code==0 && su.data.data ) {
+				 var data = su.data.data;
+				 if(!data) data={};
+				 data.cashcount = parseInt(data.cashcount);
+				 s.setData({
+				   udata: data,
+				 });
+			 }
+           
           }
         })
         /*-----获取会员提现金额-----*/
--
libgit2 0.21.4