Merge branch 'feature/buttonName'

components/Detail/DetailIndex.vue

@@ -7,9 +7,6 @@
         <div class="title">{{ data.name }}</div>
         <div class="subtitle">
           <div style="margin-right: 15px; white-space: nowrap">
-            {{ translateComponySize }}
-          </div>
-          <div style="margin-right: 15px; white-space: nowrap">
             {{ translateExperience }}
           </div>
           <div style="margin-right: 15px; white-space: nowrap">
@@ -350,4 +347,4 @@ export default {
     top: 45px;
   }
 }
-</style>
\ No newline at end of file
+</style>

components/Index/IndexItem.vue

 <template>
   <div class="itembar">
     <div class="itembar-top">
-      <div class="itembar-top__title">{{ listItem.name }}</div>
+      <div class="itembar-top__title">
+        <div class="title">{{ listItem.name }}</div>
+        <div class="subitem">{{ translateexperience }}</div>
+        <div class="subitem">{{ translateeducation }}</div>
+      </div>
       <div class="itembar-top__salary" :style="{ '--color': color.color }">
         {{ translateSalary }}
       </div>
     </div>
     <div class="itembar__requirement">
-      <div class="subitem">{{ translatecompanySize }}</div>
-      <div class="subitem">{{ translateexperience }}</div>
-      <div class="subitem">{{ translateeducation }}</div>
-      <div class="subitem">{{ translateCity(listItem.city) }}</div>
+      <img :src="listItem.companyLogo" alt="" />
+      <div class="companyName">{{ listItem.companyName }}</div>
     </div>
     <div class="itembar-bottom">
-      <img :src="listItem.companyLogo" alt="" />
-      <div class="itembar-bottom__companyname">{{ listItem.companyName }}</div>
+      <div class="subitem">{{ translatecompanySize }}</div>
+      <div v-if="listItem.financingType" class="subitem">{{ listItem.financingType }}</div>
+      <div class="subitem">{{ translateCity(listItem.city) }}</div>
       <van-button
         class="itembar-bottom__button"
         :style="{ '--bgc': color.bgc }"
@@ -131,19 +134,31 @@ export default {
   padding: 10px;
   margin: 0 auto;
   margin-top: 12px;
+  .subitem {
+    color: #999999;
+    font-size: 12px;
+    white-space: nowrap;
+    margin-right: 15px;
+  }
   .itembar-top {
     display: flex;
     justify-content: space-between;
-    margin-bottom: 10px;
+    margin-bottom: 9px;
     &__title {
       width: 210px;
-      line-height: 20px;
-      font-size: 14px;
-      text-align: left;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
       font-weight: 400;
+      display: flex;
+      align-items: center;
+      .title {
+        // width: 100px;
+        line-height: 20px;
+        font-size: 14px;
+        text-align: left;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        margin-right: 15px;
+      }
     }
     &__salary {
       font-size: 15px;
@@ -155,15 +170,29 @@ export default {
     }
   }
   &__requirement {
-    color: #999999;
-    font-size: 12px;
     display: flex;
     line-height: 16.5px;
     padding-right: 10%;
-    padding-bottom: 10px;
-    border-bottom: 1px dashed #e1e1e1;
-    // justify-content: space-between;
+    padding-top: 8px;
+    border-top: 1px dashed #e1e1e1;
+    align-items: center;
+    .companyName {
+      // height: 32px;
+      margin-left: 6px;
+      font-size: 12px;
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+    }
+    img {
+      width: 30px;
+      height: 30px;
+      border-radius: 50%;
+    }
     .subitem {
+      color: #999999;
+      font-size: 12px;
+      white-space: nowrap;
+      margin-right: 15px;
       white-space: nowrap;
       margin-right: 15px;
     }
@@ -171,15 +200,10 @@ export default {
   .itembar-bottom {
     font-size: 12px;
     display: flex;
-    line-height: 16.5px;
+    // line-height: 16.5px;
     justify-content: space-between;
     align-items: center;
-    margin-top: 10px;
-    img {
-      width: 30px;
-      height: 30px;
-      border-radius: 50%;
-    }
+    // margin-top: 10px;
     &__companyname {
       color: #999999;
       margin-left: 5px;

components/Introduction/IntroductionIndex.vue

@@ -5,7 +5,11 @@
       <div class="index-introduce__detail">
         <div class="title">{{ data.companyName }}</div>
         <div class="subtitle">
-          <div>{{ translateComponySize }}</div>
+          <div style="margin-right: 15px; white-space: nowrap">{{ translateComponySize }}</div>
+          <div style="margin-right: 15px; white-space: nowrap">
+            {{ data.financingType }}
+          </div>
+          <div style="margin-right: 15px; white-space: nowrap">{{ translateCity(data.city) }}</div>
         </div>
       </div>
     </div>
@@ -17,12 +21,14 @@
 </template>
 
 <script>
+import { cityList } from '@/utils/cityList'
 import { getJobDetail } from '@/api/modules/job'
 export default {
   name: 'IntroductionIndex',
   data() {
     return {
       data: [],
+      cityList
     }
   },
   computed: {
@@ -41,6 +47,33 @@ export default {
       }
       return this.data.companyProfile
     },
+    translateCity() {
+      return function (val) {
+        let label = ''
+        let listItem = []
+        if (val && val.length === 3) {
+          cityList.forEach((item, index) => {
+            if (item.value === val[0]) {
+              label += ''
+              listItem = cityList[index].children
+            }
+          })
+          listItem.forEach((item, index) => {
+            if (item.value === val[1]) {
+              label += item.label
+              listItem = listItem[index].children
+            }
+          })
+          listItem.forEach((item, index) => {
+            if (item.value === val[2]) {
+              label += item.label
+              listItem = listItem[index].children
+            }
+          })
+        }
+        return label
+      }
+    },
   },
   mounted() {
     this.getDetail()
@@ -90,7 +123,7 @@ export default {
         line-height: 22.5px;
       }
       .subtitle {
-        width: 182px;
+        // width: 182px;
         height: 16.5px;
         font-size: 12px;
         font-family: PingFangSC-Regular, PingFang SC;
@@ -98,7 +131,7 @@ export default {
         color: #999999;
         line-height: 16.5px;
         display: flex;
-        justify-content: space-between;
+        // justify-content: space-between;
         margin-top: 6px;
       }
     }
@@ -130,4 +163,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>