更换管理员增加新增新管理员姓名字段,更改密码原密码长度限制,增加待认证企业信息的展示

components/change/ChangeManagerSecondStep.vue

@@ -12,7 +12,7 @@
         <div class="content-bottom">
           <div>
             <el-form :model="valid2" :rules="rules2" ref="valid2" label-width="100px" class="demo-ruleForm">
-              <el-form-item prop="mobile">
+              <el-form-item prop="newAdminName">
                 <el-input v-model="valid2.newAdminName" placeholder="新管理员姓名"></el-input>
               </el-form-item>
               <el-form-item prop="mobile">

components/login/Login.vue

@@ -43,7 +43,11 @@
                   <i class="fa fa-user"></i>
                 </el-form-item>
                 <el-form-item prop="password">
-                  <el-input type="password" v-model="login.password" auto-complete="off" placeholder="密码"></el-input>
+                  <el-input type="password"
+                            v-model="login.password"
+                            auto-complete="off"
+                            placeholder="密码"
+                            @keyup.enter.native="isLogin(true)"></el-input>
                   <i class="fa fa-lock"></i>
                 </el-form-item>
                 <el-form-item prop="captcha" class="captcha" v-show="showCheckCode">

components/reset/ChangePasswordChooseStyle.vue

@@ -172,7 +172,12 @@
           this.oldPasswordChecked = false
         } else {
           if (this.valid1.password !== '') {
-            this.oldPasswordChecked = true
+            if (this.valid1.password.length >= 20) {
+              callback(new Error('密码长度不超过20个字符'))
+              this.oldPasswordChecked = false
+            } else {
+              this.oldPasswordChecked = true
+            }
           }
           callback()
         }

nuxt.config.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'https://city-service.ubtob.com' : 'http://10.1.51.50:8081/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'https://sso.ubtob.com/' : 'http://10.1.51.50:8081/')
 
 module.exports = {
   router: {

pages/cloudcenter/index.vue

@@ -87,7 +87,11 @@
         <div class="basic-info" v-show="activeTab === 1" v-if="user.userspace">
           <div class="basic-top">
             <div class="line">
-              <div class="people"><i class="enterprise-img"></i><em v-text="user.userspace.spaceName ? user.userspace.spaceName : '企业名称'"></em></div>
+              <div class="people"><i class="enterprise-img"></i>
+                <em v-text="user.userspace.spaceName ? user.userspace.spaceName : '企业名称'"></em>
+                <b v-if='user.userspace.validCode === 1 && user.newUserSpace' class="angle">——></b>
+                <em class="new" v-if='user.userspace.validCode === 1 && user.newUserSpace' v-text="user.newUserSpace.spaceName ?  user.userspace.spaceName : '企业名称'"></em>
+              </div>
             </div>
           </div>
           <div class="enterprise-bottom">
@@ -98,12 +102,13 @@
             <div class="enterprise">
               <div class="bind-info">企业认证</div>
               <div class="bind-detail">
-                <em v-text="user.userspace.validCode === 2 ? '已认证' : '未认证'"></em>
-                <a v-show="user.userspace.validCode != 2" href="/certification/enterpriseCertification">申请认证</a></div>
+                <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>
             </div>
             <div class="enterprise">
               <div class="bind-info">营业执照号</div>
               <div class="bind-detail">{{user.userspace.businessCode || '-'}}</div>
+              <div class="bind-detail new" v-if='user.userspace.validCode === 1 && user.newUserSpace'><b class="angle">——></b>{{user.newUserSpace.businessCode || '-'}}</div>
             </div>
             <div class="enterprise">
               <div class="bind-info">营业执照扫描件</div>
@@ -113,14 +118,22 @@
               </div>
               <div class="bind-detail"
                    v-show="!user.userspace.businessCodeImage">未上传</div>
+              <b v-if='user.userspace.validCode === 1 && user.newUserSpace' class="angle" style="float: left;">——></b>
+              <div class="bind-detail new"
+                   v-if='user.userspace.validCode === 1 && user.newUserSpace'
+                   v-show="user.newUserSpace.businessCodeImage">
+                附件: <span class="new">营业执照.jpg</span><i class="fa fa-eye" @click="showImg(user.newUserSpace.businessCodeImage)"></i>
+              </div>
             </div>
             <div class="enterprise">
               <div class="bind-info">法定代表人</div>
               <div class="bind-detail">{{user.userspace.corporation || '-'}}</div>
+              <div v-if='user.userspace.validCode === 1 && user.newUserSpace' class="bind-detail new"><b class="angle">——></b>{{user.newUserSpace.corporation || '-'}}</div>
             </div>
             <div class="enterprise">
               <div class="bind-info">注册地址</div>
               <div class="bind-detail">{{user.userspace.regAddress || '-'}}</div>
+              <div v-if='user.userspace.validCode === 1 && user.newUserSpace' class="bind-detail new"><b class="angle">——></b>{{user.newUserSpace.regAddress || '-'}}</div>
             </div>
           </div>
         </div>
@@ -171,6 +184,7 @@
               this.secretEmail = this.getEmailArr.join('')
             }
           }
+          console.log(this.$store.state.option.userInfo.data.content)
           return this.$store.state.option.userInfo.data.content
         }
       },
@@ -275,6 +289,14 @@
   .w-over-box .basic-info{
     width: 1200px;
     background: #fff;
+    b.angle{
+      margin: 0 10px;
+      font-weight: normal;
+      color: #000;
+    }
+    .new {
+      color: #2ab300 !important ;
+    }
     .basic-top{
       padding: 0 40px;
       width: 100%;
@@ -296,6 +318,9 @@
         font-size: 18px;
         color: #000;
       }
+      em.new{
+        color: #2ab300;
+      }
     }
     .basic-bottom{
       width: 100%;

store/index.js

@@ -36,6 +36,7 @@ export const actions = {
     commit('option/REQUEST_IS_LOGIN')
     return axios.get('/sso/login/isLogin')
     .then(response => {
+      console.log(response.data)
       commit('option/REQUEST_IS_LOGIN_SUCCESS', response.data)
     }, err => {
       commit('option/REQUEST_IS_LOGIN_FAILURE', err)