diff --git a/src/views/login.vue b/src/views/login.vue index ab764f6..360c27f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -59,7 +59,7 @@ import LogoImg from '@/assets/images/login/logo.png'; import userImages from '@/assets/images/personal/avatar.png'; import { EncryptAES, DecryptAES } from '@/utils/AES.js'; - +import { checkUserSystem } from '@/utils/compatible.js'; const pinias = useStore(); const router = useRouter(); const pattern = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[^\w\s]).{8,20}$/; //大小写带特殊字符最少8位 @@ -127,6 +127,12 @@ onMounted(() => { getCode(); + // 安卓,ios顶部适配 + let sys = checkUserSystem(); + if (sys == 'Android') { + window.android.updateChecker(); + } else { + } if (allData.remberPass) { const usernameKFApp = localStorage.getItem('usernameKFApp'); const passwordKFApp = localStorage.getItem('passwordKFApp'); diff --git a/src/views/login.vue b/src/views/login.vue index ab764f6..360c27f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -59,7 +59,7 @@ import LogoImg from '@/assets/images/login/logo.png'; import userImages from '@/assets/images/personal/avatar.png'; import { EncryptAES, DecryptAES } from '@/utils/AES.js'; - +import { checkUserSystem } from '@/utils/compatible.js'; const pinias = useStore(); const router = useRouter(); const pattern = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[^\w\s]).{8,20}$/; //大小写带特殊字符最少8位 @@ -127,6 +127,12 @@ onMounted(() => { getCode(); + // 安卓,ios顶部适配 + let sys = checkUserSystem(); + if (sys == 'Android') { + window.android.updateChecker(); + } else { + } if (allData.remberPass) { const usernameKFApp = localStorage.getItem('usernameKFApp'); const passwordKFApp = localStorage.getItem('passwordKFApp'); diff --git a/src/views/xuncha/components/patroLogDetails.vue b/src/views/xuncha/components/patroLogDetails.vue index c45b725..b6103ea 100644 --- a/src/views/xuncha/components/patroLogDetails.vue +++ b/src/views/xuncha/components/patroLogDetails.vue @@ -26,7 +26,7 @@
项目巡检记录
巡查记录编号 - {{ allData.detailsInfoTwo.basicInfoId }} + {{ allData.detailsInfoTwo.number }}
diff --git a/src/views/login.vue b/src/views/login.vue index ab764f6..360c27f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -59,7 +59,7 @@ import LogoImg from '@/assets/images/login/logo.png'; import userImages from '@/assets/images/personal/avatar.png'; import { EncryptAES, DecryptAES } from '@/utils/AES.js'; - +import { checkUserSystem } from '@/utils/compatible.js'; const pinias = useStore(); const router = useRouter(); const pattern = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[^\w\s]).{8,20}$/; //大小写带特殊字符最少8位 @@ -127,6 +127,12 @@ onMounted(() => { getCode(); + // 安卓,ios顶部适配 + let sys = checkUserSystem(); + if (sys == 'Android') { + window.android.updateChecker(); + } else { + } if (allData.remberPass) { const usernameKFApp = localStorage.getItem('usernameKFApp'); const passwordKFApp = localStorage.getItem('passwordKFApp'); diff --git a/src/views/xuncha/components/patroLogDetails.vue b/src/views/xuncha/components/patroLogDetails.vue index c45b725..b6103ea 100644 --- a/src/views/xuncha/components/patroLogDetails.vue +++ b/src/views/xuncha/components/patroLogDetails.vue @@ -26,7 +26,7 @@
项目巡检记录
巡查记录编号 - {{ allData.detailsInfoTwo.basicInfoId }} + {{ allData.detailsInfoTwo.number }}
diff --git a/vite.config.js b/vite.config.js index de062ce..f43437e 100644 --- a/vite.config.js +++ b/vite.config.js @@ -10,8 +10,8 @@ const Timestamp = new Date().getTime(); //随机时间戳 // const targetUrl = 'http://192.168.16.100:7200'; //陈迁 -// const targetUrl = 'http://192.168.20.52:7300'; //杨辉 -const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上 +const targetUrl = 'http://192.168.20.52:7300'; //杨辉 +// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上 export default defineConfig({ // 地址是和router中和ngix中配置的名称一致