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

src/pages/home/index.vue

@@ -136,6 +136,7 @@ import couponPopup from '@/components/couponPopup.vue'
 import NewUser from "../../components/newCustomer/newUser";
 import NewPolite from "../../components/newCustomer/newPolite";
 import { setTabBarActive, checkTabbarPage,themeColor } from "../../utils/mayi.js";
+import indexApi from "@/api/index.js";
 import { throttle, concatUrl } from "../../utils/index.js"
 const app = getApp();
 
@@ -237,6 +238,38 @@ export default {
         data: JSON.stringify(options)
       });
     }
+    if(options.scene){
+      //新二维码扫码进入
+      wx.nextTick(() => {
+        indexApi.getShareSceneRecord(options.scene).then(res=>{
+          if(res.data.code == '200'){
+            this.page = res.data.data.pageUri;
+            let paramsObj = JSON.parse(res.data.data.scene);
+            wx.setStorageSync('attractingCustomerChannelId',paramsObj.attractingCustomerChannelId);
+            wx.setStorageSync(this.$store.state.mixid+'storeId',paramsObj.storeId);
+            wx.setStorageSync(this.$store.state.mixid+'sellerId',paramsObj.sellerId);
+            console.log(res.data.data)
+            console.log(wx.getStorageSync("openid"))
+            console.log(333333)
+            if(wx.getStorageSync("openid")) {
+              indexApi.addRecord(
+                {
+                  attractingCustomersChannelId: paramsObj.attractingCustomerChannelId,
+                  miniOpenId: wx.getStorageSync("openid"),
+                  registerFlag: 1,
+                  newRegisterFlag: 0,
+                }
+              ).then(ele=>{
+                //清空引客渠道id
+                wx.setStorageSync('attractingCustomerChannelId','');
+              })
+            }
+          }
+        }).catch((err)=>{
+
+        })    
+      });
+    }
     Object.assign(this.$data, this.$options.data());
     if (options.from && options.from == "logout") {
       //来自用户登出
@@ -331,6 +364,7 @@ export default {
       if(wx.getStorageSync("sessionid")) {
         //清空门店id
         wx.setStorageSync(this.$store.state.mixid+'storeId','')
+        wx.setStorageSync(this.$store.state.mixid+'sellerId','')
         console.log(111222,app.fenxiaoModel)
         app.fenxiaoModel.query_isEntry().then((data)=>{
           //分销弹框信息

src/pages/index/index.vue

@@ -89,6 +89,7 @@ export default {
     if(wx.getStorageSync("sessionid")) {
       //清空门店id
       wx.setStorageSync(this.$store.state.mixid+'storeId','')
+      wx.setStorageSync(this.$store.state.mixid+'sellerId','')
     }
     this.options = options;
     Object.assign(this.$data, this.$options.data());
@@ -204,6 +205,7 @@ export default {
               let paramsObj = JSON.parse(res.data.data.scene);
               wx.setStorageSync('attractingCustomerChannelId',paramsObj.attractingCustomerChannelId);
               wx.setStorageSync(this.$store.state.mixid+'storeId',paramsObj.storeId);
+              wx.setStorageSync(this.$store.state.mixid+'sellerId',paramsObj.sellerId);
               console.log(res.data.data)
               console.log(wx.getStorageSync("openid"))
               console.log(333333)

src/pages/login/index.vue

@@ -402,6 +402,7 @@ export default {
         city: this.userInfo.city,
         otherPhone: 0,
         storeId: wx.getStorageSync(this.$store.state.mixid+'storeId') || '',
+        sellerId: wx.getStorageSync(this.$store.state.mixid+'sellerId') || '',
         articleId: wx.getStorageSync(this.$store.state.mixid+"articleId") || '',
         customerSourceType: wx.getStorageSync(this.$store.state.mixid+"articleId")?8:'',
         customerSourceId: wx.getStorageSync(this.$store.state.mixid+"articleId") || ''
@@ -469,6 +470,10 @@ export default {
       if(wx.getStorageSync(this.$store.state.mixid+'storeId')) {
         query.storeId = wx.getStorageSync(this.$store.state.mixid+'storeId')
       }
+      //埋点导购员
+      if(wx.getStorageSync(this.$store.state.mixid+'sellerId')) {
+        query.sellerId = wx.getStorageSync(this.$store.state.mixid+'sellerId')
+      }
       //绑定手机号
       wx.navigateTo({
         url: `../index/main?from=login&backpath=/login/wxRegister&params=${encodeURIComponent(

src/pages/wxArticle/index.vue

@@ -29,6 +29,7 @@ export default {
     };
   },
   async onLoad(options) {
+    this.link='';
     console.log(options, "第三方页面");
     /**
      * scene=sso 第三方需要登录的页面
@@ -145,6 +146,7 @@ export default {
       };
       login.getSsoBcakUrl(op).then((res) => {
         if (res.data.code == "200") {
+          console.log('14888888',res)
           this.setLink(res.data.data);
         } else {
           wx.showToast({ title: res.data.msg, icon: "none" });