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

config/xhyx_uat.env.js

@@ -16,12 +16,12 @@ module.exports = merge(prodEnv, {//zjgyl
   // BASE_URL:"'https://shop.mayi888.com'", 
   // BASE_URL:"'http://192.168.1.146:3005'",
   // BASE_URL:"'http://172.16.1.18:3000'",
-  BASE_URL:"'http://uat.m.xinhuabest.com'",
+  BASE_URL:"'https://uat-m.xinhuabest.com'",
   ADMIN_URL:"'http://uat.admin.xinhuabest.com'",
   GUIDE_URL:"'http://uat.guide.xinhuabest.com'",
   // BASE_URL:"'http://192.168.137.1:3004'",
 
-  OLSHOP_URL:'"http://uat.m.xinhuabest.com/innerApi/shopApiService"',
+  OLSHOP_URL:'"https://uat-m.xinhuabest.com/innerApi/shopApiService"',
   // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
   IMG_DOMAIN: '"http://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com"',
   POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',

src/main.js

@@ -154,7 +154,7 @@ function getThemePage({mixid,shopid}) {
   let {offlineShopCode} = getStoreInfo();
   shop
     .themePagesInfo({
-      shopMixId: mixid,
+      shopMixId: offlineShopCode?offlineShopCode:mixid,
       homePageFlag: true
     })
     .then((response) => {

src/pages/home/index.vue

@@ -216,6 +216,7 @@ export default {
       pageLoading: true,
       firstOpenPage: true,  //首次打开页面
       h5Params: {}, //params
+      fromPage: "",
     };
   },
   components:{
@@ -480,6 +481,7 @@ export default {
   },
   onShow() {
     this.pageLoading = false;
+    this.refreshInit();
     console.log(new Date().getTime(),'load-----home-onShow')
     // 设置显示条件
     console.log(new Date().getTime(),'--------on--------------show')
@@ -548,6 +550,7 @@ export default {
               offlineShopName: storeDetail.data.data.shopName,
             });
             this.$refs.StoreAddr.reloadName();
+            this.refreshInit();
           }
           console.log(storeDetail, '-------storeDetail');
         }
@@ -1038,6 +1041,16 @@ export default {
       setTimeout(() => {
         this.pageLoading = false;
       }, 500);
+    },
+    refreshInit() {
+      this.pageLoading = true;
+      setTimeout(() => {
+        wx.stopPullDownRefresh();
+        this.pageLoading = false;
+      }, 1500);
+      log.info('onPullDownRefresh',this.$store.state.extConfig)
+      app.getShopInfo(this.$store.state.extConfig);
+      this.getThemeList();
     }
   },
   async onShareAppMessage(res){
@@ -1114,16 +1127,7 @@ export default {
     log.info(res,'-----onShareTimeline')
   },
   onPullDownRefresh(){
-    this.pageLoading = true;
-    setTimeout(() => {
-      wx.stopPullDownRefresh();
-      this.pageLoading = false;
-    }, 1500);
-    log.info('onPullDownRefresh',this.$store.state.extConfig)
-    app.getShopInfo(this.$store.state.extConfig);
-    this.getThemeList();
-
-
+    this.refreshInit();
   }
 };
 </script>