update: 调整安卓兼容性问题

This commit is contained in:
admin 2024-05-09 13:38:36 +08:00
parent ce8cb31b5b
commit baa0db4871
7 changed files with 1827 additions and 1708 deletions

View File

@ -39,25 +39,28 @@
"type-check": "vue-tsc --noEmit" "type-check": "vue-tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@dcloudio/uni-app": "3.0.0-3081220230817001", "@dcloudio/uni-app": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-app-plus": "3.0.0-3081220230817001", "@dcloudio/uni-app-plus": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-components": "3.0.0-3081220230817001", "@dcloudio/uni-components": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-h5": "3.0.0-3081220230817001", "@dcloudio/uni-h5": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-mp-alipay": "3.0.0-3081220230817001", "@dcloudio/uni-mp-alipay": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-mp-baidu": "3.0.0-3081220230817001", "@dcloudio/uni-mp-baidu": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-mp-jd": "3.0.0-3081220230817001", "@dcloudio/uni-mp-jd": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-mp-kuaishou": "3.0.0-3081220230817001", "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-mp-lark": "3.0.0-3081220230817001", "@dcloudio/uni-mp-lark": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-mp-qq": "3.0.0-3081220230817001", "@dcloudio/uni-mp-qq": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-mp-toutiao": "3.0.0-3081220230817001", "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-mp-weixin": "3.0.0-3081220230817001", "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-quickapp-webview": "3.0.0-3081220230817001", "@dcloudio/uni-mp-xhs": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-ui": "^1.5.2", "@dcloudio/uni-ui": "^1.5.2",
"@esbuild/darwin-x64": "^0.20.2",
"@rollup/rollup-darwin-x64": "^4.17.2",
"amfe-flexible": "^2.2.1", "amfe-flexible": "^2.2.1",
"clipboard": "^2.0.11", "clipboard": "^2.0.11",
"dayjs": "^1.11.10", "dayjs": "^1.11.10",
"echarts": "^5.5.0", "echarts": "^5.5.0",
"esbuild": "0.17.19", "esbuild": "^0.20.2",
"luch-request": "^3.1.1", "luch-request": "^3.1.1",
"pinia": "2.0.33", "pinia": "2.0.33",
"pinia-plugin-persistedstate": "^3.2.1", "pinia-plugin-persistedstate": "^3.2.1",
@ -65,26 +68,26 @@
"underscore": "^1.13.6", "underscore": "^1.13.6",
"unplugin-auto-import": "^0.17.3", "unplugin-auto-import": "^0.17.3",
"uview-plus": "^3.2.14", "uview-plus": "^3.2.14",
"vue": "^3.2.45", "vue": "^3.4.27",
"vue-i18n": "^9.1.9" "vue-i18n": "^9.13.1"
}, },
"devDependencies": { "devDependencies": {
"@dcloudio/types": "^3.3.2", "@dcloudio/types": "^3.4.8",
"@dcloudio/uni-automator": "3.0.0-3081220230817001", "@dcloudio/uni-automator": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-cli-shared": "3.0.0-3081220230817001", "@dcloudio/uni-cli-shared": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-stacktracey": "3.0.0-3081220230817001", "@dcloudio/uni-stacktracey": "3.0.0-alpha-4010520240507001",
"@dcloudio/vite-plugin-uni": "3.0.0-3081220230817001", "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4010520240507001",
"@types/node": "^20.11.22", "@types/node": "^20.11.22",
"@types/underscore": "^1.11.15", "@types/underscore": "^1.11.15",
"@types/wechat-miniprogram": "^3.4.7", "@types/wechat-miniprogram": "^3.4.7",
"@uni-helper/uni-app-types": "^0.5.12", "@uni-helper/uni-app-types": "^0.5.12",
"@uni-helper/uni-ui-types": "^0.5.11", "@uni-helper/uni-ui-types": "^0.5.11",
"@vue/runtime-core": "^3.2.45", "@vue/runtime-core": "^3.4.27",
"@vue/tsconfig": "^0.1.3", "@vue/tsconfig": "^0.1.3",
"sass": "^1.69.7", "sass": "^1.69.7",
"sass-loader": "10", "sass-loader": "10",
"typescript": "^4.9.4", "typescript": "^4.9.4",
"vite": "4.1.4", "vite": "5.2.8",
"vue-tsc": "^1.0.24" "vue-tsc": "^1.0.24"
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
<template> <template>
<view <view
:class="{'box': isShow}" :class="{ box: isShow }"
:style="{ :style="{
marginTop: navbarRect.height + navbarRect.top + 'px', marginTop: navbarRect.height + navbarRect.top + 'px',
height: navbarRect.safeHeight + 'px', height: navbarRect.safeHeight + 'px',
@ -15,7 +15,7 @@ const props = withDefaults(
isShow: boolean; isShow: boolean;
}>(), }>(),
{ {
isShow: false isShow: false,
} }
); );
const navbarRect = reactive({ const navbarRect = reactive({
@ -45,6 +45,11 @@ onMounted(() => {
navbarRect.top = menuButtonInfo.top; navbarRect.top = menuButtonInfo.top;
getSafeHeight(); getSafeHeight();
// #endif // #endif
// #ifndef MP-WEIXIN
const systemInfo = uni.getSystemInfoSync();
navbarRect.safeHeight = (systemInfo.safeArea as any).height;
getSafeHeight();
// #endif
}); });
</script> </script>
<style lang="scss"> <style lang="scss">

View File

@ -22,19 +22,47 @@
</view> </view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ProfileApi,ReceiveApi,ShipmentApi,PictureApi,ReceiveProductApi,DeviceApi,StockCardApi,GoodsApi,SupplierApi,CustomerApi,FinanceApi,MessageApi } from '@/services'; import {
ProfileApi,
ReceiveApi,
ShipmentApi,
PictureApi,
ReceiveProductApi,
DeviceApi,
StockCardApi,
GoodsApi,
SupplierApi,
CustomerApi,
FinanceApi,
MessageApi,
} from "@/services";
import { formatDate } from "@/utils"; import { formatDate } from "@/utils";
import { UsersType } from "@/utils/enum"; import { UsersType } from "@/utils/enum";
import valid from "@/utils/validate"; import valid from "@/utils/validate";
console.log(ProfileApi,ReceiveApi,ShipmentApi,PictureApi,ReceiveProductApi,DeviceApi,StockCardApi,GoodsApi,SupplierApi,CustomerApi,FinanceApi,formatDate,UsersType, valid) console.log(
ProfileApi,
ReceiveApi,
ShipmentApi,
PictureApi,
ReceiveProductApi,
DeviceApi,
StockCardApi,
GoodsApi,
SupplierApi,
CustomerApi,
FinanceApi,
formatDate,
UsersType,
valid
);
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
count: number, count: number;
title: string title: string;
}>(), }>(),
{ {
count: 0 count: 0,
} }
); );

