From 954c1baa960765f35de4217e0a3cd30fd895224c Mon Sep 17 00:00:00 2001 From: xuli Date: Tue, 13 Jan 2026 10:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E7=BB=9C=20?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 6 ++-- src/pages/loading/loading.vue | 11 ++++++- src/pages/login/login.vue | 9 +++--- src/utils/common.js | 55 +++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 7 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index 765958d..0b1ba2e 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "name" : "718友晟", "appid" : "__UNI__0B682E1", "description" : "", - "versionName" : "1.0.2", + "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ @@ -63,7 +63,9 @@ "", "", "", - "" + "", + "", + "" ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ], "minSdkVersion" : 23, diff --git a/src/pages/loading/loading.vue b/src/pages/loading/loading.vue index fd2ab03..356297b 100644 --- a/src/pages/loading/loading.vue +++ b/src/pages/loading/loading.vue @@ -28,7 +28,8 @@ import { MINIO_KEY } from '@/enums/cacheEnums'; import { versionCheck,getBindStatus } from '@/api/auth.js'; import { formatIOS } from '@/utils/status.js' // import { requestAndroidPermissionAsync,requestAndroidPermission } from '@/utils/common.js' -import {showAlert} from '@/utils/message.js' +import {showAlert,showToast} from '@/utils/message.js' +import {isNetwork,openNetworkSettings} from '@/utils/common.js' import { minioParam } from '@/api/polling.js' import { useUserStore } from '@/stores/user'; const userStore = useUserStore(); @@ -55,6 +56,14 @@ onLoad(async(opt) => { // uni.preloadPage({url: "/pages/home/home"}); // #ifdef APP-PLUS + let res = await isNetwork();//验证是否有网络 + if(res==='none'){ + showAlert('当前网络不可用，请检查网络设置','提示',false,()=>{ + openNetworkSettings(); + }); + return; + } + //手机通知授权 noticMsgTool(); diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index cc2f27f..0b6f32a 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -88,7 +88,7 @@ import { AGREEWELCOME_KEY } from '@/enums/cacheEnums'; import { getNavBarPaddingTop} from '@/utils/system.js' import { useUserStore } from '@/stores/user'; import encryptObj from '@/utils/encrypt.js' -import {showAlert} from '@/utils/message.js' +import {showAlert,showToast} from '@/utils/message.js' // #ifdef APP-PLUS @@ -266,7 +266,7 @@ const submitForm = () => { //h5测试用 内网-sn123456 //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee' 529a5543-6957-401e-b090-13df6dee5429 //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' - param.uniqCode = '9a41dec6-536f-443f-9d98-8dc5c0b18332'//'9a41dec6-536f-443f-9d98-8dc5c0b18332';//'1af78c0a-b878-425f-9dc5-bee42146860a' + param.uniqCode = '9a41dec6-536f-443f-9d98-8dc5c0b18332'; let res = await login(param); userStore.login(res); uni.switchTab({ url: '/pages/home/home' }) @@ -302,20 +302,21 @@ const submitForm = () => { }) } else { - // showAlert('读取失败:'+res3.msg) + showToast('读取失败:'+res3.msg) console.error('读取失败:', error); btnLoading.value = false; } }) } catch (error) { console.error('读取失败:', error); - // showAlert('出错:', error) + showToast('err:'+ error) btnLoading.value = false; } // #endif }).catch(err => { console.log('表单错误11:', err); + showToast('err:'+ err) btnLoading.value = false; }); } diff --git a/src/utils/common.js b/src/utils/common.js index 57480c7..64f6b26 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -1,5 +1,60 @@ import { showAlert } from '@/utils/message.js' + +// 验证是否有网络 +export const isNetwork=()=>{ + return new Promise((resolve, reject) => { + uni.getNetworkType({ + success: function (res) { + resolve(res.networkType) + },fail:function(err){ + reject(err) + } + }); + }); +} + +// 打开网络设置 +export const openNetworkSettings = () => { + // 根据不同平台打开网络设置 + // #ifdef APP-PLUS + // App端 + const platform = uni.getSystemInfoSync().platform; + if (platform === 'ios') { + // iOS打开设置页面 + plus.runtime.openURL('App-Prefs:root') + } else if (platform === 'android') { + // Android打开网络设置 + // 方式1：使用原生API + const main = plus.android.runtimeMainActivity() + const Intent = plus.android.importClass('android.content.Intent') + const Settings = plus.android.importClass('android.provider.Settings') + const intent = new Intent(Settings.ACTION_WIFI_SETTINGS) + main.startActivity(intent) + + // 方式2：使用scheme（某些设备可能不支持） + // plus.runtime.openURL('android.settings.WIFI_SETTINGS') + } + // #endif + + // #ifdef H5 + // H5端无法直接跳转系统设置，只能提示 + uni.showToast({ + title: '请手动打开网络设置', + icon: 'none' + }) + // #endif + + // #ifdef MP-WEIXIN + // 微信小程序无法跳转系统设置，可以引导用户检查网络 + uni.showModal({ + title: '提示', + content: '请检查手机网络或WiFi连接', + showCancel: false + }) + // #endif +} + // 递归算法 export const initTree = (arr, parentId = '0', id) => { const tree = [];