updated

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

@@ -113,8 +113,6 @@ var registerPage = new Vue({
                     CAIMEI.dialog('两次密码输入不一致',false,function () {});
                     return;
                 }
-                const shareParams = JSON.parse(sessionStorage.getItem('saveParams'))
-                const spId = (_self.isAgreed && shareParams.spId) ? shareParams.spId : '';
                 var params = {
                         source:0,
                         userName : _self.clubUser.name,
@@ -125,16 +123,12 @@ var registerPage = new Vue({
                         isAgreed :  _self.isAgreed,
                         isSp: _self.clubUser.isSp,
                         insideFLag:0, //内外部协销标记 0内部协销,1外部协销
-                        spId, // 协销分享的id
+                        spId: '', // 协销分享的id
                 };
                 _self.loginLoading = true;
                 UserApi.ClubRegister(params,function (response) {
                     if(response.code === 0){
                         CAIMEI.dialog('注册成功！',true,function () {
-                            if (sessionStorage.getItem('saveParams')) {
-                                _self.requireBaseLoginStatus(response)
-                                return
-                            }
                             _self.clubLogin();
                             _self.showTabContentIndex = 2;
                             _self.loginLoading = false;
@@ -270,6 +264,10 @@ var registerPage = new Vue({
             var params =  {mobileOrEmail: _self.clubUser.phone,password: _self.clubUser.password};
             UserApi.PostLoginAccount(params,function(response){
                 if(response.code === 0){
+                    if (sessionStorage.getItem('saveParams')) {
+                        _self.requireBaseLoginStatus(response)
+                        return
+                    }
                     _self.clubUpgradeUser.userId =  response.data.userId;
                     _self.clubUpgradeUser.clubId =  response.data.clubId;
                     _self.userName = response.data.userName;

src/main/resources/static/js/base.js

@@ -38,7 +38,7 @@ if(localStorage.getItem('userInfo')){
     var weChatLoginFlag = (Number(getBaseCookie("weChatAutoLogin"))===1 || Number(getBaseCookie("weChatAutoLogin"))===2);
     if(pathname.indexOf('/product/auth/') === -1 && !weChatLoginFlag ){
         var userAgent = navigator.userAgent.toLowerCase();
-        if (userAgent.match(/MicroMessenger/i)) {
+        if (userAgent.match(/MicroMessenger/i) && !sessionStorage.getItem('saveParams')) {
             // 微信浏览器自动授权登录
             var urlForWeChat = 'https://www.caimei365.com/we_chat/redirect_uri.html';
             $.get(coreServer+'/user/login/auth/link?mode=1&redirectUri='+urlForWeChat, function(r){

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

@@ -8,7 +8,7 @@ var dataBaseShare = {
     methods: {
         requireBaseLoginStatus(res) {
             const params = JSON.parse(window.sessionStorage.getItem('saveParams'))
-            if (params.isDataBase && res.code === 0) {
+            if (params.isDataBase && res.code === 0 && res.data) {
                 const userData = {
                     account: res.data.account,
                     email: res.data.email,
@@ -28,8 +28,10 @@ var dataBaseShare = {
                     shopIsOrder:res.data.shopIsOrder
                 };
                 localStorage.setItem('userInfo', JSON.stringify(userData))
+            }
+            if (res.code === 0) {
                 setTimeout(() => {
-                    window.location.href = `${dataBaseLink}/preview?t=${params.t}&id=${params.id}&uid=${res.data.userId}&spId=${params.spId}`
+                    window.location.href = `${dataBaseLink}/preview?t=${params.t}&id=${params.id}&uid=${res.data.userId}&suid=${params.suid}`
                 }, 1000)
             }
         },

src/main/resources/static/js/mixins/cmSysMixins.js

@@ -77,7 +77,7 @@ var cmSysVitaMixins = function () {
                     this.cmSysParams.pageLabel = pageData ? pageData.pageLabel : '';
                 }
                 this.cmSysParams.pagePath = pagePath;
-                this.cmSysParams.headUserId = databaseShareData?.spId || ''
+                this.cmSysParams.headUserId = databaseShareData?.suid || ''
                 this.cmSysParams.productArchiveId = databaseShareData?.id || ''
                 console.log(this.cmSysParams)
                 setTimeout(()=>{