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

src/router/modules/remaining.js

@@ -124,6 +124,18 @@ const remainingRouter = [
       }
     ]
   },
+  // {
+  //   path: '/404',
+  //   name: '404Page',
+  //   component: () => import('@/views/404/index.vue'),
+  //   meta: {
+  //     title: '404'
+  //   }
+  // },
+  // {
+  //   path: '/:catchAll(.*)',
+  //   redirect: '/404'
+  // }
 ]
 setLoginType(remainingRouter, 'personalCommon') // 暂定：登录企业端不能访问personalCommon路由
 setLoginType(common, 'common') // common 没有身份，任何情况都能访问

src/version.js

@@ -1,2 +1,2 @@
 // 版本号
-export const vue_version = 'v24.12.12.1847'
+export const vue_version = 'v24.12.16.1150'

src/views/404/index.vue

@@ -0,0 +1,21 @@
+<template>
+  <div class="d-flex align-center flex-column">
+    <svg-icon name="404" size="500"></svg-icon>
+    <div class="color-999 mb-5">抱歉，您访问的资源不存在。</div>
+    <div>
+      <v-btn color="primary" width="110" variant="outlined" @click="router.push('/')">首页</v-btn>
+      <v-btn color="primary" width="110" class="ml-5" @click="router.go(-1)">返回上一页</v-btn>
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineOptions({ name: '404'})
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
+</script>
+
+<style scoped lang="scss">
+
+</style>

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

@@ -49,7 +49,7 @@
           color="error"
           variant="outlined"
           rounded
-          :disabled="Number(val.id) < Number(userStore.userInfo?.vipFlag)"
+          :disabled="(userStore.userInfo?.vipExpireDate && userStore.userInfo?.vipExpireDate > Date.now()) && Number(val.id) < Number(userStore.userInfo?.vipFlag)"
           :loading="val.loading"
           @click="createOrder(val, i)"
         >开通会员</v-btn>

src/views/recruit/enterprise/membershipPackage/components/package.vue

@@ -55,7 +55,6 @@ const handleClickItem = (val, i) => {
   active.value = i
 }
 
-// 开通会员
 const type = ref()
 const open = ref(false)
 const handleOpenMembership = (val) => {