1、修改密码去除人工申诉；2、找回密码手机号输入框提示新手机号改成手机号；3、企业注册移动端和pc端注册提交按钮增加三个字段；4、实名认证增加认证状态并根据状态显示不同的提示文字；5、云中心企业认证认证状态为未通过时增加重新认证入口；6、云中心账号等级判断规格的更改；7、登录页面returnURL字段名称的更改

components/appeal/AccountAppeal.vue

@@ -337,6 +337,7 @@
           param.append('contactTel', this.account.contactTel)
           param.append('contactEmail', this.account.contactEmail)
           param.append('token', this.token)
+          param.append('appId', this.$store.state.option.appId)
           let config = {
             headers: {'Content-Type': 'multipart/form-data'}
           }

components/appeal/ChangeManagerAppeal.vue

@@ -582,6 +582,7 @@
           param.append('contactTel', this.changeManager.contactTel)
           param.append('contactEmail', this.changeManager.contactEmail)
           param.append('token', this.token)
+          param.append('appId', this.$store.state.option.appId)
           let config = {
             headers: {'Content-Type': 'multipart/form-data'}
           }

components/appeal/PasswordRestAppeal.vue

@@ -416,6 +416,7 @@
           param.append('contactTel', this.passwordRest.contactTel)
           param.append('contactEmail', this.passwordRest.contactEmail)
           param.append('token', this.token)
+          param.append('appId', this.$store.state.option.appId)
           let config = {
             headers: {'Content-Type': 'multipart/form-data'}
           }

components/login/Login.vue

@@ -51,7 +51,11 @@
                   <i class="fa fa-lock"></i>
                 </el-form-item>
                 <el-form-item prop="captcha" class="captcha" v-show="showCheckCode">
-                  <el-input type="text" v-model="login.captcha" auto-complete="off" class="code-input"></el-input>
+                  <el-input type="text"
+                            v-model="login.captcha"
+                            auto-complete="off"
+                            class="code-input"
+                            @keyup.enter.native="isLogin(true)"></el-input>
                   <img id="captchaImage" class="code-img" src="/sso/login/checkCode"/>
                   <a class="code-click" @click="getCode">看不清换一张</a>
                 </el-form-item>

components/mobile/loginMobile.vue

