diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index e608e7a..d8768fb 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -9,6 +9,10 @@
"customPlaygroundType" : "local",
"playground" : "custom",
"type" : "uni-app:app-android"
+ },
+ {
+ "playground" : "standard",
+ "type" : "uni-app:app-harmony"
}
]
}
diff --git a/App.vue b/App.vue
index f4f5c03..99c3fbd 100644
--- a/App.vue
+++ b/App.vue
@@ -166,6 +166,9 @@
decrypt: extraData['decrypt']
}
}else{
+ if (extraData['safeBottom']) {
+ this.$store.state["safeBottomAz"]=Number(extraData['safeBottom'])||0
+ }
storageData = {
host: extraData.host,
header: {
@@ -200,7 +203,7 @@
const devConfig = {
host: "https://flaunt.batiao8.com/",
header: {
- "x-token": "ebe42caa-845a-4cb2-a324-18abe8ced7c0"
+ "x-token": "55e2481e-cbd2-4d2d-82d3-b47e191fcfc0"
},
decrypt: "e4rOtnF8tJjtHO7ecZeJHN1rapED5ImB",
encrypt: "xn08hYoizXhZ1zHP8DVqfCm2yHxPmhil"
diff --git a/components/call-log/tabbar/tabbar.vue b/components/call-log/tabbar/tabbar.vue
index 07e8651..fc42a09 100644
--- a/components/call-log/tabbar/tabbar.vue
+++ b/components/call-log/tabbar/tabbar.vue
@@ -1,11 +1,11 @@
-
diff --git a/components/message/chat/chat-layout.vue b/components/message/chat/chat-layout.vue
index 84d8c70..544405c 100644
--- a/components/message/chat/chat-layout.vue
+++ b/components/message/chat/chat-layout.vue
@@ -53,7 +53,7 @@
+ :style="{ bottom: data.keyboardHeight + 'px' ,'margin-bottom':$store.state.safeBottomAz+'px'}">
-
+
diff --git a/components/safeBottom/safeBottom.vue b/components/safeBottom/safeBottom.vue
new file mode 100644
index 0000000..edc291b
--- /dev/null
+++ b/components/safeBottom/safeBottom.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main.js b/main.js
index 7fe4871..116b042 100644
--- a/main.js
+++ b/main.js
@@ -24,17 +24,24 @@ export function createApp() {
if (!systemInfo.platform) {
systemInfo = uni.getSystemInfoSync() || {}
}
+ const windowInfo = uni.getWindowInfo();
+ app.config.globalProperties.$store = {
+ state: {
+ safeBottom: windowInfo.safeAreaInsets?.bottom || 0,
+ safeBottomAz: 0
+ }
+ }
app.config.globalProperties.$system = systemInfo.platform == 'ios' ? 'iOS' : 'Android'
- // #ifdef APP-PLUS
+ // #ifdef APP-PLUS&&!APP-HARMONY
app.config.globalProperties.$system = plus.os.name;
// #endif
app.config.globalProperties.$systemInfo = systemInfo;
- uni.setStorageSync('version', '1.0.6.sp22');
+ uni.setStorageSync('version', '1.0.7.sp5');
app.config.globalProperties.$version = uni.getStorageSync('version');
// 环境:development→测试,production→正式(跟构建环境走,无需手改)
const isTest = process.env.NODE_ENV === 'development';
app.config.globalProperties.$isTest = isTest;
- // #ifdef APP-PLUS
+ // #ifdef APP-PLUS&&!APP-HARMONY
const version = plus.runtime.version;
// #endif
@@ -69,10 +76,10 @@ export function createApp() {
// #endif
//鸿蒙
// #ifdef APP-PLUS && APP-HARMONY
- if (isTest) {
- uni.setStorageSync('isTest', true)
- } else {
+ if (compareVersion(version, '2.1.7') >= 0&&!isTest) {
uni.setStorageSync('isTest', false)
+ } else {
+ uni.setStorageSync('isTest', true)
}
// #endif
//h5环境
diff --git a/manifest.json b/manifest.json
index b0c6af4..b3a4daa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -11,7 +11,19 @@
"splashScreens" : {
"startWindowIcon" : "resource/icon.png", // 启动页图标路径
"startWindowBackground" : "#123456" // 启动页背景颜色
- }
+ },
+ "bundleName" : "cn.zuom8.jsloction",
+ "signingConfigs" : {
+ "default" : {
+ "certpath" : "C:\\Users\\Administrator\\Desktop\\jisuloca\\test\\debug.cer",
+ "keyAlias" : "__uni__1be0b2f",
+ "keyPassword" : "000000189B31358AF1B1A6FD1CB2D1011E32DF02389A1F92604ECEB091A66654CDCDF6DB4DD18BC3",
+ "profile" : "C:\\Users\\Administrator\\Desktop\\jisuloca\\test\\jsloction_debugDebug.p7b",
+ "signAlg" : "SHA256withECDSA",
+ "storeFile" : "C:\\Users\\Administrator\\Desktop\\jisuloca\\hmos.p12",
+ "storePassword" : "000000185660236954705CE2E46C7A2FA76565A93989A8DDD5810CC2760ED8D2B479EDD9C488B982"
+ }
+ }
}
},
"app-plus" : {
@@ -25,6 +37,12 @@
"autoclose" : false,
"delay" : 0
},
+
+ "compatible" : {
+ "runtimeVersion": "4.75",
+ "compilerVersion": "5.14",
+ "ignoreVersion" : true
+ },
"optimization" : {
"subPackages" : true
},
diff --git a/pages/ant-credit-pay/index.vue b/pages/ant-credit-pay/index.vue
index 095bf70..1ab4ec9 100644
--- a/pages/ant-credit-pay/index.vue
+++ b/pages/ant-credit-pay/index.vue
@@ -3,7 +3,7 @@
-
+
@@ -118,6 +118,7 @@
+