Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

abson
2 parents 28627b1f 1a1543eb
Showing 5 changed files with 14 additions and 11 deletions
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
pages/index/index/index.wxss
pages/user/index/index.js
@@ -70,6 +70,7 @@ page {
 .name {
 	height: 88rpx;
+	word-break: break-all;
 }
 .no-more {
@@ -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');
 	},
   //关闭展开列表
@@ -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>
@@ -1180,6 +1180,7 @@ page {
 .luck .name {
 	height: 88rpx;
+	word-break: break-all;
 }
@@ -466,7 +466,7 @@ Page({
       wx.navigateTo({
         url: "/pages/error/error?msg=小程序已经过期",
       });
-    if (t.isbuy == 0)
+    if (t && t.isbuy == 0)
       wx.navigateTo({
         url: "/pages/error/error?msg=还未购买小程序",
       });