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

后端研发-苏泰源
2 parents 72a3e741 f2773c98
Showing 2 changed files with 4 additions and 15 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -529,10 +529,10 @@ Page({
     //--先判断会员登陆状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      that.setData({
-        noLogin: true
-      })
-      return false;
+        wx.navigateTo({
+        url: '/pages/togoin/togoin',
+        })
+        return false;
     }
   },
@@ -3908,16 +3908,6 @@ Page({
 	// ind == 1 为普通购买
   openSpecModel_pt: function (e) {
-    //--先判断会员登陆状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-        wx.navigateTo({
-        url: '/pages/togoin/togoin',
-        })
-        return false;
-    }
-
-
     this.setData({ open_ind_store: 9, goodsInputNum: 1 });
     // 判断是否有待支付订单
     var aid = this.data.group_id;
@@ -921,7 +921,6 @@
 				<!-- data-ind="2" -->
 				<!-- openSpecModel_pt -->
 				<view class="xc-ash-b f1 flex ai-center jc-center white fs26" wx:if="{{isTimeUp}}">活动已经结束</view>
-        <view wx:elif="{{noLogin}}" bindtap="openSpecModel_pt">立即参团</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}}" 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>