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 b11db39..730578a 100644
Binary files a/nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar and b/nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar differ
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);
}