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.07.1937'
 
 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'

src/App.vue

@@ -4,17 +4,17 @@ import { ref, onMounted, onUnmounted, nextTick } from 'vue'
 import Confirm from '@/plugins/confirm'
 import axios from 'axios'
 
-const testVersion = '' // 开启测试环境测试 (默认为空关闭测试，v24.11.07.1936测试使用) 
+const openCheckVersion = true // 开启检测版本
 const timer = ref(null)
-const setIntervalTime = 10000
+const setIntervalTime = 300000 // 300000 五分钟
 onMounted(() => {
   nextTick(() => {
-    console.log('baseurl:', import.meta.env?.VITE_BASE_URL, 'version:', import.meta.env?.VITE_VERSION || testVersion)
+    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' || testVersion) { // development production
+    if ((process_ENV === 'production' || process_ENV === 'development') && openCheckVersion) {
       if (timer.value) clearInterval(timer.value)
-      // timer.value = setInterval(() => { checkVersion() }, setIntervalTime)
+      timer.value = setInterval(() => { checkVersion() }, setIntervalTime)
     }
   })
 })
@@ -25,15 +25,16 @@ onUnmounted(() => {
 // 检查版本号
 const checkVersion = () => {
   const baseUrl = import.meta.env.VITE_BASE_URL || ''
-  const version = import.meta.env?.VITE_VERSION || testVersion
+  const version = import.meta.env?.VITE_VERSION || ''
   const tenantId = import.meta.env?.VITE_TENANTCODE || ''
-  if (!baseUrl || !version) return
+  // 
+  if (!baseUrl || !version || !tenantId) return
   axios.get(`${baseUrl}/app-api/menduner/system/get/version`, {
     headers: { ['tenant-id']: tenantId }
   }).then((res) => {
     if (res?.data?.data !== version) {
       const option = {
-        autoCloseTime: setIntervalTime + 5000
+        autoCloseTime: setIntervalTime > 15000 ? setIntervalTime - 10000 : setIntervalTime >= 5000 ? setIntervalTime - 1000 : setIntervalTime
       }
       Confirm('系统提示', '发现新版本，是否立即刷新页面', option).then(() => {
         window.location.reload()

src/plugins/confirm/confirm.vue

@@ -25,7 +25,6 @@ const autoCloseTime = props.option.autoCloseTime || 0
 // 自动关闭弹窗
 if (autoCloseTime && Number.isInteger(autoCloseTime) && autoCloseTime >= 1000) {
   setTimeout(() => {
-    console.log('自动关闭弹窗')
     props.cancel()
   }, autoCloseTime)
 }