updated

src/main/resources/static/js/account/mixins/loginMixins.js

@@ -33,7 +33,10 @@ var loginMixins = function () {
                     if (!verifyForm()) { return false; }
                     _self.loginLoading = true;
                     UserApi.PostLoginAccount(_self.accountParams,function(response){
-                        _self.requireBaseLoginStatus(response)
+                        if (sessionStorage.getItem('saveParams')) {
+                            _self.requireBaseLoginStatus(response)
+                            return
+                        }
                         _self.userUpdataeStatus(response)
                     });
                 });
@@ -45,7 +48,10 @@ var loginMixins = function () {
                     if (!verifyForm()) { return false; }
                     _self.loginLoading = true;
                     UserApi.userCodeLogin(_self.codeParams,function(response){
-                        _self.requireBaseLoginStatus(response)
+                        if (sessionStorage.getItem('saveParams')) {
+                            _self.requireBaseLoginStatus(response)
+                            return
+                        }
                         _self.userUpdataeStatus(response)
                     });
                 });

src/main/resources/static/js/account/register-club.js

@@ -131,7 +131,10 @@ var registerPage = new Vue({
                 UserApi.ClubRegister(params,function (response) {
                     if(response.code === 0){
                         CAIMEI.dialog('注册成功！',true,function () {
-                            _self.requireBaseLoginStatus(response)
+                            if (sessionStorage.getItem('saveParams')) {
+                                _self.requireBaseLoginStatus(response)
+                                return
+                            }
                             _self.clubLogin();
                             _self.showTabContentIndex = 2;
                             _self.loginLoading = false;

src/main/resources/static/js/document/database-share.js

@@ -8,6 +8,25 @@ var dataBaseShare = {
         requireBaseLoginStatus(res) {
             const params = JSON.parse(window.sessionStorage.getItem('saveParams'))
             if (params.isDataBase && res.code === 0) {
+                const userData = {
+                    account: res.data.account,
+                    email: res.data.email,
+                    phone: res.data.bindMobile,
+                    name: res.data.name,
+                    userName: res.data.userName,
+                    userId: res.data.userId,
+                    spId: res.data.serviceProviderId,
+                    clubId: res.data.clubId,
+                    shopId: res.data.shopId,
+                    userIdentity: res.data.userIdentity,
+                    permission: res.data.userPermission,
+                    token: res.data.token,
+                    vipFlag: res.data.vipFlag,
+                    firstClubType: res.data.firstClubType,
+                    listingFee:res.data.listingFee,
+                    shopIsOrder:res.data.shopIsOrder
+                };
+                localStorage.setItem('userInfo', JSON.stringify(userData))
                 const link = isDev ? 'https://material-b.caimei365.com' : 'https://material.caimei365.com'
                 setTimeout(() => {
                     window.location.href = `${link}/preview?t=${params.t}&id=${params.id}&uid=${res.data.userId}&spId=${params.spId}`
@@ -23,6 +42,12 @@ var dataBaseShare = {
                 })
             }
             window.sessionStorage.setItem('saveParams', JSON.stringify(f))
+        },
+        updateStatus() {
+            const params = JSON.parse(window.sessionStorage.getItem('saveParams'))
+            setTimeout(() => {
+                window.location.href = `${link}/preview?t=${params.t}&id=${params.id}&uid=${res.data.userId}&spId=${params.spId}`
+            }, 1000)
         }
     }
 }

src/main/resources/static/js/user-center/setting/upgrade.js

@@ -230,7 +230,10 @@ var upgradePage = new Vue({
                 UserApi.ClubUpgrade(params,function (response) {
                     if(response.code === 0){
                         CAIMEI.Alert('升级信息提交成功，审核通过后您的身份即成为会员机构并且获得500采美豆的奖励','知道了',true,function () {
-                            _self.requireBaseLoginStatus(response)
+                            if (sessionStorage.getItem('saveParams')) {
+                                _self.updateStatus()
+                                return
+                            }
                             _self.clubLoginIndex();
                             _self.loginLoading = false;
                         });