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

src/components/pay/index.vue

@@ -214,7 +214,7 @@ const getUnpaidOrderList = async () => {
         await createTradeOrder({
           spuId: props.spuId,
           spuName: props.spuName,
-          price: props.cost / 100,
+          price: props.cost,
           type:  props.orderType, // 发布众聘职位订单
         })
         if (maxCount > 3) return // 避免死循环

src/views/recruit/enterprise/hirePosition/components/item.vue

@@ -107,10 +107,10 @@ const toPay = (val) => { // 已关闭的职位激活需要再次支付
 // 支付成功
 const paySuccess = async () => {
   showConfirmPaymentDialog.value = false
-  console.log(' operateObj.value?.status',  operateObj.value?.status)
-  if (operateObj.value?.status === '1') {
-    handleAction(1, operateObj.value)
-  }
+  // console.log(' operateObj.value?.status',  operateObj.value?.status)
+  // if (operateObj.value?.status === '1') {
+  //   handleAction(1, operateObj.value)
+  // }
   setTimeout(() => {
     emit('refresh')
   }, 1000)

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

@@ -5,8 +5,8 @@
         <Autocomplete class="mr-3" v-model="query.jobId" :item="jobItem"></Autocomplete>
         <Autocomplete v-model="query.status" :item="statusItem"></Autocomplete>
         <v-btn color="primary" class="half-button ml-3" @click="handleSearch()">查 询</v-btn>
-        <v-btn class="half-button ml-3" variant="outlined" color="primary" @click="handleReset">重 置</v-btn>
-        <v-btn class="half-button ml-10" prepend-icon="mdi-refresh" variant="outlined" color="primary" @click="handleSearch(true)">刷 新</v-btn>
+        <v-btn class="half-button mx-3" variant="outlined" color="primary" @click="handleReset">重 置</v-btn>
+        <v-btn class="half-button" prepend-icon="mdi-refresh" variant="outlined" color="primary" @click="handleSearch(true)">刷 新</v-btn>
       </div>
     </div>
     <v-divider class="mb-3"></v-divider>
@@ -21,7 +21,6 @@
           <v-btn color="primary" variant="text" size="small" @click="selectDateValue = new Date(); handleChangeDate()">{{ $t('interview.today') }}</v-btn>
         </div>
         <VueDatePicker 
-          class="mr-5"
           v-model="selectDateValue"
           inline auto-apply
           locale="zh-CN"
@@ -36,10 +35,10 @@
           </template>
       </VueDatePicker>
       </div>
-      <v-divider style="height: auto;" class="mr-5" vertical></v-divider>
+      <v-divider style="height: auto;" class="mr-3" vertical></v-divider>
       <div style="flex: 1;">
         <div v-if="items.length">
-          <div style="height: calc(100vh - 318px);overflow: auto;padding-right: 12px;">
+          <div style="height: calc(100vh - 318px);overflow: auto;">
             <itemPage :items="items" :statusList="statusList" :positionItems="positionItems" @refresh="handleRefresh"></itemPage>
           </div>
           <CtPagination
@@ -161,7 +160,7 @@ const getPositionList = async () => {
   const list = dealDictArrayData([], data)
   positionItems.value = list.map(e => {
     const salary = e.payFrom && e.payTo ? `${e.payFrom ? e.payFrom + '-' : ''}${e.payTo}${e.payName ? '/' + e.payName : ''}` : '面议'
-    return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}`, value: e.id }
+    return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}_${e.status === 0 ? '招聘中' : '已关闭'}`, value: e.id }
   })
 }
 getPositionList()

src/views/recruit/enterprise/resume/components/screen.vue

@@ -88,7 +88,7 @@ const getJobList = async (k) => {
   const list = dealDictArrayData([], data)
   k.items = list.map(e => {
     const salary = e.payFrom && e.payTo ? `${e.payFrom}-${e.payTo}${e.payName ? '/' + e.payName : ''}` : '面议'
-    return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}`, value: e.id }
+    return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}_${e.status === 0 ? '招聘中' : '已关闭'}`, value: e.id }
   })
   return k.items
 }

src/views/recruit/enterprise/search/recommend/index.vue

@@ -96,7 +96,7 @@ const getJobList = async () => {
     const list = dealDictArrayData([], data)
     selectItems.value.items = list.map(e => {
       const salary = e.payFrom && e.payTo ? `${e.payFrom}-${e.payTo}${e.payName ? '/' + e.payName : ''}` : '面议'
-      return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}`, value: e.id, data: e }
+      return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}_${e.status === 0 ? '招聘中' : '已关闭'}`, value: e.id, data: e }
     })
   }
 }