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

config/index.js

@@ -1,5 +1,5 @@
-const env =  'prod';
+const env =  'test';
-const configs = {
+const configs = { 
 	LocalTest: {
 	    apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
 	    h5Url:'http://192.168.88.53:8080/#/'
@@ -13,8 +13,8 @@ const configs = {
         h5Url:'http://114.218.158.24:8042/#/'
     },
     prod: {
-        apiBaseUrl: 'https://oa-b.szjixun.cn/api',
+        apiBaseUrl: 'https://oa-a.szjixun.cn/api',
-        h5Url:'https://oa-b.szjixun.cn/#/'
+        h5Url:'https://oa-a.szjixun.cn/#/'
     },
 };
 

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "墨册",
+    "name" : "oa考勤系统",
     "appid" : "__UNI__4796942",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "2.0.2",
-    "versionCode" : 100,
+    "versionCode" : 202,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -19,7 +19,8 @@
         /* 模块配置 */
         "modules" : {
             "Camera" : {},
-            "Geolocation" : {}
+            "Geolocation" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -56,8 +57,7 @@
                     "NSPhotoLibraryUsageDescription" : "我们需要获取访问您设备相册的权限，以便您能够选择并上传图片或视频到我们的应用中。",
                     "NSPhotoLibraryAddUsageDescription" : "我们需要获取写入权限，以便我们能够将您通过应用程序拍摄的照片或视频保存到您的设备相册中。",
                     "NSCameraUsageDescription" : "我们的应用使用摄像头来拍照，以便在进行外勤打卡时确认您的身份和打卡环境，确保打卡数据的真实性和准确性。"
-                },
+                }
-                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -122,13 +122,13 @@
             },
             "splashscreen" : {
                 "useOriginalMsgbox" : true,
-                "androidStyle" : "common",
+                "androidStyle" : "default",
                 "android" : {
                     "hdpi" : "static/image/sy.png",
                     "xhdpi" : "static/image/sy.png",
                     "xxhdpi" : "static/image/sy.png"
                 },
-                "iosStyle" : "common",
+                "iosStyle" : "storyboard",
                 "ios" : {
                     "storyboard" : "files/CustomStoryboard.zip"
                 }

unpackage/cache/certdataios

@@ -1,3 +1,3 @@
-iosProfile=D:/WebstormProjects/oa-base/files/ios/inkbook_dis_20240708.mobileprovision
+iosProfile=D:/WebstormProjects/oa-base/files/ios/oaapp20240709_dis.mobileprovision
 ioscertFile=D:/WebstormProjects/oa-base/files/ios/20230714_dis.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/b87978d0-38da-11ef-862d-698846b5d25e/wgtRoot/__UNI__4796942/"}
+{"dir":"/Users/seaman/srv/bdserver.dcloud.net.cn/service/storage/app/package/IOS/queue/f7da5140-3d11-11ef-8853-c3bd17c45ef5/wgtRoot/__UNI__4796942/"}

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":"墨册","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.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/build/app-plus/manifest.json

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

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

@@ -45,7 +45,7 @@ if (uni.restoreGlobal) {
   };
   const onShow = /* @__PURE__ */ createHook(ON_SHOW);
   const onHide = /* @__PURE__ */ createHook(ON_HIDE);
-  const env = "prod";
+  const env = "test";
   const configs = {
     LocalTest: {
       apiBaseUrl: "https://warehouse.szjixun.cn/oa_backend",
@@ -60,8 +60,8 @@ if (uni.restoreGlobal) {
       h5Url: "http://114.218.158.24:8042/#/"
     },
     prod: {
-      apiBaseUrl: "https://oa-b.szjixun.cn/api",
+      apiBaseUrl: "https://oa-a.szjixun.cn/api",
-      h5Url: "https://oa-b.szjixun.cn/#/"
+      h5Url: "https://oa-a.szjixun.cn/#/"
     }
   };
   const config = configs[env];