From 944c6172524c206440d3d83e52b4015f1ee111e6 Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Thu, 18 Jul 2024 20:46:46 +0800
Subject: [PATCH] 1123
---
.hbuilderx/launch.json | 6 +-
App.vue | 18 +--
config/index.js | 2 +-
manifest.json | 3 +-
pages.json | 18 +--
pages/index/index.vue | 2 +-
.../apple-mobileprovision.mobileprovision | Bin 13586 -> 0 bytes
.../.manifest/apple-private.p12 | Bin 3212 -> 0 bytes
.../wgt/__UNI__4796942/.manifest/appstore.png | Bin 27735 -> 0 bytes
.../.manifest/icon-ipad-app.png | Bin 3180 -> 0 bytes
.../.manifest/icon-ipad-app@2x.png | Bin 6618 -> 0 bytes
.../.manifest/icon-ipad-notification.png | Bin 1191 -> 0 bytes
.../.manifest/icon-ipad-notification@2x.png | Bin 1860 -> 0 bytes
.../.manifest/icon-ipad-proapp@2x.png | Bin 7261 -> 0 bytes
.../.manifest/icon-ipad-settings.png | Bin 1460 -> 0 bytes
.../.manifest/icon-ipad-settings@2x.png | Bin 2520 -> 0 bytes
.../.manifest/icon-ipad-spotlight.png | Bin 1860 -> 0 bytes
.../.manifest/icon-ipad-spotlight@2x.png | Bin 3389 -> 0 bytes
.../.manifest/icon-iphone-app@2x.png | Bin 5263 -> 0 bytes
.../.manifest/icon-iphone-app@3x.png | Bin 8074 -> 0 bytes
.../.manifest/icon-iphone-notification@2x.png | Bin 1860 -> 0 bytes
.../.manifest/icon-iphone-notification@3x.png | Bin 2611 -> 0 bytes
.../.manifest/icon-iphone-settings@2x.png | Bin 2520 -> 0 bytes
.../.manifest/icon-iphone-settings@3x.png | Bin 3764 -> 0 bytes
.../.manifest/icon-iphone-spotlight@2x.png | Bin 3389 -> 0 bytes
.../.manifest/icon-iphone-spotlight@3x.png | Bin 5263 -> 0 bytes
.../wgt/__UNI__4796942/app-config-service.js | 4 +-
.../cache/wgt/__UNI__4796942/app-service.js | 2 +-
.../cache/wgt/__UNI__4796942/manifest.json | 2 +-
unpackage/debug/android_debug.apk | Bin 24258492 -> 21159231 bytes
.../dist/build/app-plus/app-config-service.js | 4 +-
unpackage/dist/build/app-plus/app-service.js | 2 +-
unpackage/dist/build/app-plus/manifest.json | 5 -
.../dist/cache/.vite/deps/_metadata.json | 6 +-
.../dist/dev/app-plus/app-config-service.js | 4 +-
unpackage/dist/dev/app-plus/app-service.js | 104 ++++--------------
unpackage/dist/dev/app-plus/manifest.json | 1 -
37 files changed, 56 insertions(+), 127 deletions(-)
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/apple-mobileprovision.mobileprovision
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/apple-private.p12
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/appstore.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-ipad-app.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-ipad-app@2x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-ipad-notification.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-ipad-notification@2x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-ipad-proapp@2x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-ipad-settings.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-ipad-settings@2x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-ipad-spotlight.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-ipad-spotlight@2x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-iphone-app@2x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-iphone-app@3x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-iphone-notification@2x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-iphone-notification@3x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-iphone-settings@2x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-iphone-settings@3x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-iphone-spotlight@2x.png
delete mode 100644 unpackage/cache/wgt/__UNI__4796942/.manifest/icon-iphone-spotlight@3x.png
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 6d38226..8825f66 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -10,12 +10,16 @@
"default" : {
"launchtype" : "local"
},
+ "h5" : {
+ "launchtype" : "local"
+ },
+ "provider" : "alipay",
"type" : "uniCloud"
},
{
"playground" : "custom",
"type" : "uni-app:app-android"
- },
+ },
{
"playground" : "custom",
"type" : "uni-app:app-ios"
diff --git a/App.vue b/App.vue
index e53ebe3..bea28b2 100644
--- a/App.vue
+++ b/App.vue
@@ -8,7 +8,7 @@
})
}else{
uni.redirectTo({
- url:'/pages/networko/index',
+ url:'/pages/networko/index'
})
}
@@ -21,22 +21,10 @@
success:(res)=> {
if(res.networkType==='none') {
uni.redirectTo({
- url: '/pages/networko/index',
- success:()=>{
- plus.navigator.closeSplashscreen()
-
- }
+ url: '/pages/networko/index'
})
- }else{
- uni.redirectTo({
- url:'/pages/index/index',
- success:()=>{
- plus.navigator.closeSplashscreen()
-
- }
- })
- }
+ }
}
})
uni.onNetworkStatusChange(this.networkStatusChange);
diff --git a/config/index.js b/config/index.js
index 5b796e9..d4e7e37 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,4 +1,4 @@
-const env = 'dev';
+const env = 'test';
const configs = {
LocalTest: {
apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
diff --git a/manifest.json b/manifest.json
index b79064f..9f393d0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -19,8 +19,7 @@
/* 模块配置 */
"modules" : {
"Camera" : {},
- "Geolocation" : {},
- "Push" : {}
+ "Geolocation" : {}
},
/* 应用发布信息 */
"distribute" : {
diff --git a/pages.json b/pages.json
index d4e3b8c..50daf09 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,12 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": "uni-app",
+ "navigationStyle": "custom"
+ }
+ },
{
"path" : "pages/networko/index",
"style" :
@@ -8,14 +14,8 @@
"navigationBarTitleText": "uni-app",
"navigationStyle": "custom"
}
- },
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "uni-app",
- "navigationStyle": "custom"
- }
- }
+ }
+
],
"globalStyle": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5466a1b..e182705 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
-
+