@@ -77,7 +77,7 @@
       },
       getUrl () {
         this.appId = this.$store.state.option.appId
-        this.returnUrl = this.$store.state.option.returnUrl
+        this.returnUrl = this.$store.state.option.returnURL
         this.baseUrl = this.$store.state.option.baseUrl
       },
       getCode () {

components/mobile/registerEnterprise/index.vue

@@ -401,6 +401,9 @@
         param.append('password', this.step2.password)
         param.append('email', this.step2.email || '')
         param.append('appId', this.$store.state.option.appId)
+        param.append('inviteSpaceUU', this.$store.state.option.inviteSpaceUU)
+        param.append('inviteUserUU', this.$store.state.option.inviteUserUU)
+        param.append('invitationTime', this.$store.state.option.invitationTime)
         let config = {
           headers: {'Content-Type': 'multipart/form-data'}
         }

components/register/EnterpriseRegistration.vue

@@ -587,23 +587,16 @@
         if (!this.isHasRegister) {
           if (this.spaceNameChecked && this.businessCodeChecked && this.vipNameChecked && this.passwordChecked && this.passwordConfirmChecked && this.emailChecked && this.checked) {
             this.isShowLoading = true
-            var url = window.location.search
-            var request = {}
-            if (url.indexOf('?' !== -1)) {
-              var str = url.substr(1)
-              var strs = str.split('&')
-              for (var i = 0; i < strs.length; i++) {
-                request[strs[i].split('=')[0]] = decodeURI(strs[i].split('=')[1])
-              }
-            }
-            var appId = request['appId'] || ''
             let param = new FormData()
             param.append('spaceName', this.enterprise1.spaceName)
             param.append('businessCode', this.enterprise1.businessCode)
             param.append('vipName', this.enterprise1.vipName || '')
             param.append('password', this.enterprise1.password)
             param.append('email', this.enterprise1.email || '')
-            param.append('appId', appId)
+            param.append('appId', this.$store.state.option.appId)
+            param.append('inviteSpaceUU', this.$store.state.option.inviteSpaceUU)
+            param.append('inviteUserUU', this.$store.state.option.inviteUserUU)
+            param.append('invitationTime', this.$store.state.option.invitationTime)
             let config = {
               headers: {'Content-Type': 'multipart/form-data'}
             }
@@ -630,7 +623,10 @@
               param.append('vipName', this.enterprise1.vipName || '')
               param.append('password', this.enterprise1.password)
               param.append('email', this.enterprise1.email || '')
-              param.append('appId', appId)
+              param.append('appId', this.$store.state.option.appId)
+              param.append('inviteSpaceUU', this.$store.state.option.inviteSpaceUU)
+              param.append('inviteUserUU', this.$store.state.option.inviteUserUU)
+              param.append('invitationTime', this.$store.state.option.invitationTime)
               let config = {
                 headers: {'Content-Type': 'multipart/form-data'}
               }
@@ -656,7 +652,10 @@
               param.append('vipName', this.enterprise1.vipName || '')
               param.append('password', this.enterprise1.password)
               param.append('email', this.enterprise1.email || '')
-              param.append('appId', appId)
+              param.append('appId', this.$store.state.option.appId)
+              param.append('inviteSpaceUU', this.$store.state.option.inviteSpaceUU)
+              param.append('inviteUserUU', this.$store.state.option.inviteUserUU)
+              param.append('invitationTime', this.$store.state.option.invitationTime)
               let config = {
                 headers: {'Content-Type': 'multipart/form-data'}
               }

components/reset/ChangePasswordChooseStyle.vue

@@ -25,11 +25,12 @@
             <img src="/images/all/icon02.png" alt="" class="first"/>
             <span>通过验证邮箱</span><i class="fa fa-angle-right second"></i>
           </div>
-          <div v-show="showManualAppeal"
-               @click="goPasswordSetAppeal">
-            <img src="/images/all/icon04.png" alt="" class="first"/>
-            <span>通过人工申诉</span><i class="fa fa-angle-right second"></i>
-          </div>
+          <!--修改密码隐藏人工申诉入口-->
+          <!--<div v-show="showManualAppeal"-->
+               <!--@click="goPasswordSetAppeal">-->
+            <!--<img src="/images/all/icon04.png" alt="" class="first"/>-->
+            <!--<span>通过人工申诉</span><i class="fa fa-angle-right second"></i>-->
+          <!--</div>-->
         </div>
       </div>
       <div class="content" v-show="showPasswordValid">

pages/cloudcenter/enterprise/index.vue

@@ -21,7 +21,7 @@
               </thead>
               <tbody>
               <tr v-for="item in member.content">
-                <td v-text="item.userUU === user.user.userUU ? '管理员' : '成员'"></td>
+                <td v-text="item.userUU === user.userspace.admin.userUU ? '管理员' : '成员'"></td>
                 <td v-text="item.vipName ? item.vipName : ''">李事业</td>
                 <td v-text="item.userUU ? item.userUU : ''">U456</td>
                 <td v-text="item.mobile ? item.mobile : ''">123456799+66</td>

pages/cloudcenter/index.vue

@@ -15,10 +15,10 @@
           <div class="basic-bottom">
             <div class="item">
               <div class="item-list">
-                <div class="pwd-level">账号安全等级</div>
-                <div class="pwd sm" v-show="user.user.passwordLevel === 1"><em></em><em></em><em></em><span>弱</span></div>
-                <div class="pwd md" v-show="user.user.passwordLevel === 2"><em></em><em></em><em></em><span>中</span></div>
-                <div class="pwd lar" v-show="user.user.passwordLevel === 3"><em></em><em></em><em></em><span>强</span></div>
+                <div class="pwd-level" @click="showLevel">账号安全等级</div>
+                <div class="pwd sm" v-show="accountLevel === 0"><em></em><em></em><em></em><span>弱</span></div>
+                <div class="pwd md" v-show="accountLevel === 1"><em></em><em></em><em></em><span>中</span></div>
+                <div class="pwd lar" v-show="accountLevel === 2"><em></em><em></em><em></em><span>强</span></div>
               </div>
             </div>
             <div class="item items">
@@ -79,7 +79,8 @@
                 </div>
                 <div class="bind-tip">实名认证后，可通过实名信息找回支付密码、修改手机号等，提高账户安全性。</div>
                 <a href="/certification/realNameCertification" class="bind-btn" v-show="user.user.identityValidCode === 2">修改</a>
-                <a href="/certification/realNameCertification" class="go-btn" v-show="user.user.identityValidCode != 2">设置</a>
+                <a href="/certification/realNameCertification" class="go-btn" v-show="user.user.identityValidCode === 0 || user.user.identityValidCode === 3">设置</a>
+                <span class="wait-btn" v-show="user.user.identityValidCode === 1">认证中</span>
               </div>
             </div>
           </div>
@@ -103,7 +104,9 @@
               <div class="bind-info">企业认证</div>
               <div class="bind-detail">
                 <em v-text="user.userspace.validCode === 0 ? '未认证' : user.userspace.validCode === 1 ? '待认证' : user.userspace.validCode === 2 ? '已认证' : user.userspace.validCode === 3 ? '未通过' : ''"></em>
-                <a v-show="user.userspace.validCode === 0" href="/certification/enterpriseCertification">申请认证</a></div>
+                <a v-show="user.userspace.validCode === 0" href="/certification/enterpriseCertification">申请认证</a>
+                <a v-show="user.userspace.validCode === 3" href="/certification/enterpriseCertification">重新认证</a>
+              </div>
             </div>
             <div class="enterprise">
               <div class="bind-info">营业执照号</div>
@@ -162,7 +165,8 @@
           secretMobile: '',
           secretEmail: '',
           isShow: false,
-          imgUrl: ''
+          imgUrl: '',
+          accountLevel: ''
         }
       },
       computed: {
@@ -184,6 +188,7 @@
               this.secretEmail = this.getEmailArr.join('')
             }
           }
