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

.env.development

@@ -1,21 +1,21 @@
 NODE_ENV = 'development'
 
 # 版本号 1937
-VITE_VERSION = 'v24.11.11.1019'
+VITE_VERSION = 'v24.11.11.1843'
 
 VITE_APP_TITLE = 门墩儿
 
 # 访问路径
-VITE_ACCESS_BASE_URL = 'http://menduner.citupro.com:7878' # 测试环境
-# VITE_ACCESS_BASE_URL = 'https://www.menduner.com' # 生产环境
+# VITE_ACCESS_BASE_URL = 'http://menduner.citupro.com:7878' # 测试环境
+VITE_ACCESS_BASE_URL = 'https://www.menduner.com' # 生产环境
 # 
 # 请求路径
-VITE_BASE_URL = 'http://menduner.citupro.com:7878' # 测试环境
-# VITE_BASE_URL = 'https://www.menduner.com' # 生产环境
+# VITE_BASE_URL = 'http://menduner.citupro.com:7878' # 测试环境
+VITE_BASE_URL = 'https://www.menduner.com' # 生产环境
 
 # 预览路径
-VITE_PREVIEW_URL = 'http://192.168.3.91:8012' # 测试环境
-# VITE_PREVIEW_URL = 'https://kkfileview.menduner.com/' # 生产环境
+# VITE_PREVIEW_URL = 'http://192.168.3.91:8012' # 测试环境
+VITE_PREVIEW_URL = 'https://kkfileview.menduner.com/' # 生产环境
 
 # 租户id
 VITE_TENANTCODE = '155'

components.d.ts

