From bca5519479cc9837c04a79d814ad8a0beffa9424 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Fri, 1 Mar 2024 16:57:18 +0800 Subject: [PATCH] 商品详情-更多门店 、我的-附近门店需要开放浏览权限，移除登录限制；必要场景登录时，登录页需要有用户隐私协议，协议不得默认同意 --- packageA/pages/goodsInfo/goodsInfo.js | 12 ++++++------ packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 12 ++++++------ packageC/pages/presell/cardInfo/goodsInfo.js | 12 ++++++------ packageC/pages/presell/goodsInfo/goodsInfo.js | 12 ++++++------ packageE/pages/togoin/togoin.js | 6 +++--- pages/goods/goodsInfo/goodsInfo.js | 12 ++++++------ pages/goods/goodsList/goodsList.js | 12 ++++++------ pages/user/index/index.js | 8 ++++++-- 8 files changed, 45 insertions(+), 41 deletions(-) diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 10d2a0b..6fa67cd 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -2713,12 +2713,12 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', - }) - return false; - } + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + // wx.navigateTo({ + // url: '/packageE/pages/togoin/togoin', + // }) + // return false; + // } //如果开启了，则不在选择门店 diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 34cd8ba..46c2ffb 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -5981,12 +5981,12 @@ Page({ }) //--先判断会员状态-- var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', - }) - return false; - } + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + // wx.navigateTo({ + // url: '/packageE/pages/togoin/togoin', + // }) + // return false; + // } var th = this; var ind = ee.currentTarget.dataset.ind; diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js index cad10c2..82d582e 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.js +++ b/packageC/pages/presell/cardInfo/goodsInfo.js @@ -2045,12 +2045,12 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', - }) - return false; - } + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + // wx.navigateTo({ + // url: '/packageE/pages/togoin/togoin', + // }) + // return false; + // } //如果开启了，则不在选择门店 diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index a43f787..1e00ca6 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -3998,12 +3998,12 @@ Page({ }) //--先判断会员状态-- var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', - }) - return false; - } + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + // wx.navigateTo({ + // url: '/packageE/pages/togoin/togoin', + // }) + // return false; + // } var th = this; var ind = ee.currentTarget.dataset.ind; diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js index e9b413f..35ef6ca 100644 --- a/packageE/pages/togoin/togoin.js +++ b/packageE/pages/togoin/togoin.js @@ -578,9 +578,9 @@ Page({ //弹出框的同意的优化 agree_pri:function (){ - this.setData({ - isAgree:1, - }); + // this.setData({ + // isAgree:1, + // }); }, //通过路径跳转到其他页面 goto: function (e) { diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 223b3f8..40104f3 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -7415,12 +7415,12 @@ Page({ }) //--先判断会员状态-- var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', - }) - return false; - } + // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + // wx.navigateTo({ + // url: '/packageE/pages/togoin/togoin', + // }) + // return false; + // } //如果开启了，则不在选择门店 diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 52944a3..a65e9c4 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -317,14 +317,14 @@ Page({ //-- 获取 -- await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+content.gift+"&store_id="+oo.stoid, { }).then(res => { - if(ut.ajax_ok(res)) + if(ut.ajax_ok(res)) { + arr[i].content.gift_name = res.data.data.pageData[0].goods_name; + if (!content.zpname_type) content.zpname_type = ''; - arr[i].content.gift_name=res.data.data.pageData[0].goods_name; - if(!content.zpname_type) content.zpname_type=''; - - if(parseInt(content.zpname_type)>0){ - arr[i].content.gift_name=res.data.data.pageData[0].title; + if (parseInt(content.zpname_type) > 0) { + arr[i].content.gift_name = res.data.data.pageData[0].title; } + } }) } diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 1182193..2c195e9 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -61,8 +61,12 @@ Page({ goto_nav: function (e) { var th = this; var url = e.currentTarget.dataset.url; - if (th.data.userInfo != null) { - console.log('跳转'); + + //附件的门店不用判断会员 + var is_fj_store= url.indexOf('store/index')>-1; + + if (th.data.userInfo != null || is_fj_store) { + console.log('跳转'); getApp().goto(url); } else { wx.navigateTo({ -- libgit2 0.21.4