提交 c85816dd 作者: 方治民

合并分支 '3.x' 到 'main'

3.x

查看合并请求 !47
......@@ -66,27 +66,27 @@
}
},
"dependencies": {
"@dcloudio/uni-app": "3.0.0-3080420230531001",
"@dcloudio/uni-app-plus": "3.0.0-3080420230531001",
"@dcloudio/uni-components": "3.0.0-3080420230531001",
"@dcloudio/uni-h5": "3.0.0-3080420230531001",
"@dcloudio/uni-mp-alipay": "3.0.0-3080420230531001",
"@dcloudio/uni-mp-baidu": "3.0.0-3080420230531001",
"@dcloudio/uni-mp-jd": "3.0.0-3080420230531001",
"@dcloudio/uni-mp-kuaishou": "3.0.0-3080420230531001",
"@dcloudio/uni-mp-lark": "3.0.0-3080420230531001",
"@dcloudio/uni-mp-qq": "3.0.0-3080420230531001",
"@dcloudio/uni-mp-toutiao": "3.0.0-3080420230531001",
"@dcloudio/uni-mp-weixin": "3.0.0-3080420230531001",
"@dcloudio/uni-quickapp-webview": "3.0.0-3080420230531001",
"@dcloudio/uni-app": "3.0.0-3080720230630001",
"@dcloudio/uni-app-plus": "3.0.0-3080720230630001",
"@dcloudio/uni-components": "3.0.0-3080720230630001",
"@dcloudio/uni-h5": "3.0.0-3080720230630001",
"@dcloudio/uni-mp-alipay": "3.0.0-3080720230630001",
"@dcloudio/uni-mp-baidu": "3.0.0-3080720230630001",
"@dcloudio/uni-mp-jd": "3.0.0-3080720230630001",
"@dcloudio/uni-mp-kuaishou": "3.0.0-3080720230630001",
"@dcloudio/uni-mp-lark": "3.0.0-3080720230630001",
"@dcloudio/uni-mp-qq": "3.0.0-3080720230630001",
"@dcloudio/uni-mp-toutiao": "3.0.0-3080720230630001",
"@dcloudio/uni-mp-weixin": "3.0.0-3080720230630001",
"@dcloudio/uni-quickapp-webview": "3.0.0-3080720230630001",
"@dcloudio/uni-ui": "^1.4.28",
"@faker-js/faker": "^8.0.2",
"@vue/runtime-core": "~3.2.47",
"@vueuse/core": "^10.2.1",
"@yiring/fui": "^1.9.9",
"@yiring/fui": "1.9.9-3",
"axios": "^1.4.0",
"crypto-js": "^4.1.1",
"dayjs": "^1.11.8",
"dayjs": "^1.11.9",
"lodash-es": "^4.17.21",
"nanoid": "^4.0.2",
"pinia": "~2.0.36",
......@@ -103,15 +103,15 @@
"@commitlint/cli": "^17.6.6",
"@commitlint/config-conventional": "^17.6.6",
"@dcloudio/types": "^3.3.3",
"@dcloudio/uni-automator": "3.0.0-3080420230531001",
"@dcloudio/uni-cli-shared": "3.0.0-3080420230531001",
"@dcloudio/uni-automator": "3.0.0-3080720230630001",
"@dcloudio/uni-cli-shared": "3.0.0-3080720230630001",
"@dcloudio/uni-helper-json": "^1.0.13",
"@dcloudio/uni-stacktracey": "3.0.0-3080420230531001",
"@dcloudio/vite-plugin-uni": "3.0.0-3080420230531001",
"@iconify/json": "^2.2.84",
"@dcloudio/uni-stacktracey": "3.0.0-3080720230630001",
"@dcloudio/vite-plugin-uni": "3.0.0-3080720230630001",
"@iconify/json": "^2.2.85",
"@types/crypto-js": "^4.1.1",
"@types/lodash-es": "^4.17.7",
"@types/node": "^18.16.18",
"@types/node": "^18.16.19",
"@types/prettier": "^2.7.3",
"@types/qs": "^6.9.7",
"@types/stompjs": "^2.3.5",
......@@ -125,7 +125,7 @@
"cz-git": "^1.6.1",
"czg": "^1.6.1",
"dotenv": "^16.3.1",
"eslint": "^8.43.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^9.15.1",
......@@ -143,7 +143,7 @@
"prettier": "^2.8.8",
"rimraf": "^5.0.1",
"sass": "^1.63.6",
"sort-package-json": "^2.4.1",
"sort-package-json": "^2.5.0",
"stylelint": "^15.9.0",
"stylelint-config-html": "^1.1.0",
"stylelint-config-recommended": "^12.0.0",
......@@ -151,7 +151,7 @@
"stylelint-order": "^6.0.3",
"typescript": "~5.0.4",
"unocss": "^0.53.4",
"unocss-preset-weapp": "^0.53.3",
"unocss-preset-weapp": "^0.53.5",
"unplugin-auto-import": "^0.16.4",
"unplugin-vue-components": "^0.25.1",
"vite": "^4.3.9",
......
<script setup lang="ts">
import '@yiring/fui/lib/fui-theme/fui-theme.css'
import { checkUpgrade } from '@/utils/upgrade'
// import * as Push from '@/utils/push'
......@@ -25,7 +26,8 @@
})
onError((err) => {
Message.toast(`App Error: ${err}`)
// Message.toast(`App Error: ${err}`)
console.error('App Error:', err)
})
onUnhandledRejection((err) => {
......@@ -42,7 +44,6 @@
/* 每个页面公共css */
@import url('./common/fui-app.css');
// @import url('@yiring/fui/fui-theme/fui-theme.css');
// 全局样式
@import url('./common/public.less');
......
......@@ -2,7 +2,6 @@ import { createSSRApp } from 'vue'
import * as Pinia from 'pinia'
import 'uno.css'
import '@yiring/fui/lib/fui-theme/fui-theme.css'
import App from './App.vue'
import { setupAppConfig } from '@/config/app'
......
......@@ -22,7 +22,7 @@
"skipLibCheck": true,
"strictNullChecks": false,
"strictPropertyInitialization": false,
"types": ["vite/client", "@dcloudio/types"],
"types": ["vite/client", "@dcloudio/types", "@yiring/fui/global"],
"removeComments": true,
"paths": {
"@/*": ["src/*"],
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论