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);