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

后端研发-苏泰源
2 parents ab5ff1c8 734565da
Showing 3 changed files with 26 additions and 51 deletions
app.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -275,8 +275,8 @@ App({
   getwuliu: function (t, o){
 	this.globalData.wuliu=null;  
     var th = this, st = this.globalData.setting;
-    this.globalData.wuliu && !o ?
-      "function" == typeof t && t(this.globalData.wuliu) : a.get("/api/weshop/storeshipping/list", {
+    //获取物流不缓存
+    a.get("/api/weshop/storeshipping/list", {
         data: { store_id: st.stoid, status: 1, pageSize:600 },
         success: function (o) {
           console.log('getwuliu');
@@ -296,8 +296,8 @@ App({
   //----------------获取物流价格表--------------------
   getwuliuprice: function (t, o) {
     var e = this,th=e, st = this.globalData.setting;
-    this.globalData.wuliuprice && !o ?
-      "function" == typeof t && t(this.globalData.wuliuprice) : a.get("/api/weshop/shippingarea/list",{
+    //获取物流不缓存
+    a.get("/api/weshop/shippingarea/list",{
         data: { store_id: st.stoid,pageSize: 600 },
         success: function (o) {
           console.log('getwuliuprice');
@@ -315,54 +315,8 @@ Page({
 					prom_id,
 				});
       }
+					
-			
-			
-			// api/weshop/prom/luckyOrder/getUserOrderInfo/{store_id}/{user_id}/{aid}
-			// getApp().request.promiseGet("/api/weshop/pickup/list", {
-			//   data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,is_pos:1 },
-			// }).then(res => {
-			//   if (res.data.code == 0) {
-			//     e = res.data.data.pageData[0];
-			//     if (e) {
-			//       e.is_no_dis = ee.is_no_dis;
-			//       appd.pk_store = e;
-			//       that.set_def_storage(e);
-			//     }
-			
-			//   }
-			// })
-			
-			
-			// console.log('type********>>',this.data.prom_type);
-    //-- 自定义海报 --
-    // getApp().request.promiseGet("/api/weshop/goods/poster/page", {
-    //   data: { store_id: os.stoid, type: 1, is_use: 1 }
-    // }).then(res => {
-    //   if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]) {
-
-    //     var poster_data = res.data.data.pageData[0];
-    //     var json_str = poster_data.jsonStr;
-
-    //     if (json_str) {
-    //       var json_data = JSON.parse(json_str);
-    //       if (json_data.bg_img) {
-
-    //         //-- 把图片那到本地 --
-    //         wx.getImageInfo({
-    //           src: json_data.bg_img,
-    //           success: function (res) {
-    //             var path = res.path;
-    //             th.setData({ share_b_img: path })
-    //           },
-    //           fail: function (res) { }
-    //         });
-    //       }
-    //       th.setData({ poster: json_data })
-
-    //     }
-    //   }
-    // })
     //---获取手机地址坐标--
@@ -570,6 +524,16 @@ Page({
     getApp().request.put("/api/weshop/goods/updateClick", {
       data: { store_id: os.stoid, goods_id: gid }
     });
+
+
+    //--先判断会员登陆状态--
+    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;
+    }
   },
@@ -3944,6 +3908,16 @@ 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,6 +921,7 @@
 				<!-- 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>