From 95a1187b8a50cd3bb92f53afe02ca8b98bf2597a Mon Sep 17 00:00:00 2001 From: xuli3099 Date: Thu, 4 Sep 2025 14:02:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 10 +++- .env.production | 7 ++- .gitignore | 1 + .hbuilderx/launch.json | 10 ++++ .../android/Tm-TmSafeSaveFileModule.aar | Bin 31982 -> 29158 bytes src/App.vue | 41 ++++++++++++---- src/manifest.json | 46 +++++++++++++++--- src/pages/loading/loading.vue | 3 +- src/pages/login/login.vue | 6 +-- src/utils/request/index.js | 5 +- 10 files changed, 105 insertions(+), 24 deletions(-) diff --git a/.env.development b/.env.development index 669fcda..96551b7 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,12 @@ #调用后台地址 -# VITE_APP_BASE_URL = 'http://118.186.13.120:31302' -VITE_APP_BASE_URL = 'https://app-test.718yousheng.com' +# 公司 +VITE_APP_BASE_URL = 'http://118.186.13.120:31302' # VITE_APP_BASE_URL = "http://192.168.236.71:31302" # VITE_APP_BASE_URL = "http://123.57.20.168:3000" + +# 友晟外网 +# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com' +# 友晟内网 +# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com' + diff --git a/.env.production b/.env.production index 7dc3840..399c1d5 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,11 @@ #调用后台地址 -VITE_APP_BASE_URL = 'https://app-test.718yousheng.com' +# 公司 # VITE_APP_BASE_URL = 'http://118.186.13.120:31302' # VITE_APP_BASE_URL = "http://192.168.236.71:31302" # VITE_APP_BASE_URL = "http://123.57.20.168:3000" + +# 友晟外网 +VITE_APP_BASE_URL = 'https://app-test.718yousheng.com' +# 友晟内网 +# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com' diff --git a/.gitignore b/.gitignore index 01340c7..2c90742 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ pnpm-debug.log* lerna-debug.log* node_modules +.hbuilderx .DS_Store dist *.local diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 1b8d0f6..c3b0787 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -4,6 +4,16 @@ { "playground" : "custom", "type" : "uni-app:app-android" + }, + { + "app" : { + "launchtype" : "remote" + }, + "default" : { + "launchtype" : "local" + }, + "provider" : "aliyun", + "type" : "uniCloud" } ] } diff --git a/nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar b/nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar index b11db39b176fc24eb10815ba6b02942d0924fadd..730578a58a751e9e0efee3ba61bf757cb25b5f86 100644 GIT binary patch delta 9966 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 delta 12853 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 T000O82mtp1007~700000QhXSZ diff --git a/src/App.vue b/src/App.vue index a43bacc..499cb5c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,16 +4,39 @@ diff --git a/src/manifest.json b/src/manifest.json index d7b6ef8..769273e 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -21,7 +21,9 @@ "delay" : 0 }, /* 模块配置 */ - "modules" : {}, + "modules" : { + "Push" : {} + }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ @@ -41,17 +43,31 @@ "", "", "", - "" + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ], "minSdkVersion" : 26, "targetSdkVersion" : 35, "icons" : { "android" : { - "hdpi" : "static/icons/72x72.png", - "xhdpi" : "static/icons/96x96.png", - "xxhdpi" : "static/icons/144x144.png", - "xxxhdpi" : "static/icons/192x192.png" + "hdpi" : "/static/images/icon.png", + "xhdpi" : "/static/images/icon.png", + "xxhdpi" : "/static/images/icon.png", + "xxxhdpi" : "/static/images/icon.png" } } }, @@ -60,7 +76,23 @@ "dSYMs" : false }, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : { + "push" : { + "unipush" : { + "version" : "2", + "offline" : true, + "icons" : { + "small" : { + "ldpi" : "/static/images/icon.png", + "mdpi" : "/static/images/icon.png", + "hdpi" : "/static/images/icon.png", + "xhdpi" : "/static/images/icon.png", + "xxhdpi" : "/static/images/icon.png" + } + } + } + } + } }, "nativePlugins" : { "Tm-TmSafeSaveFileModule" : { diff --git a/src/pages/loading/loading.vue b/src/pages/loading/loading.vue index 96d8f66..9302565 100644 --- a/src/pages/loading/loading.vue +++ b/src/pages/loading/loading.vue @@ -134,6 +134,7 @@ const selectDeviceId = async()=>{ // 查询本地缓存的设备状态是否绑定过 // let deviceId = uni.getStorageSync('app_device_id');// 本地设备ID try { + // showAlert("safeSave=>"+safeSave) safeSave.getSafeFile({ "key": "app_device_id" }, res2 => { // showAlert(JSON.stringify(res2)); if (res2.code == 1) { @@ -177,7 +178,7 @@ const selectDeviceId = async()=>{ }) } catch (error) { console.log("getSafeFile=>",error) - showAlert(error) + // showAlert("getSafeFile=>"+error) } } // 下载最新版本 diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index c0c14dc..99d3ca4 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -264,9 +264,9 @@ const submitForm = () => { // #ifdef H5 //h5测试用 内网-sn123456 - //公司外网 '9516053c-b441-465b-9781-06e7b8031811' + //公司外网 'd5aa6eaf-fff7-4009-bf7e-60e4b3dc4f40' //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' - param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2'; + param.uniqCode = 'd5aa6eaf-fff7-4009-bf7e-60e4b3dc4f40'; let res = await login(param); userStore.login(res); uni.switchTab({ url: '/pages/home/home' }) @@ -278,7 +278,7 @@ const submitForm = () => { // 读取设备ID safeSave.getSafeFile({ "key": "app_device_id" }, res3 => { if (res3.code == 1) { - let deviceId = res3.data;//'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' // + let deviceId = res3.data; // showAlert("读取成功=>"+deviceId); param.uniqCode = deviceId; console.log("param=>",param) diff --git a/src/utils/request/index.js b/src/utils/request/index.js index b4ce122..a12cd79 100644 --- a/src/utils/request/index.js +++ b/src/utils/request/index.js @@ -60,7 +60,10 @@ const requestHooks = { return Promise.reject(); default: - message.alert(msg) + if(msg) + message.alert(msg) + else + message.alert("网络连接失败,请稍后再试!") // return data; return Promise.reject(msg); }