@@ -17,7 +17,6 @@ declare module 'vue' {
     Combobox: typeof import('./src/components/FormUI/combobox/index.vue')['default']
     ComboboxZhAndEn: typeof import('./src/components/FormUI/comboboxZhAndEn/index.vue')['default']
     ConfirmPaymentDialog: typeof import('./src/components/pay/confirmPaymentDialog.vue')['default']
-    copy: typeof import('./src/components/CtForm/index copy.vue')['default']
     CtBtn: typeof import('./src/components/CtVuetify/CtBtn/index.vue')['default']
     CtDialog: typeof import('./src/components/CtDialog/index.vue')['default']
     CtForm: typeof import('./src/components/CtForm/index.vue')['default']

src/App.vue

@@ -7,14 +7,17 @@ import axios from 'axios'
 const openCheckVersion = true // 开启检测版本
 const timer = ref(null)
 const setIntervalTime = 300000 // 300000 五分钟
+function open () {
+  if (timer.value) clearInterval(timer.value)
+  timer.value = setInterval(() => { checkVersion() }, setIntervalTime)
+}
 onMounted(() => {
   nextTick(() => {
     console.log('baseurl:', import.meta.env?.VITE_BASE_URL, 'version:', import.meta.env?.VITE_VERSION, process?.env?.NODE_ENV)
     //
     const process_ENV = process?.env?.NODE_ENV || ''
     if ((process_ENV === 'production' || process_ENV === 'development') && openCheckVersion) {
-      if (timer.value) clearInterval(timer.value)
-      timer.value = setInterval(() => { checkVersion() }, setIntervalTime)
+      open()
     }
   })
 })
@@ -33,11 +36,15 @@ const checkVersion = () => {
     headers: { ['tenant-id']: tenantId }
   }).then((res) => {
     if (res?.data?.data !== version) {
-      const option = {
-        autoCloseTime: setIntervalTime > 15000 ? setIntervalTime - 10000 : setIntervalTime >= 5000 ? setIntervalTime - 1000 : setIntervalTime
-      }
-      Confirm('系统提示', '发现新版本，是否立即刷新页面', option).then(() => {
+      // const option = {
+      //   autoCloseTime: setIntervalTime > 15000 ? setIntervalTime - 10000 : setIntervalTime >= 5000 ? setIntervalTime - 1000 : setIntervalTime
+      // }
+      clearInterval(timer.value)
+      timer.value = null
+      Confirm('系统提示', '发现新版本，是否立即刷新页面').then(() => {
         window.location.reload()
+      }).catch(() => {
+        open()
       })
     }
   }).catch(err => {

src/components/Enterprise/details.vue

@@ -67,7 +67,7 @@
     </div>
 
     <!-- 快速登录 -->
-    <login-page v-if="showLogin" @loginSuccess="loginSuccess" @close="loginClose"></login-page>
+    <loginPage v-if="showLogin" @loginSuccess="loginSuccess" @close="loginClose"></loginPage>
   </div>
 </template>
 

src/components/VerificationCode/index.vue

@@ -47,15 +47,15 @@
         </template>
       </v-text-field>
     </v-form>
+    <Verify
+      v-if="props.openVerify"
+      ref="smsVerify"
+      captchaType="blockPuzzle"
+      :imgSize="{ width: '400px', height: '200px' }"
+      mode="pop"
+      @success="verifySuccess"
+    />
   </div>
-  <Verify
-    v-if="props.openVerify"
-    ref="smsVerify"
-    captchaType="blockPuzzle"
-    :imgSize="{ width: '400px', height: '200px' }"
-    mode="pop"
-    @success="verifySuccess"
-  />
 </template>
 
 <script setup>

src/views/login/index.vue

@@ -102,6 +102,7 @@ import navBar from '@/layout/personal/navBar.vue'
 import about from '@/views/about/index.vue'
 import { useRoute } from 'vue-router'; const route = useRoute()
 import Verify from '@/components/Verifition'
+console.log(1, '23456', 789)
 
 const isMobile = ref(false)
 onMounted(() => {
@@ -111,7 +112,7 @@ onMounted(() => {
 
 const { t } = useI18n()
 const router = useRouter()
-const tab = ref(2)
+const tab = ref(2) // 密码登录
 const tab1 = ref(1)
 const isAgree = ref(false)
 const isEnterpriseLogin = ref(route.query?.entLogin || false)

src/views/recruit/entRegister/register.vue

@@ -251,11 +251,13 @@ const getOcr = async () => {
       saveRegisterInfo()
     } else {
       licenseUrl.value = ''
-      Confirm(t('common.confirmTitle'), '营业执照图片识别失败,请重新上传清晰合法图片', { hideCancelBtn: true })
+      Confirm(t('common.confirmTitle'), '营业执照图片识别失败，请重新上传清晰合法图片', { hideCancelBtn: true })
     }
   } catch (error) {
     licenseUrl.value = ''
-    Confirm(t('common.confirmTitle'), error, { hideCancelBtn: true })
+    console.error(error)
+    Snackbar.error('营业执照图片识别失败，请重新上传清晰合法图片')
+    // Confirm(t('common.confirmTitle'), error, { hideCancelBtn: true })
   } finally {
     loading.value = false
   }

vite.config.mjs

@@ -62,13 +62,27 @@ export default defineConfig({
       '.vue',
     ],
   },
+  build: {
+    rollupOptions: {
+      output: {
+        // 设置静态资源引用的基础路径
+        assetFileNames: 'assets/[name].[ext]',
+        chunkFileNames: 'chunks/[name].[hash].js',
+        entryFileNames: '[name].js',
+      },
+    },
+  },
+   // 配置静态资源处理
+   publicDir: 'public', // 设置静态资源目录
+   assetsDir: 'assets', // 设置构建后的静态资源目录
+   base: '/', // 设置应用的基本URL
   server: {
     port: 3000
-  },
-  configureWebpack: {
-    output: {
-      filename: 'js/[name].' + new Date().getTime() + '.js',
-      chunkFilename: 'js/[name].' + new Date().getTime() + '.js'
-    }
   }
+  // configureWebpack: {
+  //   output: {
+  //     filename: 'js/[name].' + new Date().getTime() + '.js',
+  //     chunkFilename: 'js/[name].' + new Date().getTime() + '.js'
+  //   }
+  // }
 })