修改

.env.development

@@ -5,12 +5,12 @@ ENV = 'development'
 VUE_APP_BASE_API = '/prod-api'
 
 
-VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999'
+# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'
 # VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999'
 # VUE_APP_BASE_TARGET = 'http://172.16.36.180:9999'
 # VUE_APP_BASE_TARGET = 'http://172.16.36.176:9998'
 
-# VUE_APP_BASE_TARGET = 'http://www.keyitest.cn/test-api'
+VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/test-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -8,5 +8,6 @@ VUE_APP_BASE_API = '/prod-api'
 
 
 # VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/prod-api'
-# VUE_APP_BASE_TARGET = 'http://www.keyitest.cn/test-api'
-VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'
+VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/test-api'
+
+# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'

src/page/homepage/personability/abilityApply.vue

@@ -85,7 +85,7 @@
                         </template>
                     </el-step>
                 </el-steps>
-                <div class="stepBoxBtn">
+                <div class="stepBoxBtn" v-if="!userForm.status">
                     <div class="backBtn" @click="back">上一步</div>
                     <div class="nextBtn" v-if="active == 6" @click="saveInfo">提交审核</div>
                     <div class="nextBtn" v-else @click="next">下一步</div>
@@ -116,11 +116,25 @@
                             </el-form-item>
                         </el-form>
                     </div>
-                    <div v-if="active == 0 && !certifform.applyId" class="addWork" @click="applyBegin">开始验证</div>
+                    <div
+                        v-if="active == 0 && (!certifform.applyId || certifform.status != 1)"
+                        class="addWork"
+                        @click="applyBegin"
+                    >
+                        开始验证
+                    </div>
                     <div class="applySuccess" v-if="certifform.applyId && certifform.status == 1">
                         <img src="/assets/ability/applysuccess.png" alt="" />
                         验证通过
                     </div>
+                    <div
+                        class="applySuccess"
+                        v-if="certifform.applyId && certifform.status != 1"
+                        style="color: #fc4444"
+                    >
+                        <img src="/assets/ability/applyfail.png" alt="" />
+                        验证不通过
+                    </div>
                 </div>
                 <div class="active2" v-show="active == 1 || active == 6">
                     <!-- 工作经历 -->
@@ -465,9 +479,7 @@ export default {
         return {
             active: 0,
             // 实名认证
-            certifform: {
-                
-            },
+            certifform: {},
             certifRules: {
                 name: [
                     { required: true, message: '真实姓名不能为空', trigger: 'blur' },
@@ -552,7 +564,7 @@ export default {
         },
     },
     computed: {
-        ...mapGetters(['userinform','userId', 'token']),
+        ...mapGetters(['userinform', 'userId', 'token']),
     },
     created() {
         this.getCloudAllList()
@@ -586,6 +598,11 @@ export default {
                 // 个人简介
                 if (res.personalInfo) {
                     this.userForm = res.personalInfo
+                    if (!this.userForm.city || !this.userForm.testSkills || !this.userForm.personalAdvantage) {
+                        this.userForm.flag = false
+                    } else {
+                        this.userForm.flag = true
+                    }
                     this.province = this.userForm.city.split('-')[0]
                     this.city = this.userForm.city.split('-')[1]
 
@@ -637,6 +654,8 @@ export default {
                                     this.$message.success('实名认证成功')
                                     this.searchApply()
                                 } else {
+                                    this.$message.error('实名认证失败')
+                                    this.searchApply()
                                 }
                             })
                             .catch((error) => {})
@@ -647,6 +666,8 @@ export default {
                                     this.$message.success('实名认证成功')
                                     this.searchApply()
                                 } else {
+                                    this.$message.error('实名认证失败')
+                                    this.searchApply()
                                 }
                             })
                             .catch((error) => {})
@@ -667,6 +688,26 @@ export default {
                     return this.$message.warning('请先通过实名认证')
                 }
             }
+            if (this.active == 2) {
+                // 项目经历
+                if (this.projectList.length && this.projectList[0].caseId) {
+                } else {
+                    return this.$message.warning('至少保存一条项目经历')
+                }
+            }
+            if (this.active == 3) {
+                // 个人简介
+                if (!this.userForm.flag) {
+                    return this.$message.warning('请先保存个人简介')
+                }
+            }
+            if (this.active == 5) {
+                // 教育经历
+                if (this.educationList.length && this.educationList[0].caseId) {
+                } else {
+                    return this.$message.warning('至少保存一条教育经历')
+                }
+            }
             this.active++
         },
         // 工作经历添加
@@ -787,6 +828,7 @@ export default {
                     }
                     couldUserInfoAdd(this.userForm).then((res) => {
                         this.$message.success('保存个人简介成功')
+                        this.userForm.flag = true
                     })
                 }
             })

src/page/homepage/personability/abilityMoreDetail.vue

@@ -4,7 +4,7 @@
             <div class="topNA">
                 <div class="topNAT">
                     <span class="topNAT1">{{ userInfo.name }}</span>
-                    <span class="topNAT2">{{ userInfo.testSkills }}</span>
+                    <span class="topNAT2">{{ userInfo.testSkills || '未填写' }}</span>
                 </div>
                 <div class="topNAB">
                     <div class="topNABit">
@@ -34,7 +34,7 @@
                         个人优势
                     </div>
                     <div class="contentitemB">
-                        {{ userInfo.personalAdvantage }}
+                        {{ userInfo.personalAdvantage || '未填写' }}
                     </div>
                 </div>
                 <div class="contentitem">
@@ -42,43 +42,50 @@
                         <div class="contentTline"></div>
                         工作经历
                     </div>
