From e9da383a41fd45ac7eaca9429487f5c7393dc506 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 25 Aug 2023 15:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B7=AF=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 176 +-----------------------------------
pages.json | 9 +-
pages/oaHome/oaHome.vue | 2 +-
pages/oaMy/oaMy.vue | 2 +-
subpkg/property/vehicle.vue | 27 ++++--
5 files changed, 34 insertions(+), 182 deletions(-)
diff --git a/manifest.json b/manifest.json
index e600185..bc7c649 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,6 +10,9 @@
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
+ // "statusbar": {
+ // "immersed": false
+ // },
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
@@ -57,7 +60,7 @@
"weixin" : {
"__platform__" : [ "ios", "android" ],
"appid" : "wx4789d9f1b50390ba",
- "UniversalLinks" : ""
+ "UniversalLinks" : "https://worker-task.lihaink.cn/"
}
},
"ad" : {},
@@ -104,176 +107,7 @@
}
}
},
- "nativePlugins" : {
- "JG-JCore" : {
- "JPUSH_APPKEY_ANDROID" : "5ced5ec5fa7bb86302944f0f",
- "JPUSH_APPKEY_IOS" : "5ced5ec5fa7bb86302944f0f",
- "JPUSH_CHANNEL_ANDROID" : "",
- "JPUSH_CHANNEL_IOS" : "",
- "__plugin_info__" : {
- "name" : "极光推送 JCore 官方 SDK",
- "description" : "极光推送 JCore 官方 SDK HBuilder 插件版本",
- "platforms" : "All,Android,iOS",
- "url" : "https://ext.dcloud.net.cn/plugin?id=4028",
- "android_package_name" : "uni.UNIB5B1EDD",
- "ios_bundle_id" : "uni.UNIB5B1EDD",
- "isCloud" : true,
- "bought" : 1,
- "pid" : "4028",
- "parameters" : {
- "JPUSH_APPKEY_ANDROID" : {
- "des" : "[Android]极光portal配置应用信息时分配的AppKey",
- "key" : "JPUSH_APPKEY",
- "value" : ""
- },
- "JPUSH_APPKEY_IOS" : {
- "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
- "key" : "JCore:APP_KEY",
- "value" : ""
- },
- "JPUSH_CHANNEL_ANDROID" : {
- "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
- "key" : "JPUSH_CHANNEL",
- "value" : ""
- },
- "JPUSH_CHANNEL_IOS" : {
- "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
- "key" : "JCore:CHANNEL",
- "value" : ""
- }
- }
- }
- },
- "JG-JPush" : {
- "JPUSH_ADVERTISINGID_IOS" : "",
- "JPUSH_DEFAULTINITJPUSH_IOS" : "",
- "JPUSH_GOOGLE_API_KEY" : "",
- "JPUSH_GOOGLE_APP_ID" : "",
- "JPUSH_GOOGLE_PROJECT_ID" : "",
- "JPUSH_GOOGLE_PROJECT_NUMBER" : "",
- "JPUSH_GOOGLE_STORAGE_BUCKET" : "",
- "JPUSH_HONOR_APPID" : "",
- "JPUSH_HUAWEI_APPID" : "",
- "JPUSH_ISPRODUCTION_IOS" : "",
- "JPUSH_MEIZU_APPID" : "",
- "JPUSH_MEIZU_APPKEY" : "",
- "JPUSH_OPPO_APPID" : "",
- "JPUSH_OPPO_APPKEY" : "",
- "JPUSH_OPPO_APPSECRET" : "",
- "JPUSH_VIVO_APPID" : "",
- "JPUSH_VIVO_APPKEY" : "",
- "JPUSH_XIAOMI_APPID" : "",
- "JPUSH_XIAOMI_APPKEY" : "",
- "__plugin_info__" : {
- "name" : "极光推送 JPush 官方 SDK",
- "description" : "极光推送JPush官方SDK HBuilder插件版本",
- "platforms" : "All,Android,iOS",
- "url" : "https://ext.dcloud.net.cn/plugin?id=4035",
- "android_package_name" : "uni.UNIB5B1EDD",
- "ios_bundle_id" : "uni.UNIB5B1EDD",
- "isCloud" : true,
- "bought" : 1,
- "pid" : "4035",
- "parameters" : {
- "JPUSH_ADVERTISINGID_IOS" : {
- "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填",
- "key" : "JPush:ADVERTISINGID",
- "value" : ""
- },
- "JPUSH_DEFAULTINITJPUSH_IOS" : {
- "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填",
- "key" : "JPush:DEFAULTINITJPUSH",
- "value" : ""
- },
- "JPUSH_GOOGLE_API_KEY" : {
- "des" : "厂商google api_key,示例:g-12346578",
- "key" : "google_api_key",
- "value" : ""
- },
- "JPUSH_GOOGLE_APP_ID" : {
- "des" : "厂商google mobilesdk_app_id,示例：g-12346578",
- "key" : "google_app_id",
- "value" : ""
- },
- "JPUSH_GOOGLE_PROJECT_ID" : {
- "des" : "厂商google project_id ,示例：g-12346578",
- "key" : "project_id",
- "value" : ""
- },
- "JPUSH_GOOGLE_PROJECT_NUMBER" : {
- "des" : "厂商google project_number,示例：g-12346578",
- "key" : "gcm_defaultSenderId",
- "value" : ""
- },
- "JPUSH_GOOGLE_STORAGE_BUCKET" : {
- "des" : "厂商google storage_bucket,示例：g-12346578",
- "key" : "google_storage_bucket",
- "value" : ""
- },
- "JPUSH_HONOR_APPID" : {
- "des" : "厂商HONOR-appId,示例：12346578",
- "key" : "com.hihonor.push.app_id",
- "value" : ""
- },
- "JPUSH_HUAWEI_APPID" : {
- "des" : "厂商HUAWEI-appId,示例：appid=12346578",
- "key" : "com.huawei.hms.client.appid",
- "value" : ""
- },
- "JPUSH_ISPRODUCTION_IOS" : {
- "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填",
- "key" : "JPush:ISPRODUCTION",
- "value" : ""
- },
- "JPUSH_MEIZU_APPID" : {
- "des" : "厂商MEIZU-appId,示例：MZ-12345678",
- "key" : "MEIZU_APPID",
- "value" : ""
- },
- "JPUSH_MEIZU_APPKEY" : {
- "des" : "厂商MEIZU-appKey,示例：MZ-12345678",
- "key" : "MEIZU_APPKEY",
- "value" : ""
- },
- "JPUSH_OPPO_APPID" : {
- "des" : "厂商OPPO-appId,示例：OP-12345678",
- "key" : "OPPO_APPID",
- "value" : ""
- },
- "JPUSH_OPPO_APPKEY" : {
- "des" : "厂商OPPO-appkey,示例：OP-12345678",
- "key" : "OPPO_APPKEY",
- "value" : ""
- },
- "JPUSH_OPPO_APPSECRET" : {
- "des" : "厂商OPPO-appSecret,示例：OP-12345678",
- "key" : "OPPO_APPSECRET",
- "value" : ""
- },
- "JPUSH_VIVO_APPID" : {
- "des" : "厂商VIVO-appId,示例：12345678",
- "key" : "com.vivo.push.app_id",
- "value" : ""
- },
- "JPUSH_VIVO_APPKEY" : {
- "des" : "厂商VIVO-appkey,示例：12345678",
- "key" : "com.vivo.push.api_key",
- "value" : ""
- },
- "JPUSH_XIAOMI_APPID" : {
- "des" : "厂商XIAOMI-appId,示例：MI-12345678",
- "key" : "XIAOMI_APPID",
- "value" : ""
- },
- "JPUSH_XIAOMI_APPKEY" : {
- "des" : "厂商XIAOMI-appKey,示例：MI-12345678",
- "key" : "XIAOMI_APPKEY",
- "value" : ""
- }
- }
- }
- }
- }
+ "nativePlugins" : {}
},
/* 快应用特有相关 */
"quickapp" : {},
diff --git a/pages.json b/pages.json
index 6bead92..f555a42 100644
--- a/pages.json
+++ b/pages.json
@@ -8,7 +8,8 @@
"enablePullDownRefresh": true,
"app-plus": {
"titleNView": false
- }
+ },
+ "navigationBarTextStyle": "white"
}
},
{
@@ -17,7 +18,8 @@
"navigationBarTitleText": "登录",
"app-plus": {
"titleNView": false
- }
+ },
+ "navigationBarTextStyle": "white"
}
},
@@ -63,7 +65,8 @@
"navigationBarTitleText": "我的",
"app-plus": {
"titleNView": false
- }
+ },
+ "navigationBarTextStyle": "white"
}
}, {
"path": "pages/oaManager/oaManager",
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 21febd6..3c967f8 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -7,7 +7,7 @@
:class="!ApproveList.length > 0 ? 'home_header_no_data' : ''"
>
-
+
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 28496f9..aeeca3e 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/subpkg/property/vehicle.vue b/subpkg/property/vehicle.vue
index c4c1901..bf7ffbd 100644
--- a/subpkg/property/vehicle.vue
+++ b/subpkg/property/vehicle.vue
@@ -312,12 +312,27 @@
}
that.runningRoute = data.paths[0].steps[0].instruction;
}
- that.polyline = [{
- points: points,
- color: "#0091ff",
- dottedLine: true,
- width: 30,
- }, ];
+ uni.getSystemInfo({
+ success: function(e){
+ if (e.platform == 'ios') {
+ that.polyline = [{
+ points: points,
+ color: "#0091ff",
+ dottedLine: true,
+ width: 10,
+ }, ];
+ }
+ else {
+ that.polyline = [{
+ points: points,
+ color: "#0091ff",
+ dottedLine: true,
+ width: 15,
+ }, ];
+ }
+ }
+ })
+
},
fail: function(res) {
console.log("获取路线失败", res);