View File

@ -241,7 +241,7 @@
"style": { "style": {
"navigationBarTitleText": "客户详情" "navigationBarTitleText": "客户详情"
} }
}, }
// { // {
// "path": "uni_modules/lime-echart", // "path": "uni_modules/lime-echart",
// "style": { // "style": {

View File

@ -165,7 +165,7 @@ import {
import TabBar from "@/components/TabBar/index.vue"; import TabBar from "@/components/TabBar/index.vue";
import { formatMoney } from "@/utils"; import { formatMoney } from "@/utils";
import { onBackPress, onShow } from "@dcloudio/uni-app"; import { onBackPress, onShow } from "@dcloudio/uni-app";
import pinia from '@/store' import pinia from "@/store";
const store = useMemberStore(pinia); const store = useMemberStore(pinia);
const navbarRect = reactive({ const navbarRect = reactive({
@ -558,6 +558,11 @@ onMounted(() => {
navbarRect.top = menuButtonInfo.top; navbarRect.top = menuButtonInfo.top;
getSafeHeight(); getSafeHeight();
// #endif // #endif
// #ifndef MP-WEIXIN
const systemInfo = uni.getSystemInfoSync();
navbarRect.safeHeight = (systemInfo.safeArea as any).height;
getSafeHeight();
// #endif
}); });
onShow(() => { onShow(() => {
init(); init();

View File

@ -4,9 +4,10 @@ import AutoImport from "unplugin-auto-import/vite";
import path from "path"; // 引入pnpm install @types/node --save-dev import path from "path"; // 引入pnpm install @types/node --save-dev
import ENV_CONFIG from "./src/config/env"; import ENV_CONFIG from "./src/config/env";
// https://vitejs.dev/config/ // https://vitejs.dev/config/
// process.env.NODE_ENV === "development"
export default defineConfig({ export default defineConfig({
build: { build: {
sourcemap: process.env.NODE_ENV === "development", sourcemap: false,
}, },
define: { define: {
"process.env.config": ENV_CONFIG, "process.env.config": ENV_CONFIG,