fix enAuth

src/pages/UserCenter/EnterpriseAuth.vue

@@ -1,16 +1,16 @@
 <template>
-  <div class="right-modifyPsw"  v-loading="loading">
+  <div class="right-modifyPsw" v-loading="loading">
     <div class="right-modifyPsw-title">
       <span style="font-size: 18px;font-weight: bold">企业认证</span>
       <el-tag :type="authStatus.style" v-if="authType===1">{{authStatus.text}}</el-tag>
       <el-tag type="danger" v-if="authType===0">未认证</el-tag>
-<!--      <el-button type="primary" class="pull-right" size="small" v-if="canEdit" @click="canEdit = true">编辑</el-button>-->
+      <!--      <el-button type="primary" class="pull-right" size="small" v-if="canEdit" @click="canEdit = true">编辑</el-button>-->
     </div>
     <el-steps :active="active" process-status="finish" style="width: 400px;margin: 0 auto;margin-bottom: 20px;">
       <el-step title="上传企业信息"></el-step>
       <el-step title="上传法人信息"></el-step>
-<!--      <el-step title="确认信息"></el-step>-->
-<!--      <el-step title="认证结果"></el-step>-->
+      <!--      <el-step title="确认信息"></el-step>-->
+      <!--      <el-step title="认证结果"></el-step>-->
     </el-steps>
     <el-alert
       v-if="failureReason&&failureReason!==''"
@@ -18,7 +18,8 @@
       type="error">
     </el-alert>
     <div v-if="active===0" class="uploader-wrapper">
-      <el-form ref="enterpriseForm1" :model="enterpriseForm1" :rules="rules1" label-width="100px" style="width: 600px;margin-top: 10px">
+      <el-form ref="enterpriseForm1" :model="enterpriseForm1" :rules="rules1" label-width="100px"
+               style="width: 600px;margin-top: 10px">
         <el-form-item label="企业logo:" prop="agencyPhoto">
           <el-upload
             class="avatar-uploader"
@@ -34,57 +35,73 @@
           </el-upload>
         </el-form-item>
         <el-form-item label="企业名称:" prop="evaluationAgencyName">
-          <el-input :disabled="!canEdit" v-model="enterpriseForm1.evaluationAgencyName" placeholder="身份证前后不能有空格"></el-input>
+          <el-input :disabled="!canEdit" v-model="enterpriseForm1.evaluationAgencyName"
+                    placeholder="身份证前后不能有空格"></el-input>
+        </el-form-item>
+        <el-form-item label="营业执照:" prop="businessLicensePhoto" style="width: 850px">
+          <el-row class="agency-form-item">
+            <el-col :span="10">
+              <div class="uploader-businessLicensePhoto">
+                <el-upload
+                  class="avatar-uploader idcard-uploader"
+                  style="border: lightgrey 1px solid"
+                  action="https://jsonplaceholder.typicode.com/posts/"
+                  :before-upload="beforeFileUpload"
+                  :http-request="uploadFile"
+                  :data="{type:2}"
+                  :disabled="!canEdit"
+                >
+                  <img v-if="enterpriseForm1.businessLicensePhoto" :src="enterpriseForm1.businessLicensePhoto"
+                       class="avatar">
+                  <i v-else class="el-icon-plus avatar-uploader-icon card-uploader-icon"></i>
+                </el-upload>
+                <div><span style="color: red">*</span>营业执照：（仅支持三证合一）</div>
+              </div>
+            </el-col>
+            <el-col :span="14">
+              <div class="authentication-detail">
+                <div class="authentication-detail-title">证件要求</div>
+                <ul class="authentication-detail-list" style="padding-left:0 ">
+                  <li>必须为清晰、完整的彩色原件扫描件或数码照</li>
+                  <li>仅支持.jpg .bmp .png .gif的图片格式，图片大小不超过4M</li>
+                  <li>必须在有效期内且年检章齐全（当年成立的公司可无年检章）</li>
+                  <li>必须为中国大陆工商局颁发</li>
+                </ul>
+              </div>
+            </el-col>
+          </el-row>
         </el-form-item>
