Merge branch 'master' of http://172.16.90.201:3000/veterans/veterans_client_web

src/views/EducationPromote/EducationPromoteDetails/EducationPromoteDetailsIndex.vue

@@ -2,11 +2,124 @@
  * @Description: 学历提升 => 详情
  * @Author: 空白格
  * @Date: 2022-08-26 16:40:31
- * @LastEditors: 空白格
- * @LastEditTime: 2022-08-26 16:40:31
+ * @LastEditors: gcz
+ * @LastEditTime: 2022-08-26 18:00:24
  * @FilePath: \veterans_client_web\src\views\EducationPromote\EducationPromoteDetails\EducationPromoteDetailsIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
 <template>
-  <div>详情</div>
+  <div class=''>
+    <section class="banner"></section>      
+    <section class="wrap-r usefor">
+      <div class="title">学历提升6大作用</div>
+      <div class="usefor-list u-flex u-flex-wrap u-row-between">
+        <div class="usefor-list-item item-1">
+          <div class="name">评职称证书</div>
+          <div class="con">在评定高级职称时需要学历的辅助</div>        
+        </div>
+        <div class="usefor-list-item item-2">
+          <div class="name">求职就业</div>
+          <div class="con">学历越高，就业的可能性越大</div>        
+        </div>
+        <div class="usefor-list-item item-3">
+          <div class="name">升职加薪</div>
+          <div class="con">高学历是用人单位提拔人才的重要考核标准</div>        
+        </div>
+        <div class="usefor-list-item item-4">
+          <div class="name">考资格证</div>
+          <div class="con">许多国家职业资格证都需求学历专科以上</div>        
+        </div>
+        <div class="usefor-list-item item-5">
+          <div class="name">外企求职</div>
+          <div class="con">进外企工作，学历是一项重要的考核</div>        
+        </div>
+        <div class="usefor-list-item item-6">
+          <div class="name">积分落户</div>
+          <div class="con">落户某些城市，需要一定的学历积分</div>        
+        </div>
+      </div>
+    </section>  
+    <section class="wrap-r flow">
+      <div class="title">学历提升的流程</div>
+      <div class="flow-con"></div>
+    </section>
+    <section class="wrap-r way">
+      <div class="title">学历提升的方式</div>
+      <div class="flow-con"></div>
+    </section>
+  </div>
 </template>
+
+<script>
+  export default {
+    name: '',
+    components: {},
+    data () {
+      return {
+      };
+    },
+    created(){},
+    methods: {},
+  }
+</script>
+
+<style lang='scss' scoped>
+.banner{
+  height: 447px;
+  background: url(@/assets/images/education-banner.png) no-repeat;
+  background-position: center center;
+}
+.title{
+    font-size: 20px;
+    color: #1A1A1A;
+    font-weight: 600;
+    margin-bottom: 24px;
+  }
+.wrap-r{
+  box-sizing: border-box;
+  background: #fff;
+  padding: 20px;
+  width:70%;
+  margin: 23px auto;
+}
+.usefor{
+   padding-bottom: 0;
+  .usefor-list{
+    &-item{
+      box-sizing: border-box;
+      width: 33%;
+      margin-bottom: 24px;
+      height: 130px;
+      padding: 25px 0 0 30px;
+      background-position: right bottom;
+      background-repeat: no-repeat;
+      background-size: 100%;
+      .name{
+        font-size: 20px;
+        margin-bottom: 10px;
+      }
+      .con{
+        width: 150px;
+        font-size: 14px;
+        color: #787878;
+      }
+    }
+    @for $i from 1 through 6 {
+        .item-#{$i} {
+          background-image: url(@/assets/images/usefor-list-0#{$i}.png);
+        }
+      }
+  }
+}
+.flow{
+  margin-bottom: 0;
+  .flow-con{
+    height: 144px;
+    background: url(@/assets/images/usefor-flow.png) no-repeat;
+    background-size: 100%;
+  }
+}
+.way{
+  margin-top: 0;
+}
+</style>

src/views/PersonalCenter/Resume/ResumeIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-24 09:35:03
  * @LastEditors: gcz
- * @LastEditTime: 2022-08-25 11:57:52
+ * @LastEditTime: 2022-08-26 17:52:03
  * @FilePath: \veterans_client_web\src\views\PersonalCenter\Resume\ResumeIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -28,8 +28,8 @@
             <div class="">
               {{ memberinfo.menSex === 1 ? "女" : "男" }} ·
               <span class="position" v-if="memberinfo.jobStatus !== 0">
-                · <span class="c-yellow">入职中</span>
-                <span>(memberinfo.company)</span>
+                <span class="c-yellow">入职中</span>
+                <span v-if="memberinfo.jobStatus==1&&memberinfo.company">({{memberinfo.company}})</span>
               </span>
               <span class="c-yellow" v-else>未入职</span>
             </div>