From c2ba2ba8836c16fb6447c53ef4903be9f707a071 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Fri, 27 Jun 2025 08:29:15 +0800 Subject: [PATCH] 2.1.0 20250627 --- env/.env.production | 7 +- manifest.config.ts | 4 +- src/manifest.json | 285 +++++++++++++++++++------------------- src/pages/login/login.vue | 4 +- 4 files changed, 152 insertions(+), 148 deletions(-) diff --git a/env/.env.production b/env/.env.production index 2a443e5..2984c4d 100644 --- a/env/.env.production +++ b/env/.env.production @@ -7,7 +7,10 @@ VITE_SHOW_SOURCEMAP = false # 是否启用读取配置文件 min #VITE_WEBAPP = 'D://opt//AppUpdateTest' VITE_WEBAPP = '' -#VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' +VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' + + + + #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/wwapi' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/yjapi' -VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' \ No newline at end of file diff --git a/manifest.config.ts b/manifest.config.ts index f2be00d..2a74033 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -17,8 +17,8 @@ export default defineManifestConfig({ name: VITE_APP_TITLE, appid: VITE_UNI_APPID, description: '', - versionName: '2.0.3', - versionCode: '20250620', + versionName: '2.1.0', + versionCode: '20250627', transformPx: false, locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' /* 5+App特有相关 */ diff --git a/src/manifest.json b/src/manifest.json index 3728d86..6d3cf2a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,148 +1,149 @@ { - "name" : "数智产销", - "appid" : "__UNI__9F097F0", - "description" : "", - "versionName" : "2.0.3", - "versionCode" : "20250620", - "transformPx" : false, - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - "modules" : { - "Maps" : {}, - "Messaging" : {}, - "Camera" : {} - }, - "distribute" : { - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "minSdkVersion" : 26, - "targetSdkVersion" : 30, - "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ] - }, - "ios" : { - "dSYMs" : false - }, - "sdkConfigs" : { - "maps" : { - "amap" : { - "name" : "amap_15931993294Bqxlq8EgG", - "appkey_ios" : "c913e46ffdf548ebc56ac1cf4d883e7e", - "appkey_android" : "c913e46ffdf548ebc56ac1cf4d883e7e" - } - } - }, - "icons" : { - "android" : { - "hdpi" : "src/static/app/icons/72x72.png", - "xhdpi" : "src/static/app/icons/96x96.png", - "xxhdpi" : "src/static/app/icons/144x144.png", - "xxxhdpi" : "src/static/app/icons/192x192.png" - }, - "ios" : { - "appstore" : "src/static/app/icons/1024x1024.png", - "ipad" : { - "app" : "src/static/app/icons/76x76.png", - "app@2x" : "src/static/app/icons/152x152.png", - "notification" : "src/static/app/icons/20x20.png", - "notification@2x" : "src/static/app/icons/40x40.png", - "proapp@2x" : "src/static/app/icons/167x167.png", - "settings" : "src/static/app/icons/29x29.png", - "settings@2x" : "src/static/app/icons/58x58.png", - "spotlight" : "src/static/app/icons/40x40.png", - "spotlight@2x" : "src/static/app/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "src/static/app/icons/120x120.png", - "app@3x" : "src/static/app/icons/180x180.png", - "notification@2x" : "src/static/app/icons/40x40.png", - "notification@3x" : "src/static/app/icons/60x60.png", - "settings@2x" : "src/static/app/icons/58x58.png", - "settings@3x" : "src/static/app/icons/87x87.png", - "spotlight@2x" : "src/static/app/icons/80x80.png", - "spotlight@3x" : "src/static/app/icons/120x120.png" - } - } - } - }, - "android" : { - "webView" : { - "domStorageEnabled" : true, - "databaseEnabled" : true, - "allowFileAccess" : true - } - }, - "compatible" : { - "ignoreVersion" : true - }, - "webview" : { - "debug" : true, - "crossDomain" : true + "name": "数智产销", + "appid": "__UNI__9F097F0", + "description": "", + "versionName": "2.1.0", + "versionCode": "20250627", + "transformPx": false, + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + "modules": { + "Maps": {}, + "Messaging": {}, + "Camera": {} + }, + "distribute": { + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "minSdkVersion": 26, + "targetSdkVersion": 30, + "abiFilters": [ + "armeabi-v7a", + "arm64-v8a" + ] + }, + "ios": {}, + "sdkConfigs": { + "maps": { + "amap": { + "name": "amap_15931993294Bqxlq8EgG", + "appkey_ios": "c913e46ffdf548ebc56ac1cf4d883e7e", + "appkey_android": "c913e46ffdf548ebc56ac1cf4d883e7e" + } } - }, - "quickapp" : {}, - "mp-weixin" : { - "appid" : "wx8e287639924edb51", - "setting" : { - "urlCheck" : false, - "minified" : true + }, + "icons": { + "android": { + "hdpi": "src/static/app/icons/72x72.png", + "xhdpi": "src/static/app/icons/96x96.png", + "xxhdpi": "src/static/app/icons/144x144.png", + "xxxhdpi": "src/static/app/icons/192x192.png" }, - "usingComponents" : true - }, - "mp-alipay" : { - "usingComponents" : true, - "styleIsolation" : "shared" - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "3", - "h5" : { - "router" : { - "base" : "/" - }, - "sdkConfigs" : { - "maps" : { - "amap" : { - "key" : "21f194a0d33197f874f7bbdd198419be", - "securityJsCode" : "a46b425f31a4de445b2966d998fba851", - "serviceHost" : "" - } - } + "ios": { + "appstore": "src/static/app/icons/1024x1024.png", + "ipad": { + "app": "src/static/app/icons/76x76.png", + "app@2x": "src/static/app/icons/152x152.png", + "notification": "src/static/app/icons/20x20.png", + "notification@2x": "src/static/app/icons/40x40.png", + "proapp@2x": "src/static/app/icons/167x167.png", + "settings": "src/static/app/icons/29x29.png", + "settings@2x": "src/static/app/icons/58x58.png", + "spotlight": "src/static/app/icons/40x40.png", + "spotlight@2x": "src/static/app/icons/80x80.png" + }, + "iphone": { + "app@2x": "src/static/app/icons/120x120.png", + "app@3x": "src/static/app/icons/180x180.png", + "notification@2x": "src/static/app/icons/40x40.png", + "notification@3x": "src/static/app/icons/60x60.png", + "settings@2x": "src/static/app/icons/58x58.png", + "settings@3x": "src/static/app/icons/87x87.png", + "spotlight@2x": "src/static/app/icons/80x80.png", + "spotlight@3x": "src/static/app/icons/120x120.png" + } } + } }, - "app-harmony" : { - "distribute" : { - "bundleName" : "uniapp.demo.test" - } + "android": { + "webView": { + "domStorageEnabled": true, + "databaseEnabled": true, + "allowFileAccess": true + } + }, + "compatible": { + "ignoreVersion": true + }, + "webview": { + "debug": true, + "crossDomain": true } -} + }, + "quickapp": {}, + "mp-weixin": { + "appid": "wx8e287639924edb51", + "setting": { + "urlCheck": false, + "minified": true + }, + "usingComponents": true + }, + "mp-alipay": { + "usingComponents": true, + "styleIsolation": "shared" + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "3", + "h5": { + "router": { + "base": "/" + }, + "sdkConfigs": { + "maps": { + "amap": { + "key": "21f194a0d33197f874f7bbdd198419be", + "securityJsCode": "a46b425f31a4de445b2966d998fba851", + "serviceHost": "" + } + } + } + }, + "app-harmony": { + "distribute": { + "bundleName": "uniapp.demo.test" + } + } +} \ No newline at end of file diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 72d8ac9..d1cbda1 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -105,9 +105,9 @@ let pw = Base64.encode(encodeURIComponent(password.value)) loading.value = true /*生产环境 begin */ - // loginApi({ username: un, password: pw }) + loginApi({ username: un, password: pw }) /*开发环境 begin */ - loginApi({ username: userName.value, password: password.value, captcha: 'app' }) + // loginApi({ username: userName.value, password: password.value, captcha: 'app' }) .then((res : any) => { if (res.success) { const { result } = res