From ee45b1339ec1ce18c6baa65a44b543bb385f0bf2 Mon Sep 17 00:00:00 2001 From: Phoenix <64720302+Concur-max@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:53:44 +0800 Subject: [PATCH] first --- config/index.js | 6 +- manifest.json | 35 ++---------- .../dist/dev/app-plus/app-config-service.js | 2 +- unpackage/dist/dev/app-plus/app-service.js | 56 +++---------------- unpackage/dist/dev/app-plus/manifest.json | 33 ++--------- 5 files changed, 22 insertions(+), 110 deletions(-) diff --git a/config/index.js b/config/index.js index 53e47b4..3f150af 100644 --- a/config/index.js +++ b/config/index.js @@ -1,12 +1,12 @@ -const env = 'prod'; +const env = 'test'; const configs = { dev: { apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend', - h5Url: 'http://192.168.0.191:8080/#/' + h5Url: 'http://192.168.88.49:8080/#/' }, test: { apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend', - h5Url: 'http://114.218.158.24:9051/#/' + h5Url: 'http://114.218.158.24:8042/#/' }, prod: { apiBaseUrl: 'https://oa-a.szjixun.cn/#/', diff --git a/manifest.json b/manifest.json index 2f7ae3b..a494a08 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "oa考勤系统", + "name" : "泰丰考勤", "appid" : "__UNI__4796942", "description" : "", - "versionName" : "1.1.7", - "versionCode" : 117, + "versionName" : "1.0.0", + "versionCode" : 100, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -25,8 +25,7 @@ /* 模块配置 */ "modules" : { "Camera" : {}, - "Geolocation" : {}, - "Push" : {} + "Geolocation" : {} }, /* 应用发布信息 */ "distribute" : { @@ -84,14 +83,7 @@ "UniversalLinks" : "" } }, - "push" : { - "unipush" : { - "version" : "2", - "offline" : true, - "hms" : {}, - "vivo" : {} - } - } + "push" : {} }, "icons" : { "android" : { @@ -129,22 +121,7 @@ "useOriginalMsgbox" : true } }, - "nativePlugins" : { - "KJ-WebView" : { - "__plugin_info__" : { - "name" : "官方WebView全能扩展、支持plus、vue、nvue里的WebView - [试用版，仅用于自定义调试基座]", - "description" : "WebView与原生双向通信交互、传值、js注入、设置获取UserAgent(桌面网站)、原生侧滑返回 、媒体播放自动播放、请试用合适再购买、请试用合适再购买、请试用合适再购买", - "platforms" : "Android,iOS", - "url" : "https://ext.dcloud.net.cn/plugin?id=9832", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : true, - "bought" : 0, - "pid" : "9832", - "parameters" : {} - } - } - } + "nativePlugins" : {} }, /* 快应用特有相关 */ "quickapp" : {}, diff --git a/unpackage/dist/dev/app-plus/app-config-service.js b/unpackage/dist/dev/app-plus/app-config-service.js index d9e2c2d..dd69d50 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":{"navigationBar":{},"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":{"navigationBar":{},"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,"titleNView":false,"navigationBar":{"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()})}}); diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index e385c3f..638857c 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -49,15 +49,15 @@ if (uni.restoreGlobal) { const onHide = /* @__PURE__ */ createHook(ON_HIDE); const onLaunch = /* @__PURE__ */ createHook(ON_LAUNCH); const onLoad = /* @__PURE__ */ createHook(ON_LOAD); - const env = "prod"; + const env = "test"; const configs = { dev: { apiBaseUrl: "https://warehouse.szjixun.cn/oa_backend", - h5Url: "http://192.168.0.191:8080/#/" + h5Url: "http://192.168.88.49:8080/#/" }, test: { apiBaseUrl: "https://warehouse.szjixun.cn/oa_backend", - h5Url: "http://114.218.158.24:9051/#/" + h5Url: "http://114.218.158.24:8042/#/" }, prod: { apiBaseUrl: "https://oa-a.szjixun.cn/#/", @@ -106,7 +106,7 @@ if (uni.restoreGlobal) { const m2 = receiveWebView(e2); switch (m2.action) { case "load-complete": { - const currentWebview = getCurrentPages().at(-1).$getAppWebview(); + const currentWebview = getCurrentPages().pop().$getAppWebview(); webViewObj.value = currentWebview.children()[0]; let statusBarHeight = uni.getSystemInfoSync().statusBarHeight; webViewObj.value.setStyle({ @@ -122,16 +122,11 @@ if (uni.restoreGlobal) { geocode: false, isHighAccuracy: false, success: async (res) => { - const jsonString = JSON.stringify({ - ...res, - systemInfo, - "latitude": 31.386561, - "longitude": 120.660274 - }); + const jsonString = JSON.stringify({ ...res, systemInfo }); webViewObj.value.evalJS(`window.onReceive(${jsonString})`); }, fail: (e3) => { - formatAppLog("log", "at pages/index/index.vue:112", e3); + formatAppLog("log", "at pages/index/index.vue:111", e3); } }); } @@ -151,43 +146,6 @@ if (uni.restoreGlobal) { }; const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/WebstormProjects/oa-base/pages/index/index.vue"]]); __definePage("pages/index/index", PagesIndexIndex); - function initPushNotification() { - if (typeof plus !== "undefined" && plus.push) { - plus.globalEvent.addEventListener("newPath", ({ path }) => { - 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({ - type: "enabled", - offline: true - }); - Promise.resolve().then(() => { - initPushNotification(); - plus.push.setAutoNotification && plus.push.setAutoNotification(false); - }); const _sfc_main = { __name: "App", setup(__props) { @@ -521,7 +479,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), P = b, T = I('{\n "address": [\n "127.0.0.1",\n "192.168.56.1",\n "172.20.10.6"\n ],\n "debugPort": 9000,\n "initialLaunchType": "local",\n "servePort": 7000,\n "skipFiles": [\n "/**",\n "C:/Users/37363/Downloads/HBuilderX.4.08.2024040127/HBuilderX/plugins/unicloud/**/*.js"\n ]\n}\n'), C = I('[{"provider":"aliyun","spaceName":"oabase","spaceId":"mp-edf38b0d-bc9a-4e81-9a15-f55995ccca70","clientSecret":"ty1X79FB2pMuAQUzaQBKXA==","endpoint":"https://api.next.bspapp.com"}]') || []; + const S = true, b = "app", A = I(define_process_env_UNI_SECURE_NETWORK_CONFIG_default), P = b, T = I('{\n "address": [\n "127.0.0.1",\n "192.168.56.1",\n "192.168.88.23"\n ],\n "debugPort": 9000,\n "initialLaunchType": "local",\n "servePort": 7000,\n "skipFiles": [\n "/**",\n "C:/Users/37363/Downloads/HBuilderX.4.08.2024040127/HBuilderX/plugins/unicloud/**/*.js"\n ]\n}\n'), C = I('[{"provider":"aliyun","spaceName":"oabase","spaceId":"mp-edf38b0d-bc9a-4e81-9a15-f55995ccca70","clientSecret":"ty1X79FB2pMuAQUzaQBKXA==","endpoint":"https://api.next.bspapp.com"}]') || []; let O = ""; try { O = "__UNI__4796942"; diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json index 1b02d77..5bbe35b 100644 --- a/unpackage/dist/dev/app-plus/manifest.json +++ b/unpackage/dist/dev/app-plus/manifest.json @@ -5,10 +5,10 @@ "iPad" ], "id": "__UNI__4796942", - "name": "oa考勤系统", + "name": "泰丰考勤", "version": { - "name": "1.1.7", - "code": 117 + "name": "1.0.0", + "code": 100 }, "description": "", "developer": { @@ -19,7 +19,6 @@ "permissions": { "Camera": {}, "Geolocation": {}, - "Push": {}, "UniNView": { "description": "UniNView原生渲染" } @@ -148,14 +147,7 @@ "UniversalLinks": "" } }, - "push": { - "unipush": { - "version": "2", - "offline": true, - "hms": {}, - "vivo": {} - } - }, + "push": {}, "audio": { "mp3": { "description": "Android平台录音支持MP3格式文件" @@ -163,22 +155,7 @@ } } }, - "nativePlugins": { - "KJ-WebView": { - "__plugin_info__": { - "name": "官方WebView全能扩展、支持plus、vue、nvue里的WebView - [试用版，仅用于自定义调试基座]", - "description": "WebView与原生双向通信交互、传值、js注入、设置获取UserAgent(桌面网站)、原生侧滑返回 、媒体播放自动播放、请试用合适再购买、请试用合适再购买、请试用合适再购买", - "platforms": "Android,iOS", - "url": "https://ext.dcloud.net.cn/plugin?id=9832", - "android_package_name": "", - "ios_bundle_id": "", - "isCloud": true, - "bought": 0, - "pid": "9832", - "parameters": {} - } - } - }, + "nativePlugins": {}, "uniStatistics": { "enable": false },