From 87bfec957ea181108dfdef92add83b881c783a56 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 9 Oct 2020 17:42:57 +0800
Subject: [PATCH] 1.   绑定如果失败，要重新授权 2.   秒杀  等级卡显示 购买返回 3.  参团分享图

---
 pages/cart/cart2/cart2.js               | 10 +++++++++-
 pages/team/team_success/team_success.js |  3 ++-
 pages/togoin/togoin.js                  |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 5a5093e..3316f53 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -365,11 +365,17 @@ Page({
 		  
 		  //-- 如果是等级会员注册返回 --
 		  if(is_card_back){	
-			  th.data.card_name=th.data.userinfo.card_field;
+			  th.data.card_name=th.data.userinfo.card_field;			  
+			  //如果是秒杀的返回，就要把活动弄回0
+			  if(item['prom_type']==1){
+				  item['prom_type']=0;
+				  item['prom_id']=0;
+			  }			  
 			  // 拼团,搭配购不计算,赠品也不计算
 			  if( item['prom_type']!=5 &&  item['prom_type']!=6  && !item.is_gift && !item['is_collocation'] && item.goods_price>item[th.data.card_name] ){
 				  item.goods_price=item[th.data.card_name];
 				  carr[i].goods_price=item[th.data.card_name];
+				  
 			  }
 		  }else{
 			  // 拼团,搭配购不计算,赠品也不计算,同时会员还未购买等级会员
@@ -500,6 +506,8 @@ Page({
 			  gg.goods_price=gd[th.data.card_name];	
 			  getApp().globalData.is_card_back=0;
 			  th.setData({card_cut_price:0});
+			  //如果是秒杀的返回
+			  if(gd.prom_type==1) gd.prom_type=0;			  
 		  }else{
 			  //--- 商家等级卡开通的情况下,  会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格
 			  //-- 搭配购的商品也可以单独购买，所以此时搭配购的商品要进行计算优惠 --
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index 539edb2..e63c19d 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -47,7 +47,8 @@ Page({
   },
   onLoad: function (t) {
       wx.setNavigationBarTitle({ title: "拼团订单",})
-      var that=this;
+      var that=this; 
+	  var th=this;
       //获取用户设备信息，屏幕宽度
       wx.getSystemInfo({
          success: res => {
diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js
index 626f21b..5803133 100644
--- a/pages/togoin/togoin.js
+++ b/pages/togoin/togoin.js
@@ -27,6 +27,7 @@ Page({
 	e=e.detail;
 	if (e.encryptedData==undefined){
 	     return app.my_warnning("登录需要授权手机号码！", 0, this);
+		 that.setData({show_bind:0})
 	     return false;
 	}  
     var th=this;  
--
libgit2 0.21.4