wxd / MShopWeApp

Commit 011efa447c4cf396aa99f14d7f32407f576a31e3

Authored by 后端研发-苏泰源
2 parents ab5ff1c8 734565da

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

Inline Side-by-side
Showing 3 changed files with 26 additions and 51 deletions
... ... @@ -275,8 +275,8 @@ App({
275 275 getwuliu: function (t, o){
276 276 this.globalData.wuliu=null;
277 277 var th = this, st = this.globalData.setting;
278   - this.globalData.wuliu && !o ?
279   - "function" == typeof t && t(this.globalData.wuliu) : a.get("/api/weshop/storeshipping/list", {
  278 + //获取物流不缓存
  279 + a.get("/api/weshop/storeshipping/list", {
280 280 data: { store_id: st.stoid, status: 1, pageSize:600 },
281 281 success: function (o) {
282 282 console.log('getwuliu');
... ... @@ -296,8 +296,8 @@ App({
296 296 //----------------获取物流价格表--------------------
297 297 getwuliuprice: function (t, o) {
298 298 var e = this,th=e, st = this.globalData.setting;
299   - this.globalData.wuliuprice && !o ?
300   - "function" == typeof t && t(this.globalData.wuliuprice) : a.get("/api/weshop/shippingarea/list",{
  299 + //获取物流不缓存
  300 + a.get("/api/weshop/shippingarea/list",{
301 301 data: { store_id: st.stoid,pageSize: 600 },
302 302 success: function (o) {
303 303 console.log('getwuliuprice');
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @011efa4
... ... @@ -315,54 +315,8 @@ Page({
315 315 prom_id,
316 316 });
317 317 }
  318 +
318 319  
319   -
320   -
321   - // api/weshop/prom/luckyOrder/getUserOrderInfo/{store_id}/{user_id}/{aid}
322   - // getApp().request.promiseGet("/api/weshop/pickup/list", {
323   - // data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,is_pos:1 },
324   - // }).then(res => {
325   - // if (res.data.code == 0) {
326   - // e = res.data.data.pageData[0];
327   - // if (e) {
328   - // e.is_no_dis = ee.is_no_dis;
329   - // appd.pk_store = e;
330   - // that.set_def_storage(e);
331   - // }
332   -
333   - // }
334   - // })
335   -
336   -
337   - // console.log('type********>>',this.data.prom_type);
338   - //-- 自定义海报 --
339   - // getApp().request.promiseGet("/api/weshop/goods/poster/page", {
340   - // data: { store_id: os.stoid, type: 1, is_use: 1 }
341   - // }).then(res => {
342   - // if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]) {
343   -
344   - // var poster_data = res.data.data.pageData[0];
345   - // var json_str = poster_data.jsonStr;
346   -
347   - // if (json_str) {
348   - // var json_data = JSON.parse(json_str);
349   - // if (json_data.bg_img) {
350   -
351   - // //-- 把图片那到本地 --
352   - // wx.getImageInfo({
353   - // src: json_data.bg_img,
354   - // success: function (res) {
355   - // var path = res.path;
356   - // th.setData({ share_b_img: path })
357   - // },
358   - // fail: function (res) { }
359   - // });
360   - // }
361   - // th.setData({ poster: json_data })
362   -
363   - // }
364   - // }
365   - // })
366 320  
367 321  
368 322 //---获取手机地址坐标--
... ... @@ -570,6 +524,16 @@ Page({
570 524 getApp().request.put("/api/weshop/goods/updateClick", {
571 525 data: { store_id: os.stoid, goods_id: gid }
572 526 });
  527 +
  528 +
  529 + //--先判断会员登陆状态--
  530 + var user_info = getApp().globalData.userInfo;
  531 + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  532 + that.setData({
  533 + noLogin: true
  534 + })
  535 + return false;
  536 + }
573 537  
574 538 },
575 539  
... ... @@ -3944,6 +3908,16 @@ Page({
3944 3908 // ind == 1 为普通购买
3945 3909 openSpecModel_pt: function (e) {
3946 3910  
  3911 + //--先判断会员登陆状态--
  3912 + var user_info = getApp().globalData.userInfo;
  3913 + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  3914 + wx.navigateTo({
  3915 + url: '/pages/togoin/togoin',
  3916 + })
  3917 + return false;
  3918 + }
  3919 +
  3920 +
3947 3921 this.setData({ open_ind_store: 9, goodsInputNum: 1 });
3948 3922 // 判断是否有待支付订单
3949 3923 var aid = this.data.group_id;
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @011efa4
... ... @@ -921,6 +921,7 @@
921 921 <!-- data-ind="2" -->
922 922 <!-- openSpecModel_pt -->
923 923 <view class="xc-ash-b f1 flex ai-center jc-center white fs26" wx:if="{{isTimeUp}}">活动已经结束</view>
  924 + <view wx:elif="{{noLogin}}" bindtap="openSpecModel_pt">立即参团</view>
924 925 <block wx:else>
925 926 <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 927 <view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-it="0" wx:elif="{{!showDetails && surplus != 0 && canBuy}}">立即参团</view>
... ...