+          console.log(this.$store.state.option.userInfo.data.content + 'user')
           return this.$store.state.option.userInfo.data.content
         }
       },
@@ -205,10 +210,35 @@
           }
         }
       },
+      mounted () {
+//      获取账号等级
+        this.$nextTick(() => {
+          this.showLevel()
+        })
+      },
       methods: {
         showImg (imgUrl) {
           this.imgUrl = imgUrl
           this.isShow = true
+        },
+        showLevel () {
+          var totle = !!(this.user.user.identityValidCode === 2) + !!(this.user.user.hasQuestion) + !!(this.user.user.mobileValidCode === 2) + !!(this.user.user.passwordLevel >= 2) + !!(this.user.user.emailValidCode === 2)
+          switch (totle) {
+            case 0:
+            case 1:
+            case 2:
+              // 低
+              this.accountLevel = 0
+              break
+            case 3:
+            case 4:
+              // 中
+              this.accountLevel = 1
+              break
+            default:
+              // 高
+              this.accountLevel = 2
+          }
         }
       }
     }
@@ -435,6 +465,17 @@
           color: #fff;
           background: #0076ad;
         }
+        .wait-btn{
+          margin-top: 15px;
+          float: right;
+          display: inline-block;
+          width: 86px;
+          text-align: center;
+          height: 30px;
+          line-height: 30px;
+          font-size: 14px;
+          color: #8c8c8c;
+        }
       }
     }
     .enterprise-bottom{

store/index.js

@@ -14,11 +14,17 @@ export const actions = {
     // 保存appId和returnUrl信息
     if (route.query) {
       let appId = route.query.appId || ''
-      let returnUrl = route.query.returnUrl || ''
+      let returnUrl = route.query.returnURL || ''
       let baseUrl = route.query.baseUrl || ''
+      let inviteSpaceUU = route.query.inviteSpaceUU || ''
+      let inviteUserUU = route.query.inviteUserUU || ''
+      let invitationTime = route.query.invitationTime || ''
       store.commit('option/SET_APPID', appId)
       store.commit('option/SET_RETURNURL', returnUrl)
       store.commit('option/SET_BASEURL', baseUrl)
+      store.commit('option/SET_INVITESPACEUU', inviteSpaceUU)
+      store.commit('option/SET_INVITEUSERUU', inviteUserUU)
+      store.commit('option/SET_INVITATIONTIME', invitationTime)
     }
     // 设置跳转的URL
     if (!isDev) {
@@ -37,6 +43,7 @@ export const actions = {
     return axios.get('/sso/login/isLogin')
     .then(response => {
       console.log(response.data)
+      console.log(1)
       commit('option/REQUEST_IS_LOGIN_SUCCESS', response.data)
     }, err => {
       commit('option/REQUEST_IS_LOGIN_FAILURE', err)
@@ -47,6 +54,8 @@ export const actions = {
     commit('option/REQUEST_USER_INFO')
     return axios.get('/sso/center/user/info')
       .then(response => {
+        console.log(2)
+        console.log(response.data)
         commit('option/REQUEST_USER_INFO_SUCCESS', response.data)
       }, err => {
         commit('option/REQUEST_USER_INFO_FAILURE', err)

store/option.js

@@ -15,6 +15,8 @@ export const state = {
   appId: '',
   returnUrl: '',
   baseUrl: '',
+  inviteSpaceUU: '',
+  inviteUserUU: '',
   // 用户信息
   isLogin: {
     // 是否登录
@@ -59,6 +61,15 @@ export const mutations = {
   SET_BASEURL (state, result) {
     state.baseUrl = result || ''
   },
+  SET_INVITESPACEUU (state, result) {
+    state.inviteSpaceUU = result || ''
+  },
+  SET_INVITEUSERUU (state, result) {
+    state.inviteUserUU = result || ''
+  },
+  SET_INVITATIONTIME (state, result) {
+    state.invitationTime = result || ''
+  },
   REQUEST_USER_INFO (state) {
     state.userInfo.fetching = true
   },