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

config/dev.env.js

@@ -25,7 +25,8 @@ module.exports = merge(prodEnv, {//zjgyl
   // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
   IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"',
   POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
-  POSTHOG_HOST: '"https://posthog.mayi118.com"'
+  POSTHOG_HOST: '"https://posthog.mayi118.com"',
+  AREA_JSON: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com/static/js/app.area.json"'
   // IMG_DOMAIN: '"http://cdn.mayi888.com"',
 
 })

config/prod.env.js

@@ -9,6 +9,7 @@ module.exports = {
   OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
   IMG_DOMAIN: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com"',
   POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
-  POSTHOG_HOST: '"https://posthog.mayi118.com"'
+  POSTHOG_HOST: '"https://posthog.mayi118.com"',
+  AREA_JSON: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com/static/js/app.area.json"'
   // IMG_DOMAIN: '"http://cdn.mayi888.com"'
 }

config/xhyx_uat.env.js

@@ -25,7 +25,8 @@ module.exports = merge(prodEnv, {//zjgyl
   // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
   IMG_DOMAIN: '"http://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com"',
   POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
-  POSTHOG_HOST: '"https://posthog.mayi118.com"'
+  POSTHOG_HOST: '"https://posthog.mayi118.com"',
+  AREA_JSON: '"https://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com/public/json/f7746156-6329-4130-b724-eda06215ddea.json"'
   // IMG_DOMAIN: '"http://cdn.mayi888.com"',
 
 })

src/App.vue

@@ -16,12 +16,12 @@ export default {
     if (JSON.stringify(extConfig) == "{}") {
       let shopItem = {
         development: { mixid: "antgood", "shopid": 67},
-        // production: { "mixid":"qiyeCT", "shopid": 1045 }, // 道可
+        production: { "mixid":"qiyeCT", "shopid": 1045 }, // 道可
         // production: { "mixid":"5I5Dyk", "shopid": 1306 }, // 星期八
         // production: { "mixid":"RON", "shopid": 1503 }, // 荣恩
-        production: { "mixid":"ant", "shopid": 6 }, // 小工蚁
+        // production: { "mixid":"ant", "shopid": 6 }, // 小工蚁
         // production: { "mixid":"MetaSense", "shopid": 1237 }, // 册为
-        production: { "mixid":"5BkDRR", "shopid": 1316 }, // lost in echo订货
+        // production: { "mixid":"5BkDRR", "shopid": 1316 }, // lost in echo订货
         xhyx_uat: { "mixid":"xhyxshop", "shopid": 1 },
         xhyx_prod: { "mixid":"antgood", "shopid": 67 },
       }

src/utils/mayi.js

@@ -530,7 +530,7 @@ export function themeScanningCodeClick() {
               // 搜索无结果，跳转搜索页展示无识别结果
               $themeToLink({
                 type: 1,
-                link: `/goodsSearch/goodsSearch?isNoResult=${true}`
+                link: `/goodsSearch/goodsSearch?search_txt=${result}&isNoResult=${true}`
               });
             }
           })

src/utils/tool.js

@@ -4,7 +4,7 @@ const appArea = () => {
   console.log("---appArea");
   return new Promise(async (response, reject) => {
     await wx.request({
-      url: `https://cdn.mayi888.com/static/js/app.area.json`,
+      url: process.env.AREA_JSON,
       success: res => {
         obj = res.data;
         response(obj);