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

src/router/modules/components/recruit/enterprise.js

@@ -303,7 +303,7 @@ const enterprise = [
     meta: {
       title: '财务中心',
       enName: 'system Management',
-      icon: 'mdi-account',
+      icon: 'mdi-finance',
       // isAdmin: true // 企业管理员菜单
     },
     children: [
@@ -332,6 +332,28 @@ const enterprise = [
         component: () => import('@/views/recruit/enterprise/invoiceManagement/index.vue')
       }
     ]
+  },
+  {
+    path: '/recruit/enterprise/jobFair',
+    component: Layout,
+    name: 'jobFair',
+    show: true, // 暂时隐藏
+    meta: {
+      title: '招聘会',
+      enName: 'Job Management',
+      icon: 'mdi-account-filter-outline'
+    },
+    children: [
+      {
+        path: '/recruit/enterprise/jobFair',
+        show: true,
+        meta: {
+          title: '招聘会',
+          enName: 'Job Fair'
+        },
+        component: () => import('@/views/recruit/enterprise/jobFair/index.vue')
+      }
+    ]
   }
 ]
 export default enterprise

src/views/login/components/editPassword.vue

@@ -27,6 +27,7 @@
         @click:append-inner="show = !show"
       ></v-text-field>
     </v-form>
+    <slot name="custom"></slot>
     <div class="text-center mt-5">
       <v-btn v-if="showCancelBtn" class="mr-5" color="primary" variant="outlined" @click="handleClose">取 消</v-btn>
       <v-btn color="primary" :max-width="showCancelBtn ? 370 : 95" :min-width="showCancelBtn ? 95 : 370" @click="handleSubmit" :loading="loading">确认修改</v-btn>

src/views/login/components/editPasswordEnt.vue

@@ -51,6 +51,7 @@
         @click:append-inner="show = !show"
       ></v-text-field>
     </v-form>
+    <slot name="custom"></slot>
     <div class="text-center mt-5">
       <!-- <v-btn v-if="showCancelBtn" class="mr-5" color="primary" variant="outlined" @click="handleClose">取 消</v-btn> -->
       <v-btn color="primary" style="width: 100%;" @click="handleSubmit" :loading="loading">确认修改</v-btn>

src/views/login/forgotPassword.vue

@@ -7,7 +7,13 @@
           {{ route.query.forgot ? '密码不安全，请重置密码' : '修改密码' }}
         </div>
       </div>
-      <editPasswordPage class="mt-5" :showCancelBtn="false" :isReset="true" @cancel="router.push('/login')"></editPasswordPage>
+      <editPasswordPage class="mt-5" :showCancelBtn="false" :isReset="true" @cancel="router.push('/login')">
+        <template #custom>
+          <div class="font-size-14 text-end">
+            <span class="color-primary cursor-pointer" @click="router.push('/login')">回到登录页</span>
+          </div>
+        </template>
+      </editPasswordPage>
     </div>
   </div>
 </template>
@@ -22,7 +28,6 @@ import { ref, onMounted } from 'vue'
 const router = useRouter()
 const route = useRoute()
 
-
 const isMobile = ref(false)
 onMounted(() => {
   const userAgent = navigator.userAgent

src/views/login/forgotPasswordEnt.vue

@@ -5,7 +5,13 @@
       <div class="resume-header">
         <div class="resume-title">企业修改密码</div>
       </div>
-      <editPasswordPage class="mt-5" :showCancelBtn="false" :captchaVerification="captchaVerification" @getCode="getCode"  @cancel="router.push('/login')"></editPasswordPage>
+      <editPasswordPage class="mt-5" :showCancelBtn="false" :captchaVerification="captchaVerification" @getCode="getCode"  @cancel="router.push('/login')">
+        <template #custom>
+          <div class="font-size-14 text-end">
+            <span class="color-primary cursor-pointer" @click="router.push('/login')">回到登录页</span>
+          </div>
+        </template>
+      </editPasswordPage>
     </div>
   </div>
   <Verify

src/views/mall/purchasePackage/components/packageList.vue

@@ -23,7 +23,14 @@
       </div> -->
       <div v-if="val.text">
         <div class="font-weight-bold my-3">权益</div>
-        <div v-html="val.text"></div>
+        <div>
+          <p
+            v-for="v in val.list"
+            :key="val.name + v.text"
+            class="vipColor"
+            :class="{ active: v.active}"
+          >{{ v.text }}</p>
+        </div>
       </div>
       <!-- <div v-else>
         <h3 class="my-3">授权范围：</h3>
@@ -99,7 +106,6 @@ const packDataList = ref([])
 const getData = async () => {
   const data = await getMembershipPackageList()
   if (!data?.length) return
-  // packDataList.value = 
   let vipFlagIndex = null
   const list = data.map((item, index) => {
     item.id = item.id?.toString()
@@ -107,6 +113,7 @@ const getData = async () => {
     if (item.recommend) active.value = index // 推荐套餐
     return {
       ...item,
+      list: JSON.parse(item.text),
       type: 3, // 订单类型 0平台订单|1求职端订单|2招聘端订单|3会员套餐
       loading: false
     }
@@ -213,6 +220,11 @@ function handleOverdue () {
   margin-right: 30px;
   color: #774e20;
   background-color: #fafafa;
+  &.active {
+    background-color: rgba(255, 251, 248, 1);
+    border: 1px solid #f1b17a;
+    box-shadow: 0px 6px 12px 0px rgba(216, 160, 82, 0.36);
+  }
   &:nth-child(5n) {
     margin-right: 0;
   }
@@ -229,11 +241,7 @@ ul li {
   margin: 10px 0;
   font-weight: 500;
 }
-.active {
-  background-color: rgba(255, 251, 248, 1);
-  border: 1px solid #f1b17a;
-  box-shadow: 0px 6px 12px 0px rgba(216, 160, 82, 0.36);
-}
+
 :deep(.v-btn) {
   border: 1px solid #bc8b55;
   color: #c30f0f !important;
@@ -292,4 +300,14 @@ ul li {
   text-align: center;
   border-radius: 4px;
 }
+
+
+.vipColor {
+  color: #774e2085;
+  font-size: 15px;
+  padding: 5px 0;
+  &.active {
+    color:#774e20;
+  }
+}
 </style>

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

@@ -0,0 +1,13 @@
+<template>
+  <v-card class="card-box pa-5">
+    111
+  </v-card>
+</template>
+
+<script setup>
+defineOptions({ name: 'jobFair'})
+</script>
+
+<style scoped lang="scss">
+
+</style>