Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/views/recruit/personal/PersonalCenter/dynamic/left.vue

@@ -12,9 +12,6 @@
       <div class="ml-5 content">
         <div class="username">
           <span class="mr-2">{{ baseInfo?.name || userInfo.phone }}</span>
-          <!-- <v-icon class="cursor-pointer" style="width: 80px; height: 22px;">
-            <v-img width="80" height="22" src="https://minio.citupro.com/dev/menduner/upgrade.png"></v-img>
-          </v-icon> -->
         </div>
         <div class="userInfo">
           {{ baseInfo?.expTypeText || $t('common.currentlyUnavailable') }}<span class="septal-line"></span>{{ baseInfo?.eduTypeText || $t('common.currentlyUnavailable') }}

src/views/recruit/personal/remuse/components/jobIntention.vue

@@ -18,7 +18,7 @@
             <div class="line">|</div>
             <div>{{k.payFrom}}-{{k.payTo}}</div>
             <div class="line">|</div>
-            <div class="grey-text text-box">{{ k.industry.map(e => e.nameCn).join('、') }}</div>
+            <div class="grey-text text-box">{{ k.industry && k.industry.length ? k.industry.map(e => e.nameCn).join('、') : '' }}</div>
             <div class="line" v-if="k.industry.length && k.jobTypeName">|</div>
             <div class="grey-text">{{ k.jobTypeName }}</div>
             <div class="line" v-if="k.jobTypeName && k.workArea">|</div>