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

src/components/FormUI/TextInput/index.vue

@@ -66,7 +66,7 @@ const valueDeal = (val) => {
 watch(() => props.modelValue, (newVal) => {
   const dealData = valueDeal(newVal)
   value.value = dealData ? typeof dealData === 'string' ? dealData.replace(/&/g, '&') : dealData : ''
-})
+}, { immediate: true })
 
 const modelValueUpDate = (val) => {
   value.value = val

src/hooks/web/useGoods.js

@@ -127,10 +127,11 @@ export function formatOrderStatus(order) {
   if (order.status === 20) {
     return '待收货';
   }
-  if (order.status === 30 && !order.commentStatus) {
-    return '待评价';
-  }
-  if (order.status === 30 && order.commentStatus) {
+  // if (order.status === 30 && !order.commentStatus) {
+  //   return '待评价';
+  // }
+  // if (order.status === 30 && order.commentStatus) {
+  if (order.status === 30) {
     return '已完成';
   }
   return '已关闭';

src/views/mall/components/confirm_order/index.vue

@@ -69,7 +69,7 @@ let closeConfirm = false // 关闭路由拦截
 const paySuccess = (e) => {
   closeConfirm = true
   closeConfirm = true
-  router.replace({ path: '/mall/payOver', query: { price: e.price, orderId: orderId.value } })
+  router.replace({ path: '/mall/payOver', query: { price: e.price, orderId: orderId.value, spuId } })
   // setTimeout(() => { router.replace('/recruit/personal/personalCenter/tradeOrder?key=1') }, 500);
 }
 const payCancel = () => {

src/views/recruit/personal/PersonalCenter/resume/online/components/jobIntention.vue

@@ -236,6 +236,8 @@ const handleSave = async () => {
     query[e.key] = e.value 
   })
   if (editId.value) query.id = editId.value
+  if (!query.workAreaId) return Snackbar.warning('请选择期望城市')
+
   await saveResumeJobInterested(query)
   Snackbar.success('保存成功')
   isAdd.value = false

src/views/recruit/personal/home/components/advertisement/preferred.vue

@@ -65,7 +65,7 @@
     <div class="recruit-position">
       <h2>招聘职位</h2>
       <div>
-        <div class="position-item d-flex align-center" v-for="k in recruitPosition" :key="k.job.id">
+        <div class="position-item d-flex" v-for="k in recruitPosition" :key="k.job.id">
           <div class="job-name">
             {{ formatName(k.job.name) }}
             <br>
@@ -226,15 +226,17 @@ h2 {
 .recruit-position {
   margin-top: 100px;
   .position-item {
+    position: relative;
     background-color: #f9f9f9;
     margin-bottom: 15px;
     padding: 20px 0 20px 32px;
     .job-name {
-      width: 20.5%;
+      width: 21%;
       overflow: hidden;
       margin-right: 5%;
       font-size: 15px;
       font-weight: 600;
+      margin-top: 1px;
     }
     .job-place {
       width: 17%;
@@ -249,11 +251,18 @@ h2 {
       color: #8c8c8c;
       line-height: 26px;
     }
+    .view-detail{
+      position: absolute;
+      top: 50%;
+      right: 30px;
+      transform: translateY(-50%);
+      &:hover {
+        color: var(--v-primary-base);
+        text-decoration: underline;
+      }
+    }
   }
 }
-.view-detail:hover {
-  text-decoration: underline;
-}
 .up-btn {
   position: fixed;
   bottom: 20px;