Merge remote-tracking branch 'origin/developerC' into developerC

src/main/resources/static/js/account/login.js

@@ -24,6 +24,11 @@ var loginPage = new Vue({
             permission: '',
             token: ''
         },
+        applyUse:{
+            clubId: '',
+            shopId: '',
+            token:'',
+        },
         isWeChat: false,
         text:'',
         stautsfalse:false,
@@ -38,7 +43,7 @@ var loginPage = new Vue({
         },
         information:function(){
             window.location.href='/supplier/information.html';
-            this.setStorages( this.userData);
+            this.setStorages( this.applyUse);
         },
         toQrCodeLogin: function(){//切换微信登录二维码
             var _self = this;
@@ -137,15 +142,12 @@ var loginPage = new Vue({
                         _self.text ='您的供应商账号审核未通过，原因：图片模糊，营业执照错误，审核人员在后台填写的内容';
                         _self.stautsfalse = true;
                         _self.infofalse = true;
-                        _self.userData = {
+                        _self.applyUse = {
                             userId: response.data.userId,
-                            spId: response.data.serviceProviderId,
-                            clubId: response.data.clubId,
                             shopId: response.data.shopId,
-                            userIdentity: response.data.userIdentity,
-                            permission: response.data.userPermission,
                             token: response.data.token
                         };
+                        console.log(_self.applyUse);
                     }else if(response.code == '-2'){
                         _self.stautsfalse = true;
                         _self.text ='您的供应商账号正在加速审核中，审核通过后即可登录';
@@ -228,16 +230,11 @@ var loginPage = new Vue({
                         _self.text =response.msg;
                         _self.stautsfalse = true;
                         _self.infofalse = true;
-                        _self.userData = {
+                        _self.applyUse = {
                             userId: response.data.userId,
-                            spId: response.data.serviceProviderId,
-                            clubId: response.data.clubId,
                             shopId: response.data.shopId,
-                            userIdentity: response.data.userIdentity,
-                            permission: response.data.userPermission,
                             token: response.data.token
                         };
-                        console.log(_self.userData)
                     }else if(response.code == '-2'){
                         _self.stautsfalse = true;
                         _self.text =response.msg;
@@ -248,7 +245,7 @@ var loginPage = new Vue({
             });
         },
         setStorages:function(data){//存储本地数据
-            localStorage.setItem('userInfo',JSON.stringify(data));
+            localStorage.setItem('APPLY_INFO',JSON.stringify(data));
         }
     },
     created: function () {

src/main/resources/static/js/account/supplier-information.js

@@ -282,11 +282,9 @@ var registerPage = new Vue({
     },
     mounted: function () {
         var _self = this;
-        if(globalUserData) {
-            _self.supplierUser.userId = globalUserData.userId;
-            _self.supplierUser.shopId = globalUserData.shopId;
-        }
-        _self.infoData = JSON.parse(CAIMEI.Storage.getItem('userInfo'));
+        _self.infoData = JSON.parse(CAIMEI.Storage.getItem('APPLY_INFO'));
+        _self.supplierUser.userId =  _self.infoData.userId;
+        _self.supplierUser.shopId =  _self.infoData.shopId;
         _self.shopInfo();
         _self.GetProvinceFn();
     }