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

yvan.ni
1 parent bf638dc2
Showing 8 changed files with 45 additions and 41 deletions
packageA/pages/goodsInfo/goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/presell/cardInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.js
packageE/pages/togoin/togoin.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/goodsList.js
pages/user/index/index.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;
+      // }
     //如果开启了，则不在选择门店
@@ -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;
@@ -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;
+      // }
     //如果开启了，则不在选择门店
@@ -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;
@@ -578,9 +578,9 @@ Page({
   //弹出框的同意的优化
   agree_pri:function (){
-    this.setData({
-      isAgree:1,
-    });
+    // this.setData({
+    //   isAgree:1,
+    // });
   },
   //通过路径跳转到其他页面
   goto: function (e) {
@@ -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;
+                        // }
                         //如果开启了，则不在选择门店
@@ -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;
                         }
+                    }
                 })
             }
@@ -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({