更换管理员申诉企业注册登录页面反馈问题的解决

components/appeal/ChangeManagerAppeal.vue

@@ -735,7 +735,7 @@
   span.tip{
     position: absolute;
     top: 0;
-    right: -215px;
+    right: -140px;
     font-size: 13px;
     color: #8c8c8c;
   a{
@@ -743,6 +743,10 @@
     color: #0076ad;
   }
   }
+  span.tip.exist {
+    color: #f56c6c;
+    font-size: 12px;
+  }
   span.tip.description {
     top: 10px;
     right: -266px;

components/login/Login.vue

@@ -5,7 +5,7 @@
       <div class="container">
         <div class="navbar-header">
           <input type="hidden" name="iconUrl" value="/static/img/icon_mall_index.png">
-          <a class="navbar-brand" id="navbar-brand" href="https://www.usoftmall.com/">
+          <a class="navbar-brand" id="navbar-brand">
             欢迎登录
           </a>
         </div>
@@ -237,7 +237,15 @@
               let bgUrl = response.data.content.bgUrl
               let bgColor = response.data.content.bgColor
               let bgLink = response.data.content.bgLink
-              document.getElementById('navbar-brand').style.backgroundImage = 'url(' + logoUrlStyle + ')'
+              let title = response.data.content.title || '欢迎登录'
+              let appId = response.data.content.appId
+              console.log(appId)
+              let nb = document.getElementById('navbar-brand')
+              nb.style.backgroundImage = 'url(' + logoUrlStyle + ')'
+              nb.innerHTML = title
+              if (appId === 'mall') {
+                nb.href = 'https://www.usoftmall.com/'
+              }
               let bg = document.getElementById('bgStyle')
               bg.style.backgroundImage = 'url(' + bgUrl + ')'
               bg.style.backgroundColor = bgColor

components/register/EnterpriseRegistration.vue

@@ -89,7 +89,12 @@
               <span class="tip passwordError" v-show="showPasswordError">两次输入密码不一致</span>
             </el-form-item>
             <el-form-item prop="email" v-if="!isHasEmail">
-              <el-input type="text" v-model="enterprise1.email" auto-complete="off" placeholder="联系邮箱"></el-input>
+              <el-input type="text"
+                        v-model="enterprise1.email"
+                        auto-complete="off"
+                        placeholder="联系邮箱"
+                        v-bind:class="{active: emailHasRegister}"></el-input>
+              <span class="codeError-tip" v-if="emailHasRegister">该邮箱已被注册</span>
             </el-form-item>
               <a class="btn finish"
                  :disabled="!isHasRegister ? !spaceNameChecked || !businessCodeChecked || !vipNameChecked || !passwordChecked || !passwordConfirmChecked || !emailChecked || !checked : !isHasEmail ? !spaceNameChecked || !businessCodeChecked || !passwordChecked || !emailChecked || !checked : !spaceNameChecked || !businessCodeChecked || !passwordChecked || !checked"
@@ -377,18 +382,34 @@
       var validateEmail = (rule, value, callback) => {
         if (this.isHasEmail) {
           this.emailChecked = true
+          this.emailHasRegister = false
         } else {
           if (!value) {
             callback(new Error('请填写正确的联系邮箱'))
             this.emailChecked = false
+            this.emailHasRegister = false
           } else {
             if (this.enterprise1.email) {
               var reg = /^([\w-])+(\.\w+)*@([\w-])+((\.\w{2,3}){1,3})$/
               if (!reg.test(value)) {
                 callback(new Error('请输入正确的邮箱地址格式'))
                 this.emailChecked = false
+                this.emailHasRegister = false
               } else {
-                this.emailChecked = true
+                this.$http.get(`/api/user/checkEmail`, {params: {email: this.enterprise1.email}})
+                  .then(response => {
+                    if (response.data.hasRegister) {
+                      console.log(response.data.hasRegister)
+                      this.emailChecked = false
+                      this.emailHasRegister = true
+                    } else {
+                      this.emailChecked = true
+                      this.emailHasRegister = false
+                      return Promise.reject(response.data)
+                    }
+                  }).catch(err => {
+                    this.$message.error(err.errMsg)
+                  })
               }
             }
             callback()
@@ -440,6 +461,7 @@
         phoneIsRegisterTip: true,
         isSpaceNameExist: false,
         isBusinessCodeExist: false,
+        emailHasRegister: false,
 //        企业注册第一步
         rules: {
           mobile: [
@@ -481,7 +503,6 @@
 //      获取校验码
       getCheckCode () {
         this.isShowLoading = true
-        console.log(this.isShowLoading)
         this.$http.get(`/sso/userspace/register/checkCode`, {params: {mobile: this.enterprise.mobile}})
           .then(response => {
             this.isShowLoading = false

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://192.168.253.12:32323/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'https://city-service.ubtob.com' : 'http://10.1.51.50:8081/')
 
 module.exports = {
   router: {

pages/cloudcenter/index.vue

@@ -40,7 +40,8 @@
                   <img v-show="user.user.emailValidCode != 2" src="/images/all/questions.png" alt="">
                   <span>绑定邮箱</span>
                 </div>
-                <div class="bind-tip">{{secretEmail}}</div>
+                <div class="bind-tip" v-show="user.user.emailValidCode === 2">{{secretEmail}}</div>
+                <div class="bind-tip" v-show="user.user.emailValidCode != 2">您还没有绑定邮箱哦!</div>
                 <a href="/validation/emailValidation" class="bind-btn" v-show="user.user.emailValidCode === 2">修改</a>
                 <a href="/validation/emailValidation" class="go-btn" v-show="user.user.emailValidCode != 2">设置</a>
               </div>