Commit 65d991e89b5d3b61f62bfa5b63ec3ce0966c60c3
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
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
| ... | ... | @@ -113,16 +113,17 @@ Page({ |
| 113 | 113 | |
| 114 | 114 | |
| 115 | 115 | onUnload: function () { |
| 116 | - console.log('999999999999999999999onUnolad~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~',this.data.luckyGoInfo); | |
| 117 | 116 | // 开团成功后,清除storage里的team_id |
| 118 | - if(this.data.luckyGoInfo && this.data.luckyGoInfo.num == 0) { | |
| 119 | - wx.removeStorageSync('team_id'); | |
| 120 | - }; | |
| 121 | - // 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id | |
| 122 | - if(this.data.param.from == 1) { | |
| 123 | - let team_id = wx.getStorageSync('team_id'); | |
| 124 | - if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id'); | |
| 125 | - }; | |
| 117 | + // if(this.data.luckyGoInfo && this.data.luckyGoInfo.num == 0) { | |
| 118 | + // wx.removeStorageSync('team_id'); | |
| 119 | + // }; | |
| 120 | + // // 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id | |
| 121 | + // if(this.data.param.from == 1) { | |
| 122 | + // let team_id = wx.getStorageSync('team_id'); | |
| 123 | + // if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id'); | |
| 124 | + // }; | |
| 125 | + | |
| 126 | + wx.removeStorageSync('team_id'); | |
| 126 | 127 | }, |
| 127 | 128 | |
| 128 | 129 | //关闭展开列表 | ... | ... |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
| ... | ... | @@ -922,7 +922,7 @@ |
| 922 | 922 | <!-- openSpecModel_pt --> |
| 923 | 923 | <view class="xc-ash-b f1 flex ai-center jc-center white fs26" wx:if="{{isTimeUp}}">活动已经结束</view> |
| 924 | 924 | <block wx:else> |
| 925 | - <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> | |
| 925 | + <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> | |
| 926 | 926 | <view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-it="0" wx:elif="{{!showDetails && surplus != 0 && canBuy}}">立即参团</view> |
| 927 | 927 | <view class="f1 flex ai-center jc-center xc-ash-b fs26 white" wx:elif="{{!showDetails && surplus == 0}}">已经抢光了</view> |
| 928 | 928 | <view class="f1 flex ai-center jc-center xc-ash-b fs26 white" wx:elif="{{!showDetails && surplus != 0 && !canBuy}}">已超限购次数</view> | ... | ... |
pages/index/index/index.wxss
pages/user/index/index.js