Merge remote-tracking branch 'origin/dev' into dev

assets/scss/common.scss

@@ -386,7 +386,22 @@ form .el-form-item .el-form-item__content .el-textarea .el-textarea__inner{
   border-top: 0 !important;
   border-left: 0 !important;
 }
-
+form .text-position .el-form-item__content{
+  line-height: 20px;
+}
+form .text-position .el-form-item__content .el-checkbox .el-checkbox__inner{
+  width: 14px;
+  height: 14px;
+  border: 1px solid #ccc;
+}
+form .text-position .el-form-item__content .el-checkbox .el-checkbox__label{
+  padding-left: 8px;
+  font-size: 12px;
+  color: #606266;
+}
+form .text-position .el-form-item__content .el-checkbox .el-checkbox__input.is-checked+.el-checkbox__label {
+  color: #409EFF;
+}
 //登录页面样式
 //错误提示框变红隐藏
 .login-form .el-form-item.is-error .el-input__inner, .login-form .el-form-item.is-error .el-input__inner:focus, .login-form .el-form-item.is-error .el-textarea__inner, .login-form .el-form-item.is-error .el-textarea__inner:focus, .login-form .el-message-box__input input.invalid, .login-form .el-message-box__input input.invalid:focus {

components/register/EnterpriseRegistration.vue

@@ -46,13 +46,15 @@
                         placeholder="企业名称"
               ></el-input>
               <span class="tip exist" v-show="isSpaceNameExist">
-                {{spaceNameExitMsg}} <i class="fa fa-question-circle" aria-hidden="true"
-                                       v-show="spaceNameExitMsg != '出现异常'"
-                                       @mouseenter='showPopTip =true'
-                                       @mouseleave='showPopTip = false'></i>
+                {{spaceNameExitMsg}}
+                <!--<i class="fa fa-question-circle" aria-hidden="true"-->
+                                       <!--v-show="spaceNameExitMsg != '出现异常'"-->
+                                       <!--@mouseenter='showPopTip =true'-->
+                                       <!--@mouseleave='showPopTip = false'></i>-->
               </span>
-              <div class="pop-tip"  @mouseenter='showPopTip =true'
-                   @mouseleave='showPopTip = false'> <span class='pop-title' v-show="showPopTip">如果您所属企业的管理员已离职或不再使用优软云，请 <a href="/appeals/changeManagerAppeal">更换管理员</a> </span></div>
+              <!--<div class="pop-tip"  @mouseenter='showPopTip =true'-->
+                   <!--@mouseleave='showPopTip = false'> <span class='pop-title' v-show="showPopTip">如果您所属企业的管理员已离职或不再使用优软云，请 <a href="/appeals/changeManagerAppeal">更换管理员</a> </span>-->
+              <!--</div>-->
             </el-form-item>
             <el-form-item prop="businessCode">
               <el-input type="text"
@@ -214,7 +216,7 @@
                   }
                 }).catch(err => {
                   this.spaceNameExitMsg = err.errMsg
-//                  this.$message.error(err.errMsg)
+                  // this.$message.error(err.errMsg)
                 })
             }
           }
@@ -384,34 +386,27 @@
           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.$http.get(`/api/user/checkEmail`, {params: {email: this.enterprise1.email}})
-                  .then(response => {
-                    if (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)
-                  })
-              }
+          if (value && 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.$http.get(`/api/user/checkEmail`, {params: {email: this.enterprise1.email}})
+                .then(response => {
+                  if (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()
           }
         }
       }