diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 9b0d791..472ec0d 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -13,8 +13,12 @@ "type" : "uniCloud" }, { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" + }, + { + "playground" : "custom", + "type" : "uni-app:app-ios" } ] } diff --git a/common/updown/20230714_dev.p12 b/common/updown/20230714_dev.p12 index e69de29..5c0040d 100644 Binary files a/common/updown/20230714_dev.p12 and b/common/updown/20230714_dev.p12 differ diff --git a/common/updown/20230714_dis.p12 b/common/updown/20230714_dis.p12 index e69de29..1ec9556 100644 Binary files a/common/updown/20230714_dis.p12 and b/common/updown/20230714_dis.p12 differ diff --git a/common/updown/oa-app.keystore b/common/updown/oa-app.keystore index e69de29..313cc1e 100644 Binary files a/common/updown/oa-app.keystore and b/common/updown/oa-app.keystore differ diff --git a/common/updown/oa_dev_20240104.mobileprovision b/common/updown/oa_dev_20240104.mobileprovision index e69de29..1d15cfa 100644 Binary files a/common/updown/oa_dev_20240104.mobileprovision and b/common/updown/oa_dev_20240104.mobileprovision differ diff --git a/common/updown/oa_dis_20231130.mobileprovision b/common/updown/oa_dis_20231130.mobileprovision index e69de29..d03ffb1 100644 Binary files a/common/updown/oa_dis_20231130.mobileprovision and b/common/updown/oa_dis_20231130.mobileprovision differ diff --git a/pages.json b/pages.json index c3d24c7..aaf60c2 100644 --- a/pages.json +++ b/pages.json @@ -8,7 +8,7 @@ } } ], - "globalStyle": { + "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", "navigationBarBackgroundColor": "#F8F8F8", diff --git a/unpackage/dist/build/app-plus/app-service.js b/unpackage/dist/build/app-plus/app-service.js index 9935bc8..472ff2e 100644 --- a/unpackage/dist/build/app-plus/app-service.js +++ b/unpackage/dist/build/app-plus/app-service.js @@ -1 +1 @@ -if("undefined"==typeof Promise||Promise.prototype.finally||(Promise.prototype.finally=function(n){const r=this.constructor;return this.then((e=>r.resolve(n()).then((()=>e))),(e=>r.resolve(n()).then((()=>{throw e}))))}),"undefined"!=typeof uni&&uni&&uni.requireGlobal){const n=uni.requireGlobal();ArrayBuffer=n.ArrayBuffer,Int8Array=n.Int8Array,Uint8Array=n.Uint8Array,Uint8ClampedArray=n.Uint8ClampedArray,Int16Array=n.Int16Array,Uint16Array=n.Uint16Array,Int32Array=n.Int32Array,Uint32Array=n.Uint32Array,Float32Array=n.Float32Array,Float64Array=n.Float64Array,BigInt64Array=n.BigInt64Array,BigUint64Array=n.BigUint64Array}uni.restoreGlobal&&uni.restoreGlobal(Vue,weex,plus,setTimeout,clearTimeout,setInterval,clearInterval),function(n){"use strict";function r(n,r,...e){uni.__log__?uni.__log__(n,r,...e):console[n].apply(console,[...e,r])}const e={onLaunch:function(){const n=uni.createRequestPermissionListener();n.onRequest((n=>{})),n.onConfirm((n=>{uni.showToast({icon:"none",title:"已开启通知",duration:5e3})})),n.onComplete((n=>{})),r("log","at App.vue:17","App Launch")},onShow:function(){r("log","at App.vue:20","App Show")},onHide:function(){r("log","at App.vue:23","App Hide")}};const{app:t,Vuex:o,Pinia:i}={app:n.createVueApp(e)};uni.Vuex=o,uni.Pinia=i,t.provide("__globalStyles",__uniConfig.styles),t._component.mpType="app",t._component.render=()=>{},t.mount("#app")}(Vue); +if("undefined"==typeof Promise||Promise.prototype.finally||(Promise.prototype.finally=function(r){const n=this.constructor;return this.then((t=>n.resolve(r()).then((()=>t))),(t=>n.resolve(r()).then((()=>{throw t}))))}),"undefined"!=typeof uni&&uni&&uni.requireGlobal){const r=uni.requireGlobal();ArrayBuffer=r.ArrayBuffer,Int8Array=r.Int8Array,Uint8Array=r.Uint8Array,Uint8ClampedArray=r.Uint8ClampedArray,Int16Array=r.Int16Array,Uint16Array=r.Uint16Array,Int32Array=r.Int32Array,Uint32Array=r.Uint32Array,Float32Array=r.Float32Array,Float64Array=r.Float64Array,BigInt64Array=r.BigInt64Array,BigUint64Array=r.BigUint64Array}uni.restoreGlobal&&uni.restoreGlobal(Vue,weex,plus,setTimeout,clearTimeout,setInterval,clearInterval),function(r){"use strict";function n(r,n,...t){uni.__log__?uni.__log__(r,n,...t):console[r].apply(console,[...t,n])}const t={onLaunch:function(){},onShow:function(){n("log","at App.vue:6","App Show")},onHide:function(){n("log","at App.vue:9","App Hide")}};const{app:e,Vuex:o,Pinia:i}={app:r.createVueApp(t)};uni.Vuex=o,uni.Pinia=i,e.provide("__globalStyles",__uniConfig.styles),e._component.mpType="app",e._component.render=()=>{},e.mount("#app")}(Vue); diff --git a/unpackage/dist/dev/app-plus/app-config-service.js b/unpackage/dist/dev/app-plus/app-config-service.js index c3841d2..916c8c8 100644 --- a/unpackage/dist/dev/app-plus/app-config-service.js +++ b/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-base","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.08","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.08","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":true}}].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()})}}); diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index 016807d..fa06846 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -47,25 +47,12 @@ if (uni.restoreGlobal) { }; const _sfc_main = { onLaunch: function() { - const permissionListener = uni.createRequestPermissionListener(); - permissionListener.onRequest((e) => { - }); - permissionListener.onConfirm((e) => { - uni.showToast({ - icon: "none", - title: "已开启通知", - duration: 5e3 - }); - }); - permissionListener.onComplete((e) => { - }); - formatAppLog("log", "at App.vue:17", "App Launch"); }, onShow: function() { - formatAppLog("log", "at App.vue:20", "App Show"); + formatAppLog("log", "at App.vue:6", "App Show"); }, onHide: function() { - formatAppLog("log", "at App.vue:23", "App Hide"); + formatAppLog("log", "at App.vue:9", "App Hide"); } }; const App = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/WebstormProjects/oa-base/App.vue"]]); diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json index 2e5a6f6..15d778d 100644 --- a/unpackage/dist/dev/app-plus/manifest.json +++ b/unpackage/dist/dev/app-plus/manifest.json @@ -4,11 +4,11 @@ "iPhone", "iPad" ], - "id": "__UNI__4796942", - "name": "oa-base", + "id": "__UNI__70C49A3", + "name": "oa考勤系统", "version": { - "name": "1.0.0", - "code": "100" + "name": "1.1.5", + "code": 115 }, "description": "", "developer": { @@ -17,6 +17,8 @@ "url": "" }, "permissions": { + "Camera": {}, + "Geolocation": {}, "UniNView": { "description": "UniNView原生渲染" } @@ -45,6 +47,41 @@ "nvueStyleCompiler": "uni-app", "compilerVersion": 3, "distribute": { + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + }, + "splashscreen": { + "useOriginalMsgbox": true + }, "google": { "permissions": [ "", @@ -61,14 +98,50 @@ "", "", "", - "" - ] + "", + "", + "" + ], + "abiFilters": [ + "armeabi-v7a", + "arm64-v8a" + ], + "autoSdkPermissions": false, + "targetSdkVersion": 33 }, "apple": { - "dSYMs": false + "dSYMs": false, + "privacyDescription": { + "NSLocationWhenInUseUsageDescription": "我们的应用需要在您进行考勤打卡时获取位置信息，以确保打卡记录的准确性和验证打卡地点。", + "NSPhotoLibraryUsageDescription": "我们需要获取访问您设备相册的权限，以便您能够选择并上传图片或视频到我们的应用中。", + "NSPhotoLibraryAddUsageDescription": "我们需要获取写入权限，以便我们能够将您通过应用程序拍摄的照片或视频保存到您的设备相册中。", + "NSCameraUsageDescription": "我们的应用使用摄像头来拍照，以便在进行外勤打卡时确认您的身份和打卡环境，确保打卡数据的真实性和准确性。" + } }, "plugins": { + "geolocation": { + "system": { + "__platform__": [ + "ios", + "android" + ] + }, + "baidu": { + "__platform__": [ + "ios", + "android" + ], + "appkey_ios": "5zzMAq3ofL5H5KfxRcf0zDMLTimvGIb0", + "appkey_android": "ahdcPcBfatf61zRAgNl9SpBGUEURsnXN" + } + }, "ad": {}, + "share": { + "weixin": { + "appid": "", + "UniversalLinks": "" + } + }, "audio": { "mp3": { "description": "Android平台录音支持MP3格式文件"