Browse Source

调整样式,DEP统计功能

zhengjinyi 1 year ago
parent
commit
c843c85a07

+ 2 - 0
src/main/resources/static/js/account/login.js

@@ -160,6 +160,7 @@ var loginPage = new Vue({
                             account: response.data.account,
                             email: response.data.email,
                             phone: response.data.bindMobile,
+                            partnerId: response.data.partnerId,
                             name: response.data.name,
                             userName: response.data.userName,
                             userId: response.data.userId,
@@ -193,6 +194,7 @@ var loginPage = new Vue({
                             account: response.data.account,
                             email: response.data.email,
                             phone: response.data.bindMobile,
+                            partnerId: response.data.partnerId,
                             name: response.data.name ? response.data.name : response.data.userName,
                             userName: response.data.userName,
                             userId: response.data.userId,

+ 1 - 0
src/main/resources/static/js/account/register-club.js

@@ -278,6 +278,7 @@
                         account: response.data.account,
                         email: response.data.email,
                         phone: response.data.bindMobile,
+                        partnerId: response.data.partnerId,
                         name: response.data.name ? response.data.name : response.data.userName,
                         userName: response.data.userName,
                         userId: response.data.userId,

+ 9 - 2
src/main/resources/static/js/mixins/cmSysMixins.js

@@ -55,9 +55,16 @@ var cmSysVitaMixins = function () {
             handleCmSysNetInfo() {
                 //设置定时器
                 const globalUserData = JSON.parse(localStorage.getItem('userInfo'));
-                if(globalUserData){ this.cmSysParams.userId = globalUserData.userId * 1; }
+                if(globalUserData){
+                    this.cmSysParams.userId = globalUserData.userId * 1;
+                    this.cmSysParams.partnerId = globalUserData.partnerId
+                }else{
+                    const partnerId = CAIMEI.Storage.getItem('partnerId')
+                    if(partnerId){
+                        this.cmSysParams.partnerId = partnerId*1
+                    }
+                }
                 if( this.handleProsId || this.handleShopId || this.handlearticleId || this.handleProsKey || this.handleShopKey ){
-                    this.popUpParams.partnerId = globalUserData.partnerId
                     this.popUpParams.shopId = this.handleShopId
                     this.popUpParams.productId = this.handleProsId
                     this.popUpParams.infoId = this.handlearticleId