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

src/views/resume/components/basicInfo.vue

@@ -60,43 +60,43 @@
             <div class="listBox" :style="{ height: isExpand ? 'auto' : '68px' }">
               <div>
                 <span class="mdi mdi-map-marker-outline"></span>
-                <span>{{ baseInfo?.areaName || '暂无' }}</span>
+                <span>{{ baseInfo?.areaName || $t('common.currentlyUnavailable') }}</span>
               </div>
               <div>
                 <span class="mdi mdi-phone-outline"></span>
-                <span>{{ baseInfo?.phone }}</span>
+                <span>{{ baseInfo?.phone || $t('common.currentlyUnavailable') }}</span>
               </div>
               <div>
                 <span class="mdi mdi-email-outline"></span>
-                <span>{{ baseInfo?.email }}</span>
+                <span>{{ baseInfo?.email || $t('common.currentlyUnavailable') }}</span>
               </div>
               <div>
                 <span class="mdi mdi-calendar-blank-outline"></span>
-                <span>{{ baseInfo?.expTypeText }}</span>
+                <span>{{ baseInfo?.expTypeText || $t('common.currentlyUnavailable') }}</span>
               </div>
               <div>
                 <span class="mdi mdi-school-outline"></span>
-                <span>{{ baseInfo?.eduTypeText }}</span>
+                <span>{{ baseInfo?.eduTypeText || $t('common.currentlyUnavailable') }}</span>
               </div>
               <!-- <div>
                 <span class="mdi mdi-briefcase-outline"></span>
-                <span>{{ baseInfo?.jobTypeText }}</span>
+                <span>{{ baseInfo?.jobTypeText || $t('common.currentlyUnavailable') }}</span>
               </div> -->
               <div>
                 <span class="mdi mdi-tag-outline"></span>
-                <span>{{ baseInfo?.jobStatusText }}</span>
+                <span>{{ baseInfo?.jobStatusText || $t('common.currentlyUnavailable') }}</span>
               </div>
               <div>
                 <span class="mdi mdi-cake-variant-outline"></span>
-                <span>{{ baseInfo?.birthdayText }}</span>
+                <span>{{ baseInfo?.birthdayText || $t('common.currentlyUnavailable') }}</span>
               </div>
               <div>
                 <span class="mdi mdi-account-heart"></span>
-                <span>{{ baseInfo?.maritalText }}</span>
+                <span>{{ baseInfo?.maritalText || $t('common.currentlyUnavailable') }}</span>
               </div>
               <div>
                 <span>{{ $t('resume.firstWorkTime') }}：</span>
-                <span>{{ baseInfo?.firstWorkTimeText }}</span>
+                <span>{{ baseInfo?.firstWorkTimeText || $t('common.currentlyUnavailable') }}</span>
               </div>
             </div>
             <div class="ml-3">

src/views/resume/components/trainingExperience.vue

@@ -38,7 +38,7 @@
           </div>
         </div>
       </div>
-      <div v-else class="resumeNoDataText">{{ $t('resume.dataDefaultPrompt') }}{{ $t('resume.trainingExperience') }}</div>
+      <div v-else class="resumeNoDataText">{{ $t('resume.dataDefaultPrompt') }}{{ $t('resume.trainingExperience') }}...</div>
     </div>
   </div>
 </template>