diff --git a/package.json b/package.json index 63bc961..cdfeab2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vue3-vant4-mobile", "private": true, - "version": "0.0.1", + "version": "0.0.2", "author": { "name": "xiangshu233", "email": "xiangshu233@outlook.com", @@ -19,8 +19,9 @@ "preview": "vite preview", "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite", "clean:lib": "rimraf node_modules", + "lint": "eslint --fix \"./src/**/*.{js,jsx,ts,tsx,vue}\"", "lint:lint-staged": "lint-staged", - "lint:eslint": "eslint \"{src}/**/*.{vue,ts,tsx}\" --fix", + "lint:eslint": "eslint \"./src/**/*.{vue,ts,tsx}\" --fix", "lint:prettier": "prettier --write --loglevel warn \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"", "lint:stylelint": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/", "prepare": "husky install" @@ -103,9 +104,9 @@ "pnpm": ">=7" }, "lint-staged": { - "*.{js,jsx,ts,tsx}": [ - "eslint --fix", - "prettier --write" + "*.{js,jsx,ts,tsx,vue}": [ + "npm run lint", + "git add" ], "{!(package)*.json,*.code-snippets,.!(browserslist)*rc}": [ "prettier --write--parser json" diff --git a/prettier.config.js b/prettier.config.js index b4e993a..dbf81d8 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -8,7 +8,6 @@ module.exports = { quoteProps: 'as-needed', bracketSpacing: true, trailingComma: 'es5', - jsxBracketSameLine: false, jsxSingleQuote: false, arrowParens: 'always', insertPragma: false, diff --git a/src/styles/common.less b/src/styles/common.less index eeb03e6..edc9ace 100644 --- a/src/styles/common.less +++ b/src/styles/common.less @@ -11,7 +11,6 @@ html { } [data-theme='dark'] { - &, * { color-scheme: dark !important; @@ -24,7 +23,6 @@ html { } [data-theme='light'] { - &, * { color-scheme: light !important; diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index 39b994f..3f029b5 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -24,6 +24,7 @@ :deep(.van-field__left-icon) { display: flex; } + :deep(.van-field__right-icon) { display: flex; } diff --git a/src/views/login/LoginWave.vue b/src/views/login/LoginWave.vue index 02f243d..fce9509 100644 --- a/src/views/login/LoginWave.vue +++ b/src/views/login/LoginWave.vue @@ -52,12 +52,23 @@ diff --git a/src/views/my/EditUserInfo.vue b/src/views/my/EditUserInfo.vue index e9b119f..f39e10f 100644 --- a/src/views/my/EditUserInfo.vue +++ b/src/views/my/EditUserInfo.vue @@ -167,9 +167,11 @@ width: 140px; height: 140px; } + .cover { width: 170px; height: 100px; + :deep(.van-image__img) { border-radius: 10px !important; } diff --git a/src/views/my/index.vue b/src/views/my/index.vue index 1239757..173a0a6 100644 --- a/src/views/my/index.vue +++ b/src/views/my/index.vue @@ -100,6 +100,7 @@ .my-bg { clip-path: inset(0 -55% 0 -55% round 0 0 100% 100%); background-size: cover; + &::after { content: ''; position: absolute; @@ -111,12 +112,15 @@ opacity: 0.9; } } + .van-cell { align-items: center; background: transparent; + &:active { background-color: var(--van-cell-active-color); } + .xicon { margin-right: 10px; } diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue index 25f2370..184bf6b 100644 --- a/src/views/welcome/index.vue +++ b/src/views/welcome/index.vue @@ -48,16 +48,16 @@ import { useGlobSetting } from '@/hooks/setting'; import { useRouter } from 'vue-router'; - import { updateDarkSign } from '@/theme'; + // import { updateDarkSign } from '@/theme'; - const getDarkMode = computed({ - get: () => designStore.getDarkMode === 'dark', - set: (value) => { - const darkMode = value ? 'dark' : 'light'; - updateDarkSign(darkMode); - designStore.setDarkMode(darkMode); - }, - }); + // const getDarkMode = computed({ + // get: () => designStore.getDarkMode === 'dark', + // set: (value) => { + // const darkMode = value ? 'dark' : 'light'; + // updateDarkSign(darkMode); + // designStore.setDarkMode(darkMode); + // }, + // }); const designStore = useDesignSettingStore(); const globSetting = useGlobSetting(); @@ -92,11 +92,13 @@ min-height: 50vh; max-width: 45vh; min-width: 30vh; + .wel-top { display: flex; align-items: center; flex-direction: column; } + .wel-bottom { display: flex; align-items: center;