From 58807eb0daebf50096101b710eca92da8a65dc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E7=94=B5=E8=84=91?= Date: Wed, 16 Jul 2025 08:50:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=A4=E6=96=ADios?= =?UTF-8?q?=E5=92=8Candroid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 3 ++- package.json | 4 +++- src/pages/login/login.vue | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.en.md b/README.en.md index 85462a72..53639d47 100644 --- a/README.en.md +++ b/README.en.md @@ -2,4 +2,5 @@ npm install --registry=http://25.12.10.69:8081/repository/aliyun-npm/ npm 淘宝源下载 ：npm config set registry https://registry.npmmirror.com -npm config set registry http://25.12.10.69:8081/repository/aliyun-npm/ \ No newline at end of file +npm config set registry http://25.12.10.69:8081/repository/aliyun-npm/ + diff --git a/package.json b/package.json index 8b55ed63..03d35fab 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,9 @@ "build:app-plus:sit": "uni build -p app-plus --mode sit", "build:app-plus:uat": "uni build -p app-plus --mode uat", "build:app-plus": "uni build -p app-plus", - "build:h5": "uni build" + "build:h5": "uni build", + "build:app-plus:sit:ios": "uni build -p app-plus --mode sit-ios", + "build:app-plus:uat:ios": "uni build -p app-plus --mode uat-ios" }, "dependencies": { "@dcloudio/uni-app": "3.0.0-4060620250520001", diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 64a244e7..765ae376 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -145,6 +145,8 @@ onMounted(() => { password.value = loginAccountData.password; } back_state.value = true; + const systemInfo = uni.getSystemInfoSync(); + console.log(systemInfo); }); // 跳进了登录页，禁止返回操作 onBackPress(() => back_state.value); From a9f7d9a962e85cc15a657d61906023e7bf372415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E7=94=B5=E8=84=91?= Date: Wed, 16 Jul 2025 09:02:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=A4=E6=96=ADios?= =?UTF-8?q?=E5=92=8Candroid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/common.js | 11 ++++++++++- src/pages/login/login.vue | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/common/common.js b/src/common/common.js index 582e668e..66bd56ba 100644 --- a/src/common/common.js +++ b/src/common/common.js @@ -116,7 +116,16 @@ export const getUserInfo = (key = '') => { const userInfo = uni.getStorageSync('userInfo') return '' === key ? userInfo : userInfo[key]; } -export const getPhoneEnvBool = (flag) => _ENV.VITE_APP_ENV === flag +export const getPhoneEnvBool = (flag) => { + const {platform} = uni.getSystemInfoSync(); + if (platform === 'ios') { + return flag === 'IOS' + } else if (platform === 'android') { + return flag === 'AND' + } else { + return false + } +} // 将对象和字符串相互转换 diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 765ae376..367e527d 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -60,7 +60,7 @@ import { encryptByAES } from '@/api/encryptAndDecryptData.js'; import { useSocketStore } from '@/store/socket.js'; import { storeToRefs } from 'pinia'; - +import {getPhoneEnvBool} from '@/common/common.js' const socketStore = useSocketStore(); const { taskSocket } = storeToRefs(socketStore); @@ -147,6 +147,7 @@ onMounted(() => { back_state.value = true; const systemInfo = uni.getSystemInfoSync(); console.log(systemInfo); + console.log(getPhoneEnvBool('IOS')); }); // 跳进了登录页，禁止返回操作 onBackPress(() => back_state.value); From f666b8881a4ceea9365bd517c660ce5bc26e32d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E7=94=B5=E8=84=91?= Date: Wed, 16 Jul 2025 09:24:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=A4=E6=96=ADios?= =?UTF-8?q?=E5=92=8Candroid-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/common.js | 26 +++++++++++++++++--------- src/pages/login/login.vue | 1 + 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/common/common.js b/src/common/common.js index 66bd56ba..8e341746 100644 --- a/src/common/common.js +++ b/src/common/common.js @@ -116,16 +116,24 @@ export const getUserInfo = (key = '') => { const userInfo = uni.getStorageSync('userInfo') return '' === key ? userInfo : userInfo[key]; } +/** + * 判断当前运行平台是否匹配指定标识 + * @param {string} flag - 平台标识：'IOS' 表示苹果iOS平台，'AND' 表示安卓平台 + * @returns {boolean} 如果当前平台匹配指定标识返回true，否则返回false + */ export const getPhoneEnvBool = (flag) => { - const {platform} = uni.getSystemInfoSync(); - if (platform === 'ios') { - return flag === 'IOS' - } else if (platform === 'android') { - return flag === 'AND' - } else { - return false - } -} + // 获取当前设备的平台信息 + const { platform } = uni.getSystemInfoSync(); + + // 平台与标识的映射关系 + const platformMap = { + ios: 'IOS', + android: 'AND', + }; + + // 根据当前平台返回匹配结果 + return platformMap[platform] === flag; +}; // 将对象和字符串相互转换 diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 367e527d..1fdfbce2 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -148,6 +148,7 @@ onMounted(() => { const systemInfo = uni.getSystemInfoSync(); console.log(systemInfo); console.log(getPhoneEnvBool('IOS')); + console.log(getPhoneEnvBool('xxx')); }); // 跳进了登录页，禁止返回操作 onBackPress(() => back_state.value); From 9eeb562da4efbbd885c6c54c4a3c06b083ec0e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 16 Jul 2025 09:32:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ---- .env.production | 3 --- .env.sit | 2 -- .env.sit-ios | 8 -------- .env.uat | 3 --- .env.uat-ios | 8 -------- package.json | 4 +--- src/api/common.js | 2 +- src/common/common.js | 2 -- src/pages/login/login.vue | 3 --- 10 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 .env.sit-ios delete mode 100644 .env.uat-ios diff --git a/.env.development b/.env.development index 4750d846..83cf2831 100644 --- a/.env.development +++ b/.env.development @@ -2,10 +2,6 @@ ENV = 'development' # 'development' -VITE_APP_ENV = 'AND' - -# base api - # 苗扬 # VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786' diff --git a/.env.production b/.env.production index c5649d8c..22641718 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,5 @@ # 生产环境 ENV = 'production' -VITE_APP_ENV = 'AND' - # base api - VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' diff --git a/.env.sit b/.env.sit index 4b66d147..9623af29 100644 --- a/.env.sit +++ b/.env.sit @@ -1,8 +1,6 @@ # SIT环境 ENV = 'sit' -VITE_APP_ENV = 'AND' # base api - VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' diff --git a/.env.sit-ios b/.env.sit-ios deleted file mode 100644 index 2bd04f76..00000000 --- a/.env.sit-ios +++ /dev/null @@ -1,8 +0,0 @@ -# SIT环境 -ENV = 'sit' - -VITE_APP_ENV = 'IOS' - -# base api - -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' diff --git a/.env.uat b/.env.uat index b953bca8..c0c4b2ff 100644 --- a/.env.uat +++ b/.env.uat @@ -1,8 +1,5 @@ # UAT环境 ENV = 'uat' -VITE_APP_ENV = 'AND' - # base api - VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' diff --git a/.env.uat-ios b/.env.uat-ios deleted file mode 100644 index cbf3ee5a..00000000 --- a/.env.uat-ios +++ /dev/null @@ -1,8 +0,0 @@ -# UAT环境 -ENV = 'uat' - -VITE_APP_ENV = 'IOS' - -# base api - -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' diff --git a/package.json b/package.json index 03d35fab..8b55ed63 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,7 @@ "build:app-plus:sit": "uni build -p app-plus --mode sit", "build:app-plus:uat": "uni build -p app-plus --mode uat", "build:app-plus": "uni build -p app-plus", - "build:h5": "uni build", - "build:app-plus:sit:ios": "uni build -p app-plus --mode sit-ios", - "build:app-plus:uat:ios": "uni build -p app-plus --mode uat-ios" + "build:h5": "uni build" }, "dependencies": { "@dcloudio/uni-app": "3.0.0-4060620250520001", diff --git a/src/api/common.js b/src/api/common.js index baf0375f..61154a68 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -144,7 +144,7 @@ export function downloadVoiceFile(url) { let baseUrl = get_base_url(); return new Promise((resolve, reject) => { uni.downloadFile({ - url: `${baseUrl}${url}`, + url: `${baseUrl}${url}`, header, success(result) { console.log(result) diff --git a/src/common/common.js b/src/common/common.js index 66bd56ba..79695f26 100644 --- a/src/common/common.js +++ b/src/common/common.js @@ -1,6 +1,4 @@ -const _ENV = import.meta.env - function msg(title, duration = 1000) { uni.showToast({ title: title, diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 367e527d..6c0ded28 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -145,9 +145,6 @@ onMounted(() => { password.value = loginAccountData.password; } back_state.value = true; - const systemInfo = uni.getSystemInfoSync(); - console.log(systemInfo); - console.log(getPhoneEnvBool('IOS')); }); // 跳进了登录页，禁止返回操作 onBackPress(() => back_state.value);