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/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/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 582e668e..3f621653 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, @@ -116,7 +114,24 @@ export const getUserInfo = (key = '') => { const userInfo = uni.getStorageSync('userInfo') return '' === key ? userInfo : userInfo[key]; } -export const getPhoneEnvBool = (flag) => _ENV.VITE_APP_ENV === flag +/** + * 判断当前运行平台是否匹配指定标识 + * @param {string} flag - 平台标识:'IOS' 表示苹果iOS平台,'AND' 表示安卓平台 + * @returns {boolean} 如果当前平台匹配指定标识返回true,否则返回false + */ +export const getPhoneEnvBool = (flag) => { + // 获取当前设备的平台信息 + 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 64a244e7..6c0ded28 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);