-      <el-form-item label="营业执照:" prop="businessLicensePhoto" style="width: 850px">
-        <el-row class="agency-form-item">
-          <el-col :span="10">
-            <div class="uploader-businessLicensePhoto">
-              <el-upload
-                class="avatar-uploader idcard-uploader"
-                style="border: lightgrey 1px solid"
-                action="https://jsonplaceholder.typicode.com/posts/"
-                :before-upload="beforeFileUpload"
-                :http-request="uploadFile"
-                :data="{type:2}"
-                :disabled="!canEdit"
-              >
-                <img v-if="enterpriseForm1.businessLicensePhoto" :src="enterpriseForm1.businessLicensePhoto" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon card-uploader-icon"></i>
-              </el-upload>
-              <div><span style="color: red">*</span>营业执照：（仅支持三证合一）</div>
-            </div>
-          </el-col>
-          <el-col :span="14">
-            <div class="authentication-detail">
-              <div class="authentication-detail-title">证件要求</div>
-              <ul class="authentication-detail-list" style="padding-left:0 ">
-                <li>必须为清晰、完整的彩色原件扫描件或数码照</li>
-                <li>仅支持.jpg .bmp .png .gif的图片格式，图片大小不超过4M</li>
-                <li>必须在有效期内且年检章齐全（当年成立的公司可无年检章）</li>
-                <li>必须为中国大陆工商局颁发</li>
-              </ul>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form-item>
       </el-form>
     </div>
 
     <div class="legal-person-wrapper" v-if="active===1">
       <el-form ref="enterpriseForm" :model="enterpriseForm" :rules="rules" label-width="130px" style="width: 600px">
+<!--        <el-form-item label="法人姓名" prop="legalPersonName">-->
+<!--          <el-input :disabled="!canEdit" v-model="enterpriseForm.legalPersonName"-->
+<!--                    placeholder="请输入您的姓名，需与身份证保持一致"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="身份证号码" prop="idCardNum">-->
+<!--          <el-input :disabled="!canEdit" v-model="enterpriseForm.idCardNum" placeholder="身份证前后不能有空格"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="性别" prop="gender">-->
+<!--          <el-radio-group v-model="enterpriseForm.gender" :disabled="!canEdit">-->
+<!--            <el-radio label="男"></el-radio>-->
+<!--            <el-radio label="女"></el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
         <el-form-item label="法人姓名" prop="legalPersonName">
-          <el-input :disabled="!canEdit" v-model="enterpriseForm.legalPersonName" placeholder="请输入您的姓名，需与身份证保持一致"></el-input>
-        </el-form-item>
-        <el-form-item label="身份证号码" prop="idCardNum">
-          <el-input :disabled="!canEdit" v-model="enterpriseForm.idCardNum" placeholder="身份证前后不能有空格"></el-input>
+          <el-input :disabled="!canEdit" v-model="enterpriseForm.legalPersonName"
+                    ></el-input>
         </el-form-item>
-        <el-form-item label="性别" prop="gender">
+        <el-form-item label="性别" prop="gender" required>
           <el-radio-group v-model="enterpriseForm.gender" :disabled="!canEdit">
             <el-radio label="男"></el-radio>
             <el-radio label="女"></el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="身份证号码" prop="idCardNum">
+          <el-input :disabled="!canEdit" v-model="enterpriseForm.idCardNum"></el-input>
+        </el-form-item>
         <el-form-item label="身份证到期时间" prop="idCardDeadTime">
           <el-date-picker
             v-model="enterpriseForm.idCardDeadTime"
@@ -156,7 +173,7 @@
                     <li>核实手持证件与原件方向一致，对焦身份证 进行拍照</li>
                     <li>您提供的照片众测服务平台将予以保护，不 会用于其他用途</li>
                   </ul>
-<!--                  <a class="authentication-detail-list-blue">实名认证帮助></a>-->
+                  <!--                  <a class="authentication-detail-list-blue">实名认证帮助></a>-->
                 </div>
               </el-row>
             </div>
@@ -164,11 +181,15 @@
         </el-row>
       </div>
     </div>
-    <div class="enterprise-btn-wrapper" >
+    <div class="enterprise-btn-wrapper">
       <button class="enterprise-btn previousBtn" style="cursor: pointer" @click="active--" v-if="active>0">上一步</button>
       <button class="enterprise-btn nextBtn" style="cursor: pointer" @click="nextStep" v-if="active===0">下一步</button>
