1123

.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"

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',
+              url: '/pages/networko/index'
-              success:()=>{
-             plus.navigator.closeSplashscreen()
-
-              }
             })
 
-          }else{
+          }
-			  uni.redirectTo({
-			  	url:'/pages/index/index',
-				success:()=>{
-				plus.navigator.closeSplashscreen()
-				
-				 }
-			  })
-		  }
 				}
 			})
 		  uni.onNetworkStatusChange(this.networkStatusChange);

config/index.js

@@ -1,4 +1,4 @@
-const env =  'dev';
+const env =  'test';
 const configs = {
 	LocalTest: {
 	    apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',

manifest.json

@@ -19,8 +19,7 @@
         /* 模块配置 */
         "modules" : {
             "Camera" : {},
-            "Geolocation" : {},
+            "Geolocation" : {}
-            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

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": {

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 
 		 <web-view class="webview"    @message="webLoad" style="flex: 1;" ref="webViewRef" :src="config.h5Url"></web-view>
-		<uvNoNetwork></uvNoNetwork>
+	
 </template>
 <script setup>
 	import uvNoNetwork from "../../uni_modules/uv-no-network/components/uv-no-network/uv-no-network.vue";

unpackage/cache/wgt/__UNI__4796942/app-config-service.js

@@ -1,8 +1,8 @@
 
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
-  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"oa考勤系统","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.23","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
+  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"oa考勤系统","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.23","entryPagePath":"pages/networko/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
-  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/networko/index","meta":{"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  const __uniRoutes = [{"path":"pages/networko/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/index/index","meta":{"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
   __uniConfig.styles=[];//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/build/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
-  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"oa考勤系统","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.23","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
+  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"oa考勤系统","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.23","entryPagePath":"pages/networko/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
-  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/networko/index","meta":{"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  const __uniRoutes = [{"path":"pages/networko/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/index/index","meta":{"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
   __uniConfig.styles=[];//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/build/app-plus/manifest.json

@@ -19,7 +19,6 @@
   "permissions": {
     "Camera": {},
     "Geolocation": {},
-    "Push": {},
     "UniNView": {
       "description": "UniNView原生渲染"
     }
@@ -78,10 +77,6 @@
         }
       },
       "splashscreen": {
-        "delay": 0,
-        "autoclose": false,
-        "alwaysShowBeforeRender": false,
-        "waiting": false,
         "useOriginalMsgbox": true,
         "androidStyle": "common",
         "android": {

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,8 +1,8 @@
 {
-  "hash": "fd84dcc1",
+  "hash": "e0e2c014",
-  "configHash": "8979c8e1",
+  "configHash": "4fbbe434",
   "lockfileHash": "e3b0c442",
-  "browserHash": "4c910bc0",
+  "browserHash": "93a68ddf",
   "optimized": {},
   "chunks": {}
 }

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
-  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"oa考勤系统","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.23","entryPagePath":"pages/networko/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
+  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"oa考勤系统","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.23","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
-  const __uniRoutes = [{"path":"pages/networko/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/index/index","meta":{"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/networko/index","meta":{"navigationBar":{"titleText":"uni-app","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
   __uniConfig.styles=[];//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/dev/app-plus/app-service.js

@@ -2698,16 +2698,7 @@ if (uni.restoreGlobal) {
     }, 8, ["show", "zIndex", "onTouchmove"]);
   }
   const uvNoNetwork = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render], ["__scopeId", "data-v-bffa4de5"], ["__file", "D:/WebstormProjects/oa-base/uni_modules/uv-no-network/components/uv-no-network/uv-no-network.vue"]]);
-  const _sfc_main$2 = {
+  const env = "test";
-    __name: "index",
-    setup(__props) {
-      return (_ctx, _cache) => {
-        return vue.openBlock(), vue.createBlock(uvNoNetwork);
-      };
-    }
-  };
-  const PagesNetworkoIndex = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/WebstormProjects/oa-base/pages/networko/index.vue"]]);
-  const env = "dev";
   const configs = {
     LocalTest: {
       apiBaseUrl: "https://warehouse.szjixun.cn/oa_backend",
@@ -2727,7 +2718,7 @@ if (uni.restoreGlobal) {
     }
   };
   const config = configs[env];
-  const _sfc_main$1 = {
+  const _sfc_main$2 = {
     __name: "index",
     setup(__props) {
       const webViewObj = vue.ref(null);
@@ -2747,65 +2738,28 @@ if (uni.restoreGlobal) {
         }
       };
       return (_ctx, _cache) => {
-        return vue.openBlock(), vue.createElementBlock(
+        return vue.openBlock(), vue.createElementBlock("web-view", {
-          vue.Fragment,
+          class: "webview",
-          null,
+          onMessage: webLoad,
-          [
+          style: { "flex": "1" },
-            vue.createElementVNode("web-view", {
+          ref: "webViewRef",
-              class: "webview",
+          src: vue.unref(config).h5Url
-              onMessage: webLoad,
+        }, null, 40, ["src"]);
-              style: { "flex": "1" },
-              ref: "webViewRef",
-              src: vue.unref(config).h5Url
-            }, null, 40, ["src"]),
-            vue.createVNode(uvNoNetwork)
-          ],
-          64
-          /* STABLE_FRAGMENT */
-        );
       };
     }
   };
-  const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/WebstormProjects/oa-base/pages/index/index.vue"]]);
+  const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/WebstormProjects/oa-base/pages/index/index.vue"]]);
-  __definePage("pages/networko/index", PagesNetworkoIndex);
+  const _sfc_main$1 = {
-  __definePage("pages/index/index", PagesIndexIndex);
+    __name: "index",
-  function initPushNotification() {
+    setup(__props) {
-    if (typeof plus !== "undefined" && plus.push) {
+      return (_ctx, _cache) => {
-      plus.globalEvent.addEventListener("newPath", ({ path }) => {
+        return vue.openBlock(), vue.createBlock(uvNoNetwork);
-        if (!path) {
+      };
-          return;
-        }
-        const pages2 = getCurrentPages();
-        const currentPage = pages2[pages2.length - 1];
-        if (currentPage && currentPage.$page && currentPage.$page.fullPath === path) {
-          return;
-        }
-        uni.navigateTo({
-          url: path,
-          fail(res) {
-            if (res.errMsg.indexOf("tabbar") > -1) {
-              uni.switchTab({
-                url: path,
-                fail(res2) {
-                  console.error(res2.errMsg);
-                }
-              });
-            } else {
-              console.error(res.errMsg);
-            }
-          }
-        });
-      });
     }
-  }
+  };
-  uni.invokePushCallback({
+  const PagesNetworkoIndex = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/WebstormProjects/oa-base/pages/networko/index.vue"]]);
-    type: "enabled",
+  __definePage("pages/index/index", PagesIndexIndex);
-    offline: true
+  __definePage("pages/networko/index", PagesNetworkoIndex);
-  });
-  Promise.resolve().then(() => {
-    initPushNotification();
-    plus.push.setAutoNotification && plus.push.setAutoNotification(false);
-  });
   const _sfc_main = {
     methods: {
       networkStatusChange(res) {
@@ -2827,17 +2781,7 @@ if (uni.restoreGlobal) {
         success: (res) => {
           if (res.networkType === "none") {
             uni.redirectTo({
-              url: "/pages/networko/index",
+              url: "/pages/networko/index"
-              success: () => {
-                plus.navigator.closeSplashscreen();
-              }
-            });
-          } else {
-            uni.redirectTo({
-              url: "/pages/index/index",
-              success: () => {
-                plus.navigator.closeSplashscreen();
-              }
             });
           }
         }
@@ -2851,14 +2795,14 @@ if (uni.restoreGlobal) {
   const App = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/WebstormProjects/oa-base/App.vue"]]);
   const pages = [
     {
-      path: "pages/networko/index",
+      path: "pages/index/index",
       style: {
         navigationBarTitleText: "uni-app",
         navigationStyle: "custom"
       }
     },
     {
-      path: "pages/index/index",
+      path: "pages/networko/index",
       style: {
         navigationBarTitleText: "uni-app",
         navigationStyle: "custom"
@@ -3166,7 +3110,7 @@ if (uni.restoreGlobal) {
   function I(e2) {
     return e2 && "string" == typeof e2 ? JSON.parse(e2) : e2;
   }
-  const S = true, b = "app", A = I(define_process_env_UNI_SECURE_NETWORK_CONFIG_default), C = b, P = I('{\n    "address": [\n        "127.0.0.1",\n        "192.168.56.1",\n        "192.168.88.50"\n    ],\n    "debugPort": 9002,\n    "initialLaunchType": "local",\n    "servePort": 7002,\n    "skipFiles": [\n        "<node_internals>/**",\n        "C:/Users/37363/Downloads/HBuilderX.4.08.2024040127/HBuilderX/plugins/unicloud/**/*.js"\n    ]\n}\n'), T = I('[{"provider":"alipay","spaceName":"oaapp","spaceId":"env-00jxgxphla18","spaceAppId":"2021004145628977","accessKey":"ZALus7EgJXdovISb","secretKey":"7qzvVrPN0mAxfcLr"}]') || [];
+  const S = true, b = "app", A = I(define_process_env_UNI_SECURE_NETWORK_CONFIG_default), C = b, P = I('{\n    "address": [\n        "127.0.0.1",\n        "192.168.56.1",\n        "192.168.88.61"\n    ],\n    "debugPort": 9001,\n    "initialLaunchType": "local",\n    "servePort": 7001,\n    "skipFiles": [\n        "<node_internals>/**",\n        "C:/Users/37363/Downloads/HBuilderX.4.08.2024040127/HBuilderX/plugins/unicloud/**/*.js"\n    ]\n}\n'), T = I('[{"provider":"alipay","spaceName":"oaapp","spaceId":"env-00jxgxphla18","spaceAppId":"2021004145628977","accessKey":"ZALus7EgJXdovISb","secretKey":"7qzvVrPN0mAxfcLr"}]') || [];
   let O = "";
   try {
     O = "__UNI__4796942";

unpackage/dist/dev/app-plus/manifest.json

@@ -19,7 +19,6 @@
   "permissions": {
     "Camera": {},
     "Geolocation": {},
-    "Push": {},
     "UniNView": {
       "description": "UniNView原生渲染"
     }