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

src/pages/index/index.vue

@@ -154,15 +154,16 @@ export default {
     this.options = options;
     log.info(this.options,'----------------index-----options')
     Object.assign(this.$data, this.$options.data());
-    let offlineShopCode = getUrlKey(decodeURIComponent(options.params), "offlineShopCode");
-    let offlineShopName = getUrlKey(decodeURIComponent(options.params), "offlineShopName");
-    if (offlineShopCode) {
-      // 存储h5url门店信息
-      setStoreInfo({
-        offlineShopCode,
-        offlineShopName
-      });
-    }
+    try {
+      const h5Params = options && options.params ? JSON.parse(decodeURIComponent(options.params)) : "";
+      if (h5Params) {
+        // 存储h5url门店信息
+        setStoreInfo({
+          offlineShopCode:h5Params.offlineShopCode,
+          offlineShopName:h5Params.offlineShopName,
+        });
+      }
+    } catch (e) { console.log(e) }
     if(wx.getStorageSync("workBox")){
       this.params += `&workBox=${wx.getStorageSync("workBox")}`
     }

src/utils/mayi.js

@@ -10,6 +10,7 @@ export const noLoginList = [
   "goods-goodsInfo",
   "goods-commodityMenu",
   "goodsSearch-goodsSearch",
+  "goodsSearch-searchAllGoods",
   "contentSearch-contentSearch",
   "chooseStores",
   "activty-receivingGift",

static/nativeComponents/GoodsSearch/index.js

@@ -52,13 +52,13 @@ Component({
       let query = `?placeHolderText=${placeHolderText}`;
       if (this.data.datas.componentData['searchModel'] == 1) {
         query += `&searchScopeFlag=${this.data.searchScopeFlag}`;
-        // 重置默认全网搜
-        this.setData({ searchScopeFlag: 0 });
       }
       let link = `/contentSearch/contentSearch${query}`;
       if (this.data.datas.componentData['searchModel'] == 1 && this.data.searchScopeFlag == 0) {
         link = `/goodsSearch/searchAllGoods${query}`;
       }
+      // 重置默认全网搜
+      this.setData({ searchScopeFlag: 0 });
       app.$themeToLink({ type: 1, link });
     },
     // 本店搜