wxd / MShopWeApp

Commit bca5519479cc9837c04a79d814ad8a0beffa9424

Authored by yvan.ni
1 parent bf638dc2

商品详情-更多门店 、我的-附近门店需要开放浏览权限，移除登录限制；必要场景登录时，登录页需要有用户隐私协议，协议不得默认同意

Inline Side-by-side
Showing 8 changed files with 45 additions and 41 deletions
packageA/pages/goodsInfo/goodsInfo.js
  View file @bca5519
... ... @@ -2713,12 +2713,12 @@ Page({
2713 2713  
2714 2714 //--先判断会员状态--
2715 2715 var user_info = getApp().globalData.userInfo;
2716   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
2717   - wx.navigateTo({
2718   - url: '/packageE/pages/togoin/togoin',
2719   - })
2720   - return false;
2721   - }
  2716 + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  2717 + // wx.navigateTo({
  2718 + // url: '/packageE/pages/togoin/togoin',
  2719 + // })
  2720 + // return false;
  2721 + // }
2722 2722  
2723 2723  
2724 2724 //如果开启了，则不在选择门店
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @bca5519
... ... @@ -5981,12 +5981,12 @@ Page({
5981 5981 })
5982 5982 //--先判断会员状态--
5983 5983 var user_info = getApp().globalData.userInfo;
5984   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
5985   - wx.navigateTo({
5986   - url: '/packageE/pages/togoin/togoin',
5987   - })
5988   - return false;
5989   - }
  5984 + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  5985 + // wx.navigateTo({
  5986 + // url: '/packageE/pages/togoin/togoin',
  5987 + // })
  5988 + // return false;
  5989 + // }
5990 5990  
5991 5991 var th = this;
5992 5992 var ind = ee.currentTarget.dataset.ind;
... ...
packageC/pages/presell/cardInfo/goodsInfo.js
  View file @bca5519
... ... @@ -2045,12 +2045,12 @@ Page({
2045 2045  
2046 2046 //--先判断会员状态--
2047 2047 var user_info = getApp().globalData.userInfo;
2048   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
2049   - wx.navigateTo({
2050   - url: '/packageE/pages/togoin/togoin',
2051   - })
2052   - return false;
2053   - }
  2048 + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  2049 + // wx.navigateTo({
  2050 + // url: '/packageE/pages/togoin/togoin',
  2051 + // })
  2052 + // return false;
  2053 + // }
2054 2054  
2055 2055  
2056 2056 //如果开启了，则不在选择门店
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @bca5519
... ... @@ -3998,12 +3998,12 @@ Page({
3998 3998 })
3999 3999 //--先判断会员状态--
4000 4000 var user_info = getApp().globalData.userInfo;
4001   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
4002   - wx.navigateTo({
4003   - url: '/packageE/pages/togoin/togoin',
4004   - })
4005   - return false;
4006   - }
  4001 + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  4002 + // wx.navigateTo({
  4003 + // url: '/packageE/pages/togoin/togoin',
  4004 + // })
  4005 + // return false;
  4006 + // }
4007 4007  
4008 4008 var th = this;
4009 4009 var ind = ee.currentTarget.dataset.ind;
... ...
packageE/pages/togoin/togoin.js
  View file @bca5519
... ... @@ -578,9 +578,9 @@ Page({
578 578  
579 579 //弹出框的同意的优化
580 580 agree_pri:function (){
581   - this.setData({
582   - isAgree:1,
583   - });
  581 + // this.setData({
  582 + // isAgree:1,
  583 + // });
584 584 },
585 585 //通过路径跳转到其他页面
586 586 goto: function (e) {
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @bca5519
... ... @@ -7415,12 +7415,12 @@ Page({
7415 7415 })
7416 7416 //--先判断会员状态--
7417 7417 var user_info = getApp().globalData.userInfo;
7418   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
7419   - wx.navigateTo({
7420   - url: '/packageE/pages/togoin/togoin',
7421   - })
7422   - return false;
7423   - }
  7418 + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  7419 + // wx.navigateTo({
  7420 + // url: '/packageE/pages/togoin/togoin',
  7421 + // })
  7422 + // return false;
  7423 + // }
7424 7424  
7425 7425  
7426 7426 //如果开启了，则不在选择门店
... ...
pages/goods/goodsList/goodsList.js
  View file @bca5519
... ... @@ -317,14 +317,14 @@ Page({
317 317 //-- 获取 --
318 318 await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+content.gift+"&store_id="+oo.stoid, {
319 319 }).then(res => {
320   - if(ut.ajax_ok(res))
  320 + if(ut.ajax_ok(res)) {
  321 + arr[i].content.gift_name = res.data.data.pageData[0].goods_name;
  322 + if (!content.zpname_type) content.zpname_type = '';
321 323  
322   - arr[i].content.gift_name=res.data.data.pageData[0].goods_name;
323   - if(!content.zpname_type) content.zpname_type='';
324   -
325   - if(parseInt(content.zpname_type)>0){
326   - arr[i].content.gift_name=res.data.data.pageData[0].title;
  324 + if (parseInt(content.zpname_type) > 0) {
  325 + arr[i].content.gift_name = res.data.data.pageData[0].title;
327 326 }
  327 + }
328 328 })
329 329 }
330 330  
... ...
pages/user/index/index.js
  View file @bca5519
... ... @@ -61,8 +61,12 @@ Page({
61 61 goto_nav: function (e) {
62 62 var th = this;
63 63 var url = e.currentTarget.dataset.url;
64   - if (th.data.userInfo != null) {
65   - console.log('跳转');
  64 +
  65 + //附件的门店不用判断会员
  66 + var is_fj_store= url.indexOf('store/index')>-1;
  67 +
  68 + if (th.data.userInfo != null || is_fj_store) {
  69 + console.log('跳转');
66 70 getApp().goto(url);
67 71 } else {
68 72 wx.navigateTo({
... ...