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

src/pages/home/index.vue

@@ -508,6 +508,9 @@ export default {
         wx.removeStorage({
           key: "enterpriseAccount"
         });
+        // 每次退出登录都删除导购数据
+        wx.removeStorage({ key: this.$store.state.mixid+'setGuideEmployeeId' });
+        wx.removeStorage({ key: this.$store.state.mixid+'guide_QRCodeType' });
       }
       this.options = wx.getStorageSync("becomeInfo");
       this.changeLocation = options.changeLocation || ''
@@ -539,6 +542,9 @@ export default {
         wx.removeStorage({
           key: "enterpriseAccount"
         });
+        // 每次退出登录都删除导购数据
+        wx.removeStorage({ key: this.$store.state.mixid+'setGuideEmployeeId' });
+        wx.removeStorage({ key: this.$store.state.mixid+'guide_QRCodeType' });
       }
       // 获取页面数据
       if (this.mpApp.globalData.pageList && !this.reloadPage) {

src/pages/index/index.vue

@@ -318,6 +318,9 @@ export default {
       wx.removeStorage({
         key: "enterpriseAccount"
       });
+      // 每次退出登录都删除导购数据
+      wx.removeStorage({ key: this.$store.state.mixid+'setGuideEmployeeId' });
+      wx.removeStorage({ key: this.$store.state.mixid+'guide_QRCodeType' });
     } else if (options.from && options.from == "address") {
       log.info('options.from == "address"')
       // 来自小程序地址页面
@@ -350,6 +353,9 @@ export default {
                   offlineShopName:paramsObj.offlineShopName,
                 });
               }
+              if (paramsObj.QRCodeType) {
+                wx.setStorageSync(this.$store.state.mixid+'guide_QRCodeType', paramsObj.QRCodeType);
+              }
               wx.setStorageSync('attractingCustomerChannelId',paramsObj.attractingCustomerChannelId);
               wx.setStorageSync(this.$store.state.mixid+'storeId',paramsObj.storeId);
               wx.setStorageSync(this.$store.state.mixid+'sellerId',paramsObj.sellerId);

src/pages/login/index.vue

@@ -802,6 +802,15 @@ export default {
         query.spokesmanGroupId = this.$store.state.spokesmanGroupId;
         query.spokesmanShopId = this.$store.state.spokesmanShopId;
       }
+      // 导购海报分享来源
+      const shareQRCodeType = wx.getStorageSync(this.$store.state.mixid + 'guide_QRCodeType');
+      if (shareQRCodeType) {
+        query.customerSourceType = {
+          coupon: 17, // 优惠券海报
+          home: 18, // 门店海报
+          goods: 19, // 商品海报
+        }[shareQRCodeType];
+      }
       log.info(query,'bindUser-query-500')
       login
         .bindUser(query)