diff --git a/env/.env b/env/.env index ed24c29..895cca4 100644 --- a/env/.env +++ b/env/.env @@ -1,4 +1,4 @@ -VITE_APP_TITLE = 'JeecgBoot-uniapp' +VITE_APP_TITLE = '数智产销' VITE_APP_PORT = 9000 VITE_UNI_APPID = '__UNI__9F097F0' diff --git a/env/.env.development b/env/.env.development index 44dd13a..dcbb90c 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,5 +4,5 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' -#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' \ No newline at end of file +#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' \ No newline at end of file diff --git a/env/.env.production b/env/.env.production index fe9dea7..50efecc 100644 --- a/env/.env.production +++ b/env/.env.production @@ -5,4 +5,4 @@ VITE_DELETE_CONSOLE = true # 是否开启sourcemap VITE_SHOW_SOURCEMAP = false -VITE_SERVER_BASEURL = 'https://api3.boot.jeecg.com' +VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' diff --git a/manifest.config.ts b/manifest.config.ts index 61606e4..9c026cc 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -39,14 +39,13 @@ export default defineManifestConfig({ modules: { Maps: {}, Messaging: {}, - Contacts: {}, Camera: {}, }, /* 应用发布信息 */ distribute: { /* android打包配置 */ android: { - minSdkVersion: 30, + minSdkVersion: 26, targetSdkVersion: 30, abiFilters: ['armeabi-v7a', 'arm64-v8a'], permissions: [ diff --git a/src/App.vue b/src/App.vue index 6997854..1814e62 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,7 +8,7 @@ export default { onLaunch: function (options) { // 检查更新 - // useUpdateApp().checkAppUpdate() + useUpdateApp().checkAppUpdate() // 定位 getLocation() }, diff --git a/src/manifest.json b/src/manifest.json index ad90ace..4b02328 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,5 +1,5 @@ { - "name": "JeecgBoot-uniapp", + "name": "数智产销", "appid": "__UNI__9F097F0", "description": "", "versionName": "1.0.0", @@ -18,7 +18,6 @@ "modules": { "Maps": {}, "Messaging": {}, - "Contacts": {}, "Camera": {} }, "distribute": { @@ -40,7 +39,7 @@ "", "" ], - "minSdkVersion": 30, + "minSdkVersion": 26, "targetSdkVersion": 30, "abiFilters": [ "armeabi-v7a", diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index f048c0c..13c0f75 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -103,9 +103,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 diff --git a/src/static/app/icons/1024x1024.png b/src/static/app/icons/1024x1024.png new file mode 100644 index 0000000..6cbd14f Binary files /dev/null and b/src/static/app/icons/1024x1024.png differ diff --git a/src/static/app/icons/120x120.png b/src/static/app/icons/120x120.png new file mode 100644 index 0000000..b358ad7 Binary files /dev/null and b/src/static/app/icons/120x120.png differ diff --git a/src/static/app/icons/144x144.png b/src/static/app/icons/144x144.png new file mode 100644 index 0000000..983000b Binary files /dev/null and b/src/static/app/icons/144x144.png differ diff --git a/src/static/app/icons/152x152.png b/src/static/app/icons/152x152.png new file mode 100644 index 0000000..7332837 Binary files /dev/null and b/src/static/app/icons/152x152.png differ diff --git a/src/static/app/icons/167x167.png b/src/static/app/icons/167x167.png new file mode 100644 index 0000000..5c393e5 Binary files /dev/null and b/src/static/app/icons/167x167.png differ diff --git a/src/static/app/icons/180x180.png b/src/static/app/icons/180x180.png new file mode 100644 index 0000000..b4d2caf Binary files /dev/null and b/src/static/app/icons/180x180.png differ diff --git a/src/static/app/icons/192x192.png b/src/static/app/icons/192x192.png new file mode 100644 index 0000000..df2a8b2 Binary files /dev/null and b/src/static/app/icons/192x192.png differ diff --git a/src/static/app/icons/20x20.png b/src/static/app/icons/20x20.png new file mode 100644 index 0000000..33df4c0 Binary files /dev/null and b/src/static/app/icons/20x20.png differ diff --git a/src/static/app/icons/29x29.png b/src/static/app/icons/29x29.png new file mode 100644 index 0000000..e0a5e8b Binary files /dev/null and b/src/static/app/icons/29x29.png differ diff --git a/src/static/app/icons/40x40.png b/src/static/app/icons/40x40.png new file mode 100644 index 0000000..d59f4bd Binary files /dev/null and b/src/static/app/icons/40x40.png differ diff --git a/src/static/app/icons/58x58.png b/src/static/app/icons/58x58.png new file mode 100644 index 0000000..fff3d73 Binary files /dev/null and b/src/static/app/icons/58x58.png differ diff --git a/src/static/app/icons/60x60.png b/src/static/app/icons/60x60.png new file mode 100644 index 0000000..5b0b656 Binary files /dev/null and b/src/static/app/icons/60x60.png differ diff --git a/src/static/app/icons/72x72.png b/src/static/app/icons/72x72.png new file mode 100644 index 0000000..ac1fea3 Binary files /dev/null and b/src/static/app/icons/72x72.png differ diff --git a/src/static/app/icons/76x76.png b/src/static/app/icons/76x76.png new file mode 100644 index 0000000..333d422 Binary files /dev/null and b/src/static/app/icons/76x76.png differ diff --git a/src/static/app/icons/80x80.png b/src/static/app/icons/80x80.png new file mode 100644 index 0000000..79870f2 Binary files /dev/null and b/src/static/app/icons/80x80.png differ diff --git a/src/static/app/icons/87x87.png b/src/static/app/icons/87x87.png new file mode 100644 index 0000000..ad00f69 Binary files /dev/null and b/src/static/app/icons/87x87.png differ diff --git a/src/static/app/icons/96x96.png b/src/static/app/icons/96x96.png new file mode 100644 index 0000000..383ff1f Binary files /dev/null and b/src/static/app/icons/96x96.png differ