-      <button class="enterprise-btn nextBtn" style="cursor: pointer" @click="submitEnterpriseAuth" v-if="active===1 && authType === 0">提交审核</button>
-      <button class="enterprise-btn nextBtn" style="cursor: pointer" @click="submitEnterpriseAuth" v-if="active===1 && (authStatus.text =='审核中' || authStatus.text == '认证失败')">修改审核</button>
+      <button class="enterprise-btn nextBtn" style="cursor: pointer" @click="submitEnterpriseAuth"
+              v-if="active===1 && authType === 0">提交审核
+      </button>
+      <button class="enterprise-btn nextBtn" style="cursor: pointer" @click="submitEnterpriseAuth"
+              v-if="active===1 && (authStatus.text =='审核中' || authStatus.text == '认证失败')">修改审核
+      </button>
     </div>
   </div>
 </template>
@@ -180,19 +201,20 @@
   import {storageGet} from '@/js/index'
   import idcardPositive from '../../assets/img/idcard-positive.png'
   import idcardBack from '../../assets/img/idcard-back.png'
+
   export default {
     name: "EnterpriseAuth",
     data() {
       return {
         loading: false,
-        active: 0,
+        active: 1,
         user: {},
-        canEdit:false,
-        authType:-1,
-        authStatus:{},
-        enterpriseForm1:{
-          evaluationAgencyName:"", //企业名称
-          agencyPhoto:"", //企业logo
+        canEdit: false,
+        authType: -1,
+        authStatus: {},
+        enterpriseForm1: {
+          evaluationAgencyName: "", //企业名称
+          agencyPhoto: "", //企业logo
           businessLicensePhoto: "",//企业执照
         },
         enterpriseForm: {
@@ -205,49 +227,48 @@
           idCardBackPhoto: "",//身份证反面照片
           idCardDeadTime: "",//身份证过期时间
         },
-        failureReason:'',
-        rules1:{
+        failureReason: '',
+        rules1: {
           agencyPhoto: [
-            { required: true, message: '请上传企业logo', trigger: 'blur' },
+            {required: true, message: '请上传企业logo', trigger: 'blur'},
           ],
           businessLicensePhoto: [
-            { required: true, message: '请上传企业执照', trigger: 'blur' },
+            {required: true, message: '请上传企业执照', trigger: 'blur'},
           ],
           evaluationAgencyName: [
-            { required: true, message: '请输入企业名称', trigger: 'blur' },
+            {required: true, message: '请输入企业名称', trigger: 'blur'},
           ],
-
         },
-        rules:{
+        rules: {
           legalPersonName: [
-            { required: true, message: '请输入法人姓名', trigger: 'blur' },
+            {required: true, message: '请输入法人姓名', trigger: 'blur'},
           ],
           idCardNum: [
-            { required: true, message: '请输入身份证号码', trigger: 'blur' },
+            {required: true, message: '请输入身份证号码', trigger: 'blur'},
           ],
-          address:[
-            { required: true, message: '请输入家庭或单位地址', trigger: 'blur' },
+          address: [
+            {required: true, message: '请输入家庭或单位地址', trigger: 'blur'},
           ],
           gender: [
-            { required: true, message: '请选择性别', trigger: 'blur' }
+            {required: true, message: '请选择性别', trigger: 'blur'}
           ],
           roleList: [
-            { type: 'array', required: true, message: '请至少选择一个认证权限', trigger: 'change' }
+            {type: 'array', required: true, message: '请至少选择一个认证权限', trigger: 'change'}
           ],
           idCardDeadTime: [
-            {  required: true, message: '请选择身份证过期时间', trigger: 'change' }
+            {required: true, message: '请选择身份证过期时间', trigger: 'change'}
           ]
         }
 
       }
     },
     methods: {
-      nextStep(){
+      nextStep() {
         this.$refs['enterpriseForm1'].validate(valid => {
           if (!valid) {
             notify('error', '信息填写不规范');
             return false
-          }else{
+          } else {
             this.active++;
           }
         })
@@ -260,19 +281,19 @@
             return false
           }
         })
-        if(!this.enterpriseForm.idCardPositivePhoto){
+        if (!this.enterpriseForm.idCardPositivePhoto) {
           notify('error', '身份证正面照片上传不规范');
           return false;
         }
-        if(!this.enterpriseForm.idCardBackPhoto){
-            notify('error', '身份证反面照片上传不规范');
-            return false;
+        if (!this.enterpriseForm.idCardBackPhoto) {
+          notify('error', '身份证反面照片上传不规范');
+          return false;
         }
         let firstSubmit = this.$route.query.type;
-        let data = {...this.enterpriseForm,...this.enterpriseForm1};
+        let data = {...this.enterpriseForm, ...this.enterpriseForm1};
         this.showLoading();
-        if(firstSubmit == 1){
-          Http.post(`/api/user/${this.user.id}/agency`,data).then(res => {
+        if (firstSubmit == 1) {
+          Http.post(`/api/user/${this.user.id}/agency`, data).then(res => {
             if (res) {
               notify('success', '提交成功');
               this.$router.push('/personal/authentication')
@@ -281,7 +302,7 @@
             this.hideLoading();
             notify('error', err.data)
           })
-        }else{
+        } else {
           Http.put(`/api/user/${this.user.id}/agency`, data).then(res => {
             if (res) {
               notify('success', '修改成功');
@@ -319,9 +340,9 @@
           this.enterpriseForm.idCardPositivePhoto = detail.idCardPositivePhoto,
           this.enterpriseForm.idCardBackPhoto = detail.idCardBackPhoto,
           this.enterpriseForm.idCardDeadTime = detail.idCardDeadTime
-          this.enterpriseForm1.businessLicensePhoto = detail.businessLicensePhoto
-          this.enterpriseForm1.evaluationAgencyName = detail.evaluationAgencyName
-          this.enterpriseForm1.agencyPhoto = detail.agencyPhoto
+        this.enterpriseForm1.businessLicensePhoto = detail.businessLicensePhoto
+        this.enterpriseForm1.evaluationAgencyName = detail.evaluationAgencyName
+        this.enterpriseForm1.agencyPhoto = detail.agencyPhoto
       },
       setUserInfo() {
         this.user = storageGet('user') && storageGet('user').userVO;
@@ -357,13 +378,13 @@
         formData.append('file', param.file)
         //console.log(JSON.parse(this.user).userVO)
         Http.upload(Apis.FILE.UPLOAD_IMAGE.replace('{userId}', this.user.id), formData, config).then((res) => {
-          if(param.data.type==2){
+          if (param.data.type == 2) {
             this.enterpriseForm1.businessLicensePhoto = res.data;
-          }else if(param.data.type == 1){
+          } else if (param.data.type == 1) {
             this.enterpriseForm.idCardBackPhoto = res.data
-          }else if(param.data.type == 0){
+          } else if (param.data.type == 0) {
             this.enterpriseForm.idCardPositivePhoto = res.data
-          }else if(param.data.type == 3){
+          } else if (param.data.type == 3) {
             this.enterpriseForm1.agencyPhoto = res.data
           }
           notify('success', '上传成功')
@@ -387,7 +408,7 @@
 </script>
 
 <style scoped lang="less">
-  .avatar-uploader{
+  .avatar-uploader {
     border-radius: 6px;
     cursor: pointer;
     position: relative;
@@ -396,6 +417,7 @@
     width: 170px;
     height: 170px;
   }
+
   .idcard-uploader {
     border-radius: 6px;
     cursor: pointer;
@@ -405,14 +427,17 @@
     width: 270px;
     height: 170px;
   }
-  .idcard-uploader .el-upload{
+
+  .idcard-uploader .el-upload {
     width: 270px;
     height: 170px;
   }
-  .avatar-uploader .el-upload{
+
+  .avatar-uploader .el-upload {
     width: 170px;
     height: 170px;
   }
+
   .avatar-uploader .el-upload:hover {
     border-color: #409EFF;
   }
@@ -421,23 +446,26 @@
     font-size: 28px;
     color: #8c939d;
     width: 170px;
-    height:170px;
+    height: 170px;
     line-height: 170px;
     text-align: center;
   }
+
   .card-uploader-icon {
     font-size: 28px;
     color: #8c939d;
     width: 270px;
-    height:170px;
+    height: 170px;
     line-height: 170px;
     text-align: center;
   }
+
   .avatar {
     width: 100%;
     height: 170px;
     display: block;
   }
+
   .right-modifyPsw {
     padding: 20px;
     background: rgba(255, 255, 255, 1);
@@ -454,18 +482,20 @@
       .agency-form-item {
         margin-bottom: 10px;
       }
+
       .authentication-detail {
         padding: 0 15px;
         border-left: 1px solid rgba(220, 220, 220, 1);
 
-        .idcard-example1{
+        .idcard-example1 {
           width: 270px;
           height: 160px;
           background-image: url("../../assets/img/idcard-back.png");
           background-size: 100% 100%;
           margin-bottom: 20px;
         }
-        .idcard-example2{
+
+        .idcard-example2 {
           width: 270px;
           height: 160px;
           background-image: url("../../assets/img/idcard-positive.png");

src/pages/UserCenter/Mine.vue

@@ -2,7 +2,7 @@
   <div class="right-mine">
     <div class="right-mine-title">
       <span style="font-size: 18px;font-weight: bold">基本设置</span>
-      <el-button v-if="!isModifyMode" type="primary" size="mini" class="pull-right" @click="isModifyMode = true">编辑</el-button>
+<!--      <el-button v-if="!isModifyMode" type="primary" size="mini" class="pull-right" @click="isModifyMode = true">编辑</el-button>-->
     </div>
     <div style="margin-bottom: 15px;width: 550px">
       <el-form :model="userForm" :rules="rules" status-icon ref="userForm" label-width="100px" class="demo-ruleForm">
@@ -13,8 +13,9 @@
             action="https://jsonplaceholder.typicode.com/posts/"
             :before-upload="beforeFileUpload"
             :http-request="uploadFile"
-            :disabled="!isModifyMode"
           >
+<!--            :disabled="!isModifyMode"-->
+
             <img v-if="userForm.photoUrl" :src="userForm.photoUrl" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
@@ -23,17 +24,17 @@
           <el-input v-model="userForm.userName" autocomplete="off" :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="单位" prop="unit">
-          <el-input v-model="userForm.unit" autocomplete="off" :disabled="!isModifyMode"></el-input>
+          <el-input v-model="userForm.unit" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="性别" prop="gender">
-          <el-radio-group v-model="userForm.gender" :disabled="!isModifyMode">
+          <el-radio-group v-model="userForm.gender" >
             <el-radio label="男"></el-radio>
             <el-radio label="女"></el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="生日" prop="birthday">
           <el-date-picker type="date" placeholder="选择日期" v-model="userForm.birthday"
-                          style="width: 100%;" :disabled="!isModifyMode"
+                          style="width: 100%;"
                           :picker-options="pickerOptions"></el-date-picker>
         </el-form-item>
         <el-form-item label="地址" prop="address" style="width: 160%">
@@ -42,16 +43,17 @@
             @selectChange="locationChange"
             :provinceCode="location?location.provinceCode:'3200'"
             :cityCode="location?location.cityCode:'3201'"
-            :isModifyMode="!isModifyMode"
           ></provincecity>
+<!--          :isModifyMode="!isModifyMode"-->
         </el-form-item>
         <el-form-item label="个人能力" style="width: 160%">
-          <el-checkbox-group v-model="userForm.personalCompetence" :disabled="!isModifyMode">
+          <el-checkbox-group v-model="userForm.personalCompetence">
             <el-checkbox v-for="item in serviceType" :label="item.code" :name="item.code" :key="item.code" >{{item.name}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item>
-          <el-button  v-if="isModifyMode" type="primary" size="small" class="pull-left" @click="submitUserInfo">提交修改</el-button>
+<!--          <el-button  v-if="isModifyMode" type="primary" size="small" class="pull-left" @click="submitUserInfo">提交修改</el-button>-->
+          <el-button type="primary" size="small" class="pull-left" @click="submitUserInfo">提交修改</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -118,6 +120,7 @@
           if (valid) {
             Http.put(`/api/personal/update/${this.user.id}`, this.userForm).then(res => {
               this.isModifyMode = false;
+              notify('success', '修改成功 ')
             })
           }
         })