Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

config/dev.env.js

@@ -17,7 +17,7 @@ module.exports = merge(prodEnv, {//zjgyl
   // BASE_URL:"'http://192.168.1.146:3005'",
   // BASE_URL:"'http://192.168.1.127:3000'",
   BASE_URL:"'https://test-m-shop.mayi888.cn'",
-  // BASE_URL:"'http://172.16.1.48:3004'",
+  // BASE_URL:"'http://192.168.137.1:3004'",
 
   OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"',
   // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',

project.config.json

@@ -41,17 +41,10 @@
   "simulatorPluginLibVersion": {},
   "libVersion": "2.15.0",
   "condition": {
-		"search": {
-			"list": []
-		},
-		"conversation": {
-			"list": []
-		},
     "plugin": {
       "list": []
     },
     "game": {
-			"currentL": -1,
       "list": []
     },
     "gamePlugin": {
@@ -79,6 +72,17 @@
           "pathName": "pages/index/main",
           "query": "scene=pid_6141",
           "scene": 1047
+        },
+        {
+          "name": "pages/tabBar1/main",
+          "pathName": "pages/tabBar1/main",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/tabBar4/main",
+          "pathName": "pages/tabBar4/main",
+          "scene": null
         }
       ]
     }

src/App.vue

@@ -11,6 +11,7 @@ export default {
       process.env.NODE_ENV == "development" ||
       JSON.stringify(extConfig) == "{}"
     ) {
+      // extConfig = { mixid: "jordan", shopid: 471 };
       extConfig = { mixid: "antgood", shopid: 67 };
     }
     console.log("1444444444", extConfig.mixid);

src/app.json

@@ -11,6 +11,7 @@
     "pages/tabBar1/main",
     "pages/tabBar2/main",
     "pages/tabBar3/main",
+    "pages/tabBar4/main",
     "pages/changeAdr/main"
   ],
   "tabBar": {
@@ -31,6 +32,9 @@
       },
       {
         "pagePath": "pages/tabBar3/main"
+      },
+      {
+        "pagePath": "pages/tabBar4/main"
       }
     ]
   },

src/pages/home/index.vue

@@ -220,6 +220,7 @@ export default {
     }else {
       this.mpApp.themeColorCallBack=(res)=>{
         this.themeColor = res
+        
       }
     }
 

src/utils/mayi.js

 import cart from "@/api/cart"
+
+// 登录白名单 name
+export const noLoginList = ["index", "media-video", "goods-goodsInfo", "goods-commodityMenu", "goodsSearch-goodsSearch", "chooseStores", "activty-receivingGift", "activty", "login-register", "login-phoneLogin", "login-authInformation", "login-forgetPassWord", "login-accountLogin", "login-wxRegister", "pay-payList", "comment-evaluateList", "goods-commonProblemList", "article-articlePage", "article-articleList", "goods-posters", "liveBroadcast", "liveBroadcast-list", "personalCenter-coupon-getCoupon", "buyerShow-showDetail", "goods-addGoodsList", "personalCenter-CDkey-exchange", "giftCards-linkReceive", "giftCoupon-preview", "smartForm", "shopCart-shareShopCart", "groupBuying-beInvite", "brandTopics", 'personalCenter-spokesmanCenter', 'personalCenter-spokesmanCenter-mine-spokesmanHomePage','liveBroadcast-lived', 'personalCenter-spokesmanCenter-mine-getBusinessCard','changeAdr'];
+// path
+export const noLoginListPath = noLoginList.map(item=>{
+    item=item.replace(/-/g,'/')
+    item='/'+item
+    item=="/index" && (item="/")
+    return item
+})
+
 // 主题色
 export let themeColor = {
     "--main-color": "#ffffff",
@@ -19,13 +30,21 @@ export function $themeToLink(data, option) {
     // 点击底部栏
     if (option) {
         let parseLink = getUrlofLink(data);
-        let isTabbarIndex = checkTabbarPage(parseLink);
+        let aa=noLoginListPath.includes(parseLink) || parseLink.substr(0,7)=="/goods/"
+        console.log(parseLink,aa,'parseLinkparseLinkparseLink',parseLink,noLoginListPath)
+        if (!aa && !wx.getStorageSync("sessionid")) {
+            let url = `/pages/login/main?back=${parseLink}`;
+            wx.navigateTo({url});
+            return
+        }
+
         // 替换首页位置
+        let isTabbarIndex = checkTabbarPage(parseLink);
         isTabbarIndex = isTabbarIndex == 0 ? checkTabbarPage('/') : isTabbarIndex
         wx.switchTab({
             url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
         })
-        console.log(option, data)
+        console.log(option, data,'---',parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`)
         return
     }
 
@@ -37,18 +56,6 @@ export function $themeToLink(data, option) {
         }
         return
     }
-
-    // 底部导航跳转
-    // let parseLink=getUrlofLink(data)
-    // let isTabbarIndex =checkTabbarPage(parseLink )
-    // if (isTabbarIndex>-1) {
-    //     wx.switchTab({
-    //         url: parseLink == '/' ? '/pages/home/main' : `/pages/tabBar${isTabbarIndex}/main`,
-    //     })
-    //     return
-    // }
-
-
     // -----------------
     if (type == 0) {//无链接
         return