1123

App.vue

@@ -8,7 +8,7 @@
 		})
 	}else{
 		uni.redirectTo({
-			url:'/pages/networko/index'
+			url:'/pages/networko/index',
 		})
 	}
 
@@ -21,10 +21,22 @@
 				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 =  'prod';
+const env =  'dev';
 const configs = {
 	LocalTest: {
 	    apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
@@ -13,8 +13,8 @@ const configs = {
         h5Url:'http://114.218.158.24:8042/#/'
     },
     prod: {
-        apiBaseUrl: 'https://oa-b.szjixun.cn/api',
-        h5Url:'https://oa-b.szjixun.cn/#/'
+        apiBaseUrl: 'https://oa-a.szjixun.cn/api',
+        h5Url:'https://oa-a.szjixun.cn/#/'
     },
 };
 

pages.json

@@ -1,12 +1,6 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-				"path": "pages/index/index",
-				"style": {
-					"navigationBarTitleText": "uni-app",
-					"navigationStyle": "custom"
-				}
-			},
+	
 			{
 				"path" : "pages/networko/index",
 				"style" :
@@ -14,7 +8,14 @@
 					"navigationBarTitleText": "uni-app",
 					"navigationStyle": "custom"
 				}
-			}
+			},
+			{
+					"path": "pages/index/index",
+					"style": {
+						"navigationBarTitleText": "uni-app",
+						"navigationStyle": "custom"
+					}
+				}
 
 	],
 	"globalStyle": {

unpackage/cache/certdataios

@@ -1,3 +1,3 @@
-iosProfile=D:/WebstormProjects/oa-base/files/ios/oaapp20240709_dis.mobileprovision
-ioscertFile=D:/WebstormProjects/oa-base/files/ios/20230714_dis.p12
+iosProfile=D:/WebstormProjects/oa-base/files/ios/oa_dev_20240516.mobileprovision
+ioscertFile=D:/WebstormProjects/oa-base/files/ios/20230714_dev.p12
 ioscertPassword=uecGPNMV8s+KLcdEgW/MRg==

unpackage/cache/uts_custom_ios/app-ios-debug.json

@@ -1 +1 @@
-{"dir":"/Users/seaman/srv/bdserver.dcloud.net.cn/service/storage/app/package/IOS/queue/6d4c72f0-3ddd-11ef-9f63-79c2a8bb44e9/wgtRoot/__UNI__4796942/"}
+{"dir":"/Users/seaman/srv/bdserver.dcloud.net.cn/service/storage/app/package/IOS/queue/c4575c00-4029-11ef-8567-3d311656bb68/wgtRoot/__UNI__4796942/"}

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

@@ -1,7 +1,7 @@
 
   ;(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.15","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/index/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));
   __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()})}});

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

@@ -1,7 +1,7 @@
 
   ;(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.15","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/index/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));
   __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()})}});

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

@@ -78,6 +78,10 @@
         }
       },
       "splashscreen": {
+        "delay": 0,
+        "autoclose": false,
+        "alwaysShowBeforeRender": false,
+        "waiting": false,
         "useOriginalMsgbox": true,
         "androidStyle": "common",
         "android": {
@@ -178,7 +182,7 @@
     "uni-app": {
       "control": "uni-v3",
       "vueVersion": "3",
-      "compilerVersion": "4.15",
+      "compilerVersion": "4.23",
       "nvueCompiler": "uni-app",
       "renderer": "auto",
       "nvue": {

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.15","entryPagePath":"pages/index/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 __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/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/dev/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__4796942",
   "name": "oa考勤系统",
   "version": {
-    "name": "2.0.1",
-    "code": 201
+    "name": "2.0.3",
+    "code": 203
   },
   "description": "",
   "developer": {
@@ -178,7 +178,7 @@
     "uni-app": {
       "control": "uni-v3",
       "vueVersion": "3",
-      "compilerVersion": "4.15",
+      "compilerVersion": "4.23",
       "nvueCompiler": "uni-app",
       "renderer": "auto",
       "nvue": {