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

src/views/login/components/passwordPage.vue

@@ -2,7 +2,7 @@
   <v-form ref="passwordForm" @submit.prevent>
     <v-text-field
       v-model="loginData.phone"
-      :counter="isCounter ? 30 : 11"
+      :counter="isCounter ? 100 : 11"
       :disabled="props.phoneDisabled"
       :placeholder="placeholder ? placeholder : '请输入手机号码'"
       color="primary" 

src/views/recruit/enterprise/jobFair/components/job.vue

@@ -21,12 +21,13 @@
           :label="t('position.positionName')"
           variant="outlined"
           hide-details
+          color="primary"
           single-line
           @click:append-inner="getPositionList"
           @keyup.enter="getPositionList"
         ></v-text-field>
       </div>
-      <div class="pa-3">
+      <div class="pa-3" v-if="positionItems.length">
         <div v-for="val in positionItems" :key="val.id" class="itemBox mb-3" style="height: 80px;">
           <div class="d-flex justify-space-between" style="padding: 10px 20px;">
             <div class="position">
@@ -52,13 +53,15 @@
             </div>
           </div>
         </div>
+        <CtPagination
+          v-if="total"
+          :total="positionTotal"
+          :page="positionPageInfo.pageNo"
+          :limit="positionPageInfo.pageSize"
+          @handleChange="handleChangePage"
+        ></CtPagination>
       </div>
-      <CtPagination
-        :total="positionTotal"
-        :page="positionPageInfo.pageNo"
-        :limit="positionPageInfo.pageSize"
-        @handleChange="handleChangePage"
-      ></CtPagination>
+      <Empty v-else :elevation="false"></Empty>
     </v-navigation-drawer>
   </div>
 </template>

src/views/recruit/enterprise/jobFair/detailsBox.vue

@@ -14,7 +14,7 @@ const route = useRoute()
 
 const getMsg = async () => {
   const res = await getJobFair(route.params.id)
-  route.matched[1].meta.title = res.title
+  route.matched[1].meta.title = res.title.split('<p>').join('')
   system.setBreadcrumbs(route.matched, route.fullPath)
 }
 getMsg()

src/views/recruit/enterprise/jobFair/index.vue

@@ -3,8 +3,7 @@
     <v-card v-for="(k, i) in list" :key="i" class="elevation-3">
       <img :src="k.pcHeadImg" style="width: 100%; height: 300px;">
       <div class="pa-5">
-        <div class="color-primary font-weight-bold font-size-18 mb-1">{{ k.title }}</div>
-        <div class="color-666">{{ k.desc }}</div>
+        <div class="color-primary font-weight-bold font-size-18 mb-1" v-html="k.title"></div>
         <div class="text-end">
           <v-btn color="primary" variant="outlined" @click.stop="handleBlockEnterprise(k.id)">立即加入</v-btn>
         </div>

src/views/recruit/enterprise/jobFair/job/item.vue

@@ -1,34 +1,37 @@
 <template>
   <div>
-    <div v-for="val in items" :key="val.id" class="itemBox mb-3" style="height: 134px;">
-      <div class="d-flex justify-space-between cursor-pointer" style="padding: 10px 20px;" @click="handleEdit(val)">
-        <div class="position">
-          <div class="d-flex align-center">
-            <span class="position-name">{{ val.name }}</span>
+    <div v-if="items.length">
+      <div v-for="val in items" :key="val.id" class="itemBox mb-3" style="height: 134px;">
+        <div class="d-flex justify-space-between cursor-pointer" style="padding: 10px 20px;" @click="handleEdit(val)">
+          <div class="position">
+            <div class="d-flex align-center">
+              <span class="position-name">{{ val.name }}</span>
+            </div>
+            <div :class="['mt-3', 'other-info', 'ellipsis']">
+              <span>{{ val.areaName }}</span>
+              <span class="lines" v-if="val.areaName && val.eduName"></span>
+              <span>{{ val.eduName }}</span>
+              <span class="lines"></span>
+              <span>{{ val.expName }}</span>
+              <span class="lines"></span>
+              <span v-if="!val.payFrom && !val.payTo">面议</span>
+              <span v-else>{{ val.payFrom ? val.payFrom + '-' : '' }}{{ val.payTo }}{{ val.payName ? '/' + val.payName : '' }}</span>
+              <span class="lines" v-if="val.positionName"></span>
+              <span>{{ val.positionName }}</span>
+            </div>
           </div>
-          <div :class="['mt-3', 'other-info', 'ellipsis']">
-            <span>{{ val.areaName }}</span>
-            <span class="lines" v-if="val.areaName && val.eduName"></span>
-            <span>{{ val.eduName }}</span>
-            <span class="lines"></span>
-            <span>{{ val.expName }}</span>
+        </div>
+        <div class="bottom pa-5 d-flex justify-space-between align-center">
+          <div>到期时间：{{ val.expireTime ? timesTampChange(val.expireTime, 'Y-M-D') : '长期有效' }}</div>
+          <div class="d-flex">
+            <span class="cursor-pointer actions" @click="handleEdit(val)">编辑</span>
             <span class="lines"></span>
-            <span v-if="!val.payFrom && !val.payTo">面议</span>
-            <span v-else>{{ val.payFrom ? val.payFrom + '-' : '' }}{{ val.payTo }}{{ val.payName ? '/' + val.payName : '' }}</span>
-            <span class="lines" v-if="val.positionName"></span>
-            <span>{{ val.positionName }}</span>
+            <span class="cursor-pointer actions" @click="handleRemove(val)">移出招聘会</span>
           </div>
         </div>
       </div>
-      <div class="bottom pa-5 d-flex justify-space-between align-center">
-        <div>到期时间：{{ val.expireTime ? timesTampChange(val.expireTime, 'Y-M-D') : '长期有效' }}</div>
-        <div class="d-flex">
-          <span class="cursor-pointer actions" @click="handleEdit(val)">编辑</span>
-          <span class="lines"></span>
-          <span class="cursor-pointer actions" @click="handleRemove(val)">移出招聘会</span>
-        </div>
-      </div>
     </div>
+    <Empty v-else :elevation="false"></Empty>
   </div>
 
   <Loading :visible="loading"></Loading>
@@ -55,7 +58,6 @@ const router = useRouter()
 const route = useRoute()
 // 职位编辑
 const handleEdit = async (val) => {
-  // console.log(val, 'val-edit')
   const data = await getEnterprisePubJobTypePermission()
   if (!data || !data.length) return Snackbar.warning('没有该操作权限，请联系平台管理员升级后再试')
   router.push(`/recruit/enterprise/jobFair/details/${route.params.id}/edit?id=${val.id}`)