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 @@