Merge branch 'xhyx/release' into xhyx/hotfix

src/App.vue

@@ -28,13 +28,14 @@ export default {
         // development: { mixid: "ytVVdX", "shopid": 3812}, // 驿联科技uat
         // production: { "mixid":"xhyxshop", "shopid": 1095 }, // 小工蚁新零售
         // production: { "mixid":"AntTechnology", "shopid": 1095 }, // 小工蚁新零售
-        production: { "mixid":"ZJRH", "shopid": 1706 }, // 
+        // production: { "mixid":"ZJRH", "shopid": 1706 }, // 
+        // production: { "mixid":"LFX", "shopid": 1710 }, // 老凤祥 
         // production: { "mixid":"SWQ", "shopid": 1641 }, // 麦贝思
         // production: { "mixid":"metasense_doctors", "shopid": 1238 }, // 册为医护端
         // production: { "mixid":"3QqsFT", "shopid": 1337 },
         // production: { "mixid":"notSHOWROOM", "shopid": 1274 }, // 诸色
         // production: { "mixid":"LLGW", "shopid": 981 }, // 贺砚堂
-        // production: { "mixid":"5I5Dyk", "shopid": 1306 }, // 星期八
+        production: { "mixid":"5I5Dyk", "shopid": 1306 }, // 星期八
         // production: { "mixid":"RON", "shopid": 1503 }, // 荣恩
         // production: { "mixid":"ant", "shopid": 6 }, // 小工蚁
         // production: { "mixid":"MetaSense", "shopid": 1237 }, // 册为

src/components/tabbarPage.vue

@@ -54,6 +54,10 @@ export default {
       if (offlineShopCode) {
         this.params+=`&offlineShopCode=${offlineShopCode}&offlineShopName=${offlineShopName}`
       }
+      // 加_ma_uid
+      if (wx.getStorageSync("_ma_uid")) {
+        this.params += `&_ma_uid=${wx.getStorageSync("_ma_uid")}`;
+      }
       let pageUrl1 = (this.page.startsWith('http://') || this.page.startsWith('https://'))? (this.page + this.params) : this.link+this.page+this.params
       let pageUrl = forUrlAddKey(decodeURIComponent(pageUrl1));
       console.log(pageUrl,'--pageUrl')

src/pages/home/index.vue

@@ -678,7 +678,10 @@ export default {
           distributionOfficerShopCode: ""
         });
         if (res.data.code == 200 && !isNaN(res.data.data - 0)) {
+          if (res.data.data != null && res.data.data != 'null') {
             this.preEntryStoreId = res.data.data;
+          }
+          if (this.preEntryStoreId) {
             let storeDetail = await shop.getOfflineStoreDetail({
               shopId: this.preEntryStoreId,
             });
@@ -687,6 +690,7 @@ export default {
             }
             await this.enterStore(this.preEntryStoreId);
           }
+        }
       } catch (error) {
         console.log('getEnterShopIdV1-error->', error)
       }

src/pages/index/index.vue

@@ -83,6 +83,10 @@ export default {
         let { latitude, longitude } = locationObj;
         this.params+=`&latitude=${latitude}&longitude=${longitude}`
       }
+      // 加_ma_uid
+      if (wx.getStorageSync("_ma_uid")) {
+        this.params += `&_ma_uid=${wx.getStorageSync("_ma_uid")}`;
+      }
       // 判断当前是否为导购分享
       const setGuideEmployeeId = wx.getStorageSync(this.$store.state.mixid + 'setGuideEmployeeId');
       if (setGuideEmployeeId && !this.params.includes("setGuideEmployeeId")) {

src/pages/wxArticle/index.vue

@@ -204,6 +204,10 @@ export default {
       if ((!this.link.includes('sessionid')) && wx.getStorageSync("sessionid")) {
         this.link +=`${this.link.includes('?') && !this.link.includes('#/') || (this.link.split('?').length - 1 > 1) ?'&':'?'}sessionid=${wx.getStorageSync("sessionid")}`
       }
+      // 加_ma_uid
+      if (wx.getStorageSync("_ma_uid")) {
+        this.link += `&_ma_uid=${wx.getStorageSync("_ma_uid")}`;
+      }
       this.useLink = this.link;
       console.log(this.useLink,'--this.useLink')
     },