Merge branch 'master' into outside-the-system

# Conflicts:
#	config/index.js
#	files/ios/inkbook_dev_20240708.mobileprovision
#	manifest.json
#	unpackage/cache/certdataios
#	unpackage/dist/build/app-plus/app-config-service.js
#	unpackage/dist/build/app-plus/app-service.js
#	unpackage/dist/build/app-plus/manifest.json
#	unpackage/dist/dev/app-plus/app-service.js

unpackage/cache/appleConfig.ini

@@ -1,11 +1,11 @@
 [appleAppid]
-appleAppid=com.fonchain.attendance
+appleAppid=com.fonchain.inkbook
 
 [appstore]
 appstore=70695af7d1a0be20d1ba633bf98ec76e
 
 [iosStyle]
-iosStyle=storyboard
+iosStyle=common
 
 [universalLinks]
 universalLinks=

unpackage/dist/dev/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":"墨册","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}}].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/dev/app-plus/manifest.json

@@ -5,10 +5,10 @@
     "iPad"
   ],
   "id": "__UNI__4796942",
-  "name": "OA系统",
+  "name": "墨册",
   "version": {
-    "name": "2.0.1",
-    "code": 201
+    "name": "1.0.0",
+    "code": 100
   },
   "description": "",
   "developer": {
@@ -19,7 +19,6 @@
   "permissions": {
     "Camera": {},
     "Geolocation": {},
-    "Push": {},
     "UniNView": {
       "description": "UniNView原生渲染"
     }
@@ -79,13 +78,13 @@
       },
       "splashscreen": {
         "useOriginalMsgbox": true,
-        "androidStyle": "default",
+        "androidStyle": "common",
         "android": {
           "hdpi": "static/image/sy.png",
           "xhdpi": "static/image/sy.png",
           "xxhdpi": "static/image/sy.png"
         },
-        "iosStyle": "storyboard",
+        "iosStyle": "common",
         "ios": {
           "storyboard": "files/CustomStoryboard.zip"
         }