Merge branch 'base'

This commit is contained in:
Burt 2024-09-05 20:49:28 +08:00
commit b42dec9e6c
5 changed files with 6996 additions and 5335 deletions

1
.gitignore vendored
View File

@ -22,6 +22,7 @@ dist
.hbuilderx .hbuilderx
.stylelintcache .stylelintcache
.eslintcache
# lock 文件还是不要了,我主要的版本写死就好了 # lock 文件还是不要了,我主要的版本写死就好了
# pnpm-lock.yaml # pnpm-lock.yaml

View File

@ -12,6 +12,7 @@
"uni-helper.uni-highlight-vscode", "uni-helper.uni-highlight-vscode",
"uni-helper.uni-ui-snippets-vscode", "uni-helper.uni-ui-snippets-vscode",
"uni-helper.uni-app-snippets-vscode", "uni-helper.uni-app-snippets-vscode",
"mrmlnc.vscode-json5" "mrmlnc.vscode-json5",
"streetsidesoftware.code-spell-checker"
] ]
} }

View File

@ -55,11 +55,9 @@
"explorer.fileNesting.patterns": { "explorer.fileNesting.patterns": {
"*.ts": "$(capture).test.ts, $(capture).test.tsx", "*.ts": "$(capture).test.ts, $(capture).test.tsx",
"*.tsx": "$(capture).test.ts, $(capture).test.tsx", "*.tsx": "$(capture).test.ts, $(capture).test.tsx",
"*.env": "$(capture).env.*", // "*.env": "$(capture).env.*",
"CHANGELOG.md": "CHANGELOG*", "CHANGELOG.md": "CHANGELOG*",
"package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc", "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,.npmrc,.browserslistrc",
".eslintrc.cjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,.stylelintrc.*,.eslintrc-auto-import.json,.editorconfig,.commitlint.cjs", ".eslintrc.cjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,.stylelintrc.*,.eslintrc-auto-import.json,.editorconfig,.commitlint.cjs"
"vite.config.ts": "tsconfig.*.json,uno.config.ts,tsconfig.json,uni-pages.d.ts",
"manifest.config.ts": "manifest.config.ts,pages.config.ts"
} }
} }

View File

@ -73,7 +73,7 @@
"prettier --write" "prettier --write"
], ],
"**/*.{vue,js,ts,jsx,tsx}": [ "**/*.{vue,js,ts,jsx,tsx}": [
"eslint --fix" "eslint --cache --fix"
], ],
"**/*.{vue,css,scss,html}": [ "**/*.{vue,css,scss,html}": [
"stylelint --fix" "stylelint --fix"
@ -88,14 +88,13 @@
"@dcloudio/uni-components": "3.0.0-alpha-4010520240507001", "@dcloudio/uni-components": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-h5": "3.0.0-alpha-4010520240507001", "@dcloudio/uni-h5": "3.0.0-alpha-4010520240507001",
"@dcloudio/uni-mp-weixin": "3.0.0-alpha-4010520240507001", "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4010520240507001",
"czg": "^1.9.3",
"dayjs": "1.11.10", "dayjs": "1.11.10",
"pinia": "2.0.36", "pinia": "2.0.36",
"pinia-plugin-persistedstate": "3.2.1", "pinia-plugin-persistedstate": "3.2.1",
"qs": "6.5.3", "qs": "6.5.3",
"vue": "3.4.21", "vue": "3.4.21",
"vue-i18n": "^9.1.9", "vue-i18n": "^9.1.9",
"wot-design-uni": "^1.2.26", "wot-design-uni": "^1.3.9",
"z-paging": "^2.7.10" "z-paging": "^2.7.10"
}, },
"devDependencies": { "devDependencies": {
@ -123,6 +122,7 @@
"@vue/tsconfig": "^0.1.3", "@vue/tsconfig": "^0.1.3",
"autoprefixer": "^10.4.19", "autoprefixer": "^10.4.19",
"commitlint": "^18.6.1", "commitlint": "^18.6.1",
"czg": "^1.9.3",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-config-standard": "^17.1.0", "eslint-config-standard": "^17.1.0",

12033
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff