From d6a7068cdcab8a7db6d74781edcd35ecfd44e1ee Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Wed, 8 Dec 2021 17:54:56 +0800
Subject: [PATCH] 幸运购修改

---
 packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss |  1 +
 packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js             | 19 ++++++++++---------
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml       |  2 +-
 pages/index/index/index.wxss                                          |  1 +
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss
index f7fe7f7..ff7eb2b 100644
--- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss
+++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss
@@ -70,6 +70,7 @@ page {
 
 .name {
 	height: 88rpx;
+	word-break: break-all;
 }
 
 .no-more {
diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
index 5a235c2..0081df6 100644
--- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
+++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
@@ -113,16 +113,17 @@ Page({
 	
 	
 	onUnload: function () {
-		console.log('999999999999999999999onUnolad~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~',this.data.luckyGoInfo);
 		// 开团成功后,清除storage里的team_id
-		if(this.data.luckyGoInfo && this.data.luckyGoInfo.num == 0) {
-			wx.removeStorageSync('team_id');
-		};
-		// 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id
-		if(this.data.param.from == 1) {
-			let team_id = wx.getStorageSync('team_id');
-			if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id');
-		};
+		// if(this.data.luckyGoInfo && this.data.luckyGoInfo.num == 0) {
+		// 	wx.removeStorageSync('team_id');
+		// };
+		// // 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id
+		// if(this.data.param.from == 1) {
+		// 	let team_id = wx.getStorageSync('team_id');
+		// 	if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id');
+		// };
+		
+		wx.removeStorageSync('team_id');
 	},
 	
   //关闭展开列表
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index ba6dfa9..c221c02 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -922,7 +922,7 @@
 				<!-- openSpecModel_pt -->
 				<view class="xc-ash-b f1 flex ai-center jc-center white fs26" wx:if="{{isTimeUp}}">活动已经结束</view>
 				<block wx:else>
-					<view class="btn-red f1 flex ai-center jc-center" bindtap="go" data-it="0" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{luckGoInfo.id}}&goods_id={{luckGoInfo.goods_id}}&goods_name={{data.goods_name}}&team_id={{buyInfo.team_id}}&&from=list" wx:if="{{showDetails}}">查看详情</view>
+					<view class="btn-red f1 flex ai-center jc-center" bindtap="go" data-it="0" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{luckGoInfo.id}}&goods_id={{luckGoInfo.goods_id}}&goods_name={{data.goods_name}}&team_id={{buyInfo.team_id}}" wx:if="{{showDetails}}">查看详情</view>
 					<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-it="0" wx:elif="{{!showDetails && surplus != 0 && canBuy}}">立即参团</view>
 					<view class="f1 flex ai-center jc-center xc-ash-b fs26 white" wx:elif="{{!showDetails && surplus == 0}}">已经抢光了</view>
 					<view class="f1 flex ai-center jc-center xc-ash-b fs26 white" wx:elif="{{!showDetails && surplus != 0 && !canBuy}}">已超限购次数</view>
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index c881b75..026ba8c 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -1180,6 +1180,7 @@ page {
 
 .luck .name {
 	height: 88rpx;
+	word-break: break-all;
 }
 
 
--
libgit2 0.21.4