优化

config/xhyx_prod.env.js

@@ -28,6 +28,7 @@ module.exports = merge(prodEnv, {//zjgyl
   POSTHOG_HOST: '"https://posthog.mayi118.com"',
   MANALYTICS_HOST: '"http://bi.xinhuabest.com/log/xinhua.gif"',
   AREA_JSON: '"https://new-xhyx.obs.cidc-rp-2005.joint.cmecloud.cn/product/json/f7746156-6329-4130-b724-eda06215ddea.json"',
+  SHOP_LOGO: '"https://new-xhyx.obs.cidc-rp-2005.joint.cmecloud.cn/product/png/dca9f433-bf71-4c0c-bf7a-bc7efbce311d.png"'
   // IMG_DOMAIN: '"http://cdn.mayi888.com"',
 
 })

src/components/common/CustomNav.vue

@@ -113,7 +113,7 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
-    font-size: 13px;
+    font-size: 1em;
     font-family: "PingFangSC-Medium, PingFang SC";
   }
 }

src/components/common/pageLoading.vue

@@ -23,7 +23,9 @@ export default {
   computed: {
     shopLogo() {
       let logoUrl = "";
-      if (wx.getStorageSync("logoUrl")) {
+      if (process.env.SHOP_LOGO) {
+        logoUrl = process.env.SHOP_LOGO;
+      } else if (wx.getStorageSync("logoUrl")) {
         logoUrl = wx.getStorageSync("logoUrl");
       } else {
         logoUrl = app.globalData && app.globalData.shopInfo && app.globalData.shopInfo.logoUrl;

src/pages/home/index.vue

@@ -9,6 +9,7 @@
       <CustomNav :customBgOpacity="customBgOpacity"></CustomNav>
       <StoreAddr @toUpdate="reloadEnterShopRule" @toPageLoading="toPageLoading" ref="StoreAddr"></StoreAddr>
       <ThemeDataPlant></ThemeDataPlant>
+      <template v-if="!componentsLoading">
         <div v-for="(item,index) in pageData" :key="index">
           <div v-if="item.componentCode=='banner' && item.componentInfo.visible == 1">
             <banner :datas="item"></banner>
@@ -120,6 +121,7 @@
             <embedModule :datas="item" :componentIndex="index"></embedModule>
           </div>
         </div>
+      </template>
       <bottomCont v-if="showbottomCont"></bottomCont>
       <template>
       </template>
@@ -231,6 +233,7 @@ export default {
       showbottomCont: false, //展示底部logo
       showSpe: false,
       pageLoading: true,
+      componentsLoading: true,
       firstOpenPage: true,  //首次打开页面
       h5Params: {}, //params
       fromPage: "",
@@ -553,11 +556,17 @@ export default {
   },200),
 
   methods: {
+    setPageLoading() {
+      this.componentsLoading = false;
+      setTimeout(() => {
+        this.pageLoading = false;
+      }, 3000);
+    },
     reloadEnterShopRule() {
       console.log('eloadEnterShopRule')
       // 进店规则--首次进店调用
       if (this.h5Params && this.h5Params.offlineShopCode) {
-        this.pageLoading = false;
+        this.setPageLoading();
         return;
       };
       console.log('home-methods-reloadEnterShopRule')
@@ -567,7 +576,7 @@ export default {
         this.enterStoreRule();
       } else {
         console.log('reloadEnterShopRule-------2')
-        this.pageLoading = false;
+        this.setPageLoading();
       }
     },
     async enterStoreRule() {
@@ -617,7 +626,7 @@ export default {
       } catch (error) {
         
       }
-      this.pageLoading = false;
+      this.setPageLoading();
     },
     toPageLoading() {
       // this.pageLoading = true;
@@ -1101,21 +1110,15 @@ export default {
     async getThemeList() {
       console.log("getThemeList")
       this.pageLoading = true;
+      this.componentsLoading = true;
       try {
         await app.getThemePage(this.$store.state.extConfig);
       } catch (error) {
         
       }
-      setTimeout(() => {
-        this.pageLoading = false;
-        console.log("加载完成了");
-      }, 1500);
+      this.setPageLoading();
     },
     async refreshInit() {
-      // this.pageLoading = true;
-      // setTimeout(() => {
-        //   this.pageLoading = false;
-        // }, 1500);
         log.info('onPullDownRefresh',this.$store.state.extConfig)
         app.getShopInfo(this.$store.state.extConfig);
         try {