-                    <div v-for="it in workList" :key="it.caseId">
-                        <div class="contentitemM">
-                            <div class="contentitemML">公司名称：{{ it.name }}</div>
-                            <div class="contentitemML">职位：{{ it.title }}</div>
-                            <div class="contentitemMR">{{ it.startTime }}-{{ it.endTime }}</div>
+                    <template v-if="workList.length">
+                        <div v-for="it in workList" :key="it.caseId">
+                            <div class="contentitemM">
+                                <div class="contentitemML">公司名称：{{ it.name }}</div>
+                                <div class="contentitemML">职位：{{ it.title }}</div>
+                                <div class="contentitemMR">{{ it.startTime }}-{{ it.endTime }}</div>
+                            </div>
+                            <div class="contentitemB"><span class="contentitemBF">工作内容：</span>{{ it.intro }}</div>
                         </div>
-                        <div class="contentitemB"><span class="contentitemBF">工作内容：</span>{{ it.intro }}</div>
-                    </div>
+                    </template>
+                    <div class="contentitemTBook" v-else>未填写</div>
                 </div>
                 <div class="contentitem">
                     <div class="contentitemT">
                         <div class="contentTline"></div>
                         项目经历
                     </div>
-                    <div v-for="it in projectList" :key="it.caseId">
-                        <div class="contentitemM">
-                            <div class="contentitemML">公司名称：{{ it.name }}</div>
-                            <div class="contentitemML">担任角色：{{ it.title }}</div>
-                            <div class="contentitemMR">{{ it.startTime }}-{{ it.endTime }}</div>
-                        </div>
-                        <div class="contentitemB" style="margin-bottom: 20px">
-                            <span class="contentitemBF">应用技术：</span>{{ it.applyTech }}
+                    <template v-if="projectList.length">
+                        <div v-for="it in projectList" :key="it.caseId">
+                            <div class="contentitemM">
+                                <div class="contentitemML">公司名称：{{ it.name }}</div>
+                                <div class="contentitemML">担任角色：{{ it.title }}</div>
+                                <div class="contentitemMR">{{ it.startTime }}-{{ it.endTime }}</div>
+                            </div>
+                            <div class="contentitemB" style="margin-bottom: 20px">
+                                <span class="contentitemBF">应用技术：</span>{{ it.applyTech }}
+                            </div>
+                            <div class="contentitemB"><span class="contentitemBF">工作内容：</span>{{ it.intro }}</div>
                         </div>
-                        <div class="contentitemB"><span class="contentitemBF">工作内容：</span>{{ it.intro }}</div>
-                    </div>
+                    </template>
+                    <div class="contentitemTBook" v-else>未填写</div>
                 </div>
                 <div class="contentitem">
                     <div class="contentitemT">
                         <div class="contentTline"></div>
                         资格证书
                     </div>
-                    <div class="contentitemTBook">
+                    <div class="contentitemTBook" v-if="certificateList.length">
                         <div class="contentitemTBookit" v-for="it in certificateList" :key="it.fileId">
                             <div class="contentitemTBookitT">{{ it.fileName }}</div>
                             <img class="contentitemTBookitTimg" :src="it.fileUrl" alt="" />
                         </div>
                     </div>
+                    <div class="contentitemTBook" v-else>未填写</div>
                 </div>
             </div>
         </div>

src/page/homepage/personability/abilityUserDetail.vue

@@ -89,7 +89,7 @@ export default {
     mounted() {},
     beforeDestroy() {},
     computed: {
-        ...mapGetters(['userId', 'token']),
+        ...mapGetters(['userId', 'userinform', 'token']),
     },
     created() {
         this.getDetail()
@@ -110,9 +110,14 @@ export default {
                     this.$router.push('/login?type=log')
                 })
             } else {
-                shenqingJob(this.jonInfo.jobId, {userId: this.userId}).then(res => {
-                    this.$message.success('职位申请成功')
-                })
+                if (this.userinform.testerStatus == 2) {
+                    shenqingJob(this.jonInfo.jobId, { userId: this.userId }).then((res) => {
+                        this.$message.success('职位申请成功')
+                    })
+                } else {
+                    this.$message.warning('请先入驻成为云员工')
+                    // this.$router.push('/ability/apply')
+                }
             }
         },
     },

src/page/homepage/traininstitute/train.vue

@@ -212,7 +212,7 @@
                         >
                             <div
                                 class="zhuanjiaboxitem zhuanjiaboxitem1"
-                                v-for="(it,index) in teacherList"
+                                v-for="(it, index) in teacherList"
                                 :key="index"
                                 @click="zhuanjiclickfn(it)"
                             >
@@ -918,9 +918,8 @@ export default {
                         '1.安全测试基本理论、安全测试方法、安全测试工具使用介绍。&2.GJB9433-2018标准下可编程逻辑器件软件测试级别、测试过程、测试类型、测试方法讲解，以及在工程项目中的应用。',
                 },
             ],
-            activeZj: { },
-            baseu: process.env.VUE_APP_BASE_API
-            
+            activeZj: {},
+            baseu: process.env.VUE_APP_BASE_API,
         }
     },
     computed: {
@@ -948,7 +947,7 @@ export default {
                 this.teacherList = res.concat(res.slice(0, 3))
                 this.activeZj = this.teacherList[0]
                 this.$refs.zhuanjiaRboxCon.style.width = 230 * this.teacherList.length + 'px'
-                this.$refs.zhuanjiaRboxCon.style.setProperty('--offset', `-${230 * (this.teacherList.length-3)}px`);
+                this.$refs.zhuanjiaRboxCon.style.setProperty('--offset', `-${230 * (this.teacherList.length - 3)}px`)
             })
         },
 
@@ -2417,6 +2416,11 @@ export default {
     font-weight: 500;
     font-size: 15px;
     color: #666666;
+    -webkit-line-clamp: 8;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .unlineCon1 {