diff --git a/.stylelintignore b/.stylelintignore index 0517076..6cd69e0 100644 --- a/.stylelintignore +++ b/.stylelintignore @@ -1,3 +1,2 @@ -/dist/* -/public/* -public/* +dist +public diff --git a/package.json b/package.json index 6599cf1..6eb5975 100644 --- a/package.json +++ b/package.json @@ -61,11 +61,13 @@ "prettier": "^3.0.0", "rollup-plugin-visualizer": "^5.9.1", "stylelint": "^15.10.1", - "stylelint-config-prettier": "^9.0.5", + "stylelint-config-property-sort-order-smacss": "^9.1.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-recommended-vue": "^1.4.0", "stylelint-config-standard": "^34.0.0", + "stylelint-config-standard-scss": "^10.0.0", "stylelint-order": "^6.0.3", + "stylelint-prettier": "^3.0.0", "terser": "^5.18.1", "typescript": "^5.1.6", "unplugin-auto-import": "^0.16.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ab404f9..2471341 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -146,9 +146,9 @@ devDependencies: stylelint: specifier: ^15.10.1 version: 15.10.1 - stylelint-config-prettier: - specifier: ^9.0.5 - version: 9.0.5(stylelint@15.10.1) + stylelint-config-property-sort-order-smacss: + specifier: ^9.1.0 + version: 9.1.0(stylelint@15.10.1) stylelint-config-recommended: specifier: ^13.0.0 version: 13.0.0(stylelint@15.10.1) @@ -158,9 +158,15 @@ devDependencies: stylelint-config-standard: specifier: ^34.0.0 version: 34.0.0(stylelint@15.10.1) + stylelint-config-standard-scss: + specifier: ^10.0.0 + version: 10.0.0(postcss@8.4.24)(stylelint@15.10.1) stylelint-order: specifier: ^6.0.3 version: 6.0.3(stylelint@15.10.1) + stylelint-prettier: + specifier: ^3.0.0 + version: 3.0.0(prettier@3.0.0)(stylelint@15.10.1) terser: specifier: ^5.18.1 version: 5.18.1 @@ -3871,6 +3877,10 @@ packages: engines: {node: '>=12.22'} dev: true + /css-property-sort-order-smacss@2.2.0: + resolution: {integrity: sha512-nXutswsivIEBOrPo/OZw2KQjFPLvtg68aovJf6Kqrm3L6FmTvvFPaeDrk83hh0+pRJGuP3PeKJwMS0E6DFipdQ==} + dev: true + /css-select@4.3.0: resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} dependencies: @@ -7596,6 +7606,10 @@ packages: postcss: 8.4.24 dev: true + /postcss-media-query-parser@0.2.3: + resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==} + dev: true + /postcss-prefix-selector@1.16.0(postcss@5.2.18): resolution: {integrity: sha512-rdVMIi7Q4B0XbXqNUEI+Z4E+pueiu/CS5E6vRCQommzdQ/sgsS4dK42U7GX8oJR+TJOtT+Qv3GkNo6iijUMp3Q==} peerDependencies: @@ -7617,6 +7631,15 @@ packages: postcss: 8.4.24 dev: true + /postcss-scss@4.0.6(postcss@8.4.24): + resolution: {integrity: sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==} + engines: {node: '>=12.0'} + peerDependencies: + postcss: ^8.4.19 + dependencies: + postcss: 8.4.24 + dev: true + /postcss-selector-parser@6.0.13: resolution: {integrity: sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==} engines: {node: '>=4'} @@ -8653,14 +8676,30 @@ packages: stylelint: 15.10.1 dev: true - /stylelint-config-prettier@9.0.5(stylelint@15.10.1): - resolution: {integrity: sha512-U44lELgLZhbAD/xy/vncZ2Pq8sh2TnpiPvo38Ifg9+zeioR+LAkHu0i6YORIOxFafZoVg0xqQwex6e6F25S5XA==} - engines: {node: '>= 12'} - hasBin: true + /stylelint-config-property-sort-order-smacss@9.1.0(stylelint@15.10.1): + resolution: {integrity: sha512-TijYeDoDgHAFjpn9NnziQrmUCGrm2AM4e1HzsdI2mCWBRkQRuewc343YqDwdFgQ5eHoMZ3JRL02i72W3vktuDA==} peerDependencies: - stylelint: '>= 11.x < 15' + stylelint: ^14.0.0 || ^15.0.0 dependencies: + css-property-sort-order-smacss: 2.2.0 stylelint: 15.10.1 + stylelint-order: 6.0.3(stylelint@15.10.1) + dev: true + + /stylelint-config-recommended-scss@12.0.0(postcss@8.4.24)(stylelint@15.10.1): + resolution: {integrity: sha512-5Bb2mlGy6WLa30oNeKpZvavv2lowJUsUJO25+OA68GFTemlwd1zbFsL7q0bReKipOSU3sG47hKneZ6Nd+ctrFA==} + peerDependencies: + postcss: ^8.3.3 + stylelint: ^15.5.0 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.24 + postcss-scss: 4.0.6(postcss@8.4.24) + stylelint: 15.10.1 + stylelint-config-recommended: 12.0.0(stylelint@15.10.1) + stylelint-scss: 5.0.1(stylelint@15.10.1) dev: true /stylelint-config-recommended-vue@1.4.0(postcss-html@1.5.0)(stylelint@15.10.1): @@ -8677,6 +8716,14 @@ packages: stylelint-config-recommended: 13.0.0(stylelint@15.10.1) dev: true + /stylelint-config-recommended@12.0.0(stylelint@15.10.1): + resolution: {integrity: sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ==} + peerDependencies: + stylelint: ^15.5.0 + dependencies: + stylelint: 15.10.1 + dev: true + /stylelint-config-recommended@13.0.0(stylelint@15.10.1): resolution: {integrity: sha512-EH+yRj6h3GAe/fRiyaoO2F9l9Tgg50AOFhaszyfov9v6ayXJ1IkSHwTxd7lB48FmOeSGDPLjatjO11fJpmarkQ==} engines: {node: ^14.13.1 || >=16.0.0} @@ -8686,6 +8733,30 @@ packages: stylelint: 15.10.1 dev: true + /stylelint-config-standard-scss@10.0.0(postcss@8.4.24)(stylelint@15.10.1): + resolution: {integrity: sha512-bChBEo1p3xUVWh/wenJI+josoMk21f2yuLDGzGjmKYcALfl2u3DFltY+n4UHswYiXghqXaA8mRh+bFy/q1hQlg==} + peerDependencies: + postcss: ^8.3.3 + stylelint: ^15.5.0 + peerDependenciesMeta: + postcss: + optional: true + dependencies: + postcss: 8.4.24 + stylelint: 15.10.1 + stylelint-config-recommended-scss: 12.0.0(postcss@8.4.24)(stylelint@15.10.1) + stylelint-config-standard: 33.0.0(stylelint@15.10.1) + dev: true + + /stylelint-config-standard@33.0.0(stylelint@15.10.1): + resolution: {integrity: sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg==} + peerDependencies: + stylelint: ^15.5.0 + dependencies: + stylelint: 15.10.1 + stylelint-config-recommended: 12.0.0(stylelint@15.10.1) + dev: true + /stylelint-config-standard@34.0.0(stylelint@15.10.1): resolution: {integrity: sha512-u0VSZnVyW9VSryBG2LSO+OQTjN7zF9XJaAJRX/4EwkmU0R2jYwmBSN10acqZisDitS0CLiEiGjX7+Hrq8TAhfQ==} engines: {node: ^14.13.1 || >=16.0.0} @@ -8706,6 +8777,30 @@ packages: stylelint: 15.10.1 dev: true + /stylelint-prettier@3.0.0(prettier@3.0.0)(stylelint@15.10.1): + resolution: {integrity: sha512-kIks1xw6np0zElokMT2kP6ar3S4MBoj6vUtPJuND1pFELMpZxVS/0uHPR4HDAVn0WAD3I5oF0IA3qBFxBpMkLg==} + engines: {node: ^14.17.0 || >=16.0.0} + peerDependencies: + prettier: '>=2.0.0' + stylelint: '>=14.0.0' + dependencies: + prettier: 3.0.0 + prettier-linter-helpers: 1.0.0 + stylelint: 15.10.1 + dev: true + + /stylelint-scss@5.0.1(stylelint@15.10.1): + resolution: {integrity: sha512-n87iCRZrr2J7//I/QFsDXxFLnHKw633U4qvWZ+mOW6KDAp/HLj06H+6+f9zOuTYy+MdGdTuCSDROCpQIhw5fvQ==} + peerDependencies: + stylelint: ^14.5.1 || ^15.0.0 + dependencies: + postcss-media-query-parser: 0.2.3 + postcss-resolve-nested-selector: 0.1.1 + postcss-selector-parser: 6.0.13 + postcss-value-parser: 4.2.0 + stylelint: 15.10.1 + dev: true + /stylelint@15.10.1: resolution: {integrity: sha512-CYkzYrCFfA/gnOR+u9kJ1PpzwG10WLVnoxHDuBA/JiwGqdM9+yx9+ou6SE/y9YHtfv1mcLo06fdadHTOx4gBZQ==} engines: {node: ^14.13.1 || >=16.0.0} diff --git a/prettier.config.js b/prettier.config.js index c5cf471..7feb9c5 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -7,4 +7,12 @@ module.exports = { proseWrap: 'never', htmlWhitespaceSensitivity: 'strict', endOfLine: 'auto', + overrides: [ + { + files: '.*rc', + options: { + parser: 'json', + }, + }, + ], }; diff --git a/src/api/index.ts b/src/api/index.ts index a0f58d3..3720049 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,12 +1,11 @@ -import useAxiosApi from '/@/utils/useAxiosApi'; +import { http } from '@/utils/request'; /** * 账号密码登录 * @returns UseAxiosReturn */ export function loginPassword() { - return useAxiosApi(`/api/login`, { - method: 'POST', + return http.post(`/api/login`, { data: { name: '123' }, }); } diff --git a/src/assets/BaseModal/btn-close.png b/src/assets/baseModal/btn-close.png similarity index 100% rename from src/assets/BaseModal/btn-close.png rename to src/assets/baseModal/btn-close.png diff --git a/src/assets/BaseModal/modal-bg-large.png b/src/assets/baseModal/modal-bg-large.png similarity index 100% rename from src/assets/BaseModal/modal-bg-large.png rename to src/assets/baseModal/modal-bg-large.png diff --git a/src/assets/BaseModal/modal-bg-normal.png b/src/assets/baseModal/modal-bg-normal.png similarity index 100% rename from src/assets/BaseModal/modal-bg-normal.png rename to src/assets/baseModal/modal-bg-normal.png diff --git a/src/components/Modal/src/hooks/useFactoryModal.tsx b/src/components/Modal/src/hooks/useFactoryModal.tsx index b4f9c9d..e2a962f 100644 --- a/src/components/Modal/src/hooks/useFactoryModal.tsx +++ b/src/components/Modal/src/hooks/useFactoryModal.tsx @@ -3,7 +3,8 @@ * @Date: 2023-05-10 11:46:19 * @Description: file content */ -import { i18n } from '/@/i18n'; + +import { i18n } from '@/i18n'; import { Component } from 'vue'; import BaseModal from '../BasicModal.vue'; import { createApp, ref, defineComponent } from 'vue'; diff --git a/src/components/Modal/src/index.scss b/src/components/Modal/src/index.scss index 95b39ce..ebf894c 100644 --- a/src/components/Modal/src/index.scss +++ b/src/components/Modal/src/index.scss @@ -1,41 +1,52 @@ .modal-content { + @include center(); + + position: relative; width: 650px; background-repeat: no-repeat; background-size: cover; - position: relative; - @include center(); + &.normal { height: 604px; - background-image: url(@/assets/BaseModal/modal-bg-normal.png); + background-image: url('@/assets/baseModal/modal-bg-normal.png'); } + &.large { height: 754px; - background-image: url(@/assets/BaseModal/modal-bg-large.png); + background-image: url('@/assets/baseModal/modal-bg-large.png'); } + .content { - width: 100%; @include center(); + + width: 100%; } + .btn { display: flex; - width: 100%; - justify-content: space-around; position: absolute; bottom: 10px; + justify-content: space-around; + width: 100%; + &-cancel { @extend .btn-common; + background-color: coral; } + &-confirm { @extend .btn-common; + background-color: skyblue; } } } .btn-common { + @include center(); + width: 250px; height: 100px; border-radius: 10px; - @include center(); } diff --git a/src/main.ts b/src/main.ts index 56304b5..c259caf 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,8 +1,8 @@ import { createApp } from 'vue'; import App from './App.vue'; -import { i18n } from '/@/i18n'; -import router from '/@/router'; -import store from '/@/store'; +import { i18n } from '@/i18n'; +import router from '@/router'; +import store from '@/store'; import './assets/font/iconfont.css'; import './assets/app.css'; diff --git a/src/router/routes.ts b/src/router/routes.ts index 5e87021..e6eac6a 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -2,11 +2,11 @@ export const routes = [ { path: '/', redirect: '/home', - component: () => import('/@/layout/basic/index.vue'), + component: () => import('@/layout/basic/index.vue'), children: [ { path: 'home', - component: () => import('/@/views/home/index.vue'), + component: () => import('@/views/home/index.vue'), meta: { title: 'tabbar.home', keepAlive: true, @@ -14,7 +14,7 @@ export const routes = [ }, { path: 'list', - component: () => import('/@/views/list/index.vue'), + component: () => import('@/views/list/index.vue'), meta: { title: 'tabbar.list', keepAlive: true, @@ -22,7 +22,7 @@ export const routes = [ }, { path: 'member', - component: () => import('/@/views/member/index.vue'), + component: () => import('@/views/member/index.vue'), meta: { title: 'tabbar.member', keepAlive: true, @@ -30,7 +30,7 @@ export const routes = [ }, { path: 'demo', - component: () => import('/@/views/demo/index.vue'), + component: () => import('@/views/demo/index.vue'), meta: { title: 'tabbar.demo', keepAlive: true, @@ -39,7 +39,7 @@ export const routes = [ { name: 'listDetails', path: '/details', - component: () => import('/@/views/list/details/index.vue'), + component: () => import('@/views/list/details/index.vue'), meta: { title: 'list.details', border: false, @@ -50,7 +50,7 @@ export const routes = [ { name: 'login', path: '/login', - component: () => import('/@/views/login/index.vue'), + component: () => import('@/views/login/index.vue'), meta: { title: '', keepAlive: true, diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 70ae58f..c9fefbb 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -1,4 +1,4 @@ -import { loginPassword } from '/@/api'; +import { loginPassword } from '@/api'; import { useCookies } from '@vueuse/integrations/useCookies'; import { defineStore } from 'pinia'; @@ -27,8 +27,7 @@ export const useUserStore = defineStore({ }, login() { return new Promise((resolve) => { - const { execute } = loginPassword(); - execute().then((res) => { + loginPassword().then((res) => { this.setInfo(res); resolve(res); }); @@ -41,30 +40,3 @@ export const useUserStore = defineStore({ paths: ['token'], }, }); -// export const useUserStore = defineStore('app-user', () => { -// const Token = ref(token); -// const info = ref>({}); -// const setInfo = (info: any) => { -// info.value = info ? info : ''; -// }; -// const getUserInfo = () => { -// return info || {}; -// }; -// const login = () => { -// return new Promise((resolve) => { -// const { data } = loginPassword(); -// watch(data, () => { -// setInfo(data.value); -// // useCookies().set(VITE_TOKEN_KEY as string, data.value.token); -// resolve(data.value); -// }); -// }); -// }; -// return { -// Token, -// info, -// setInfo, -// login, -// getUserInfo, -// }; -// }); diff --git a/src/utils/index.ts b/src/utils/index.ts deleted file mode 100644 index 037ac4b..0000000 --- a/src/utils/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -export function typeCheck(param: any) { - return Object.prototype.toString.call(param); -} - -/** - * 批量修改stage - */ -export function mutateState(state: Record, payload: Record) { - if (typeCheck(state) === '[object Object]' && typeCheck(payload) === '[object Object]') { - for (const key in payload) { - state[key] = payload[key]; - } - } else { - console.error('expected plain Object'); - } -} diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts new file mode 100644 index 0000000..eb5e240 --- /dev/null +++ b/src/utils/request/index.ts @@ -0,0 +1,53 @@ +import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'; +import { showToast } from 'vant'; + +const service: AxiosInstance = axios.create({ + withCredentials: false, + timeout: 5000, +}); + +service.interceptors.request.use( + (config: InternalAxiosRequestConfig) => { + return config; + }, + (error: AxiosError) => { + return Promise.reject(error); + }, +); + +service.interceptors.response.use( + (response: AxiosResponse) => { + const res = response.data; + if (res.code !== 200) { + showToast(res.msg); + return Promise.reject(res.msg || 'Error'); + } else { + return res; + } + }, + (error: AxiosError) => { + console.log('err' + error); + showToast(error.message); + return Promise.reject(error.message); + }, +); + +export const http = { + get(url: string, config?: AxiosRequestConfig): Promise { + return service.get(url, config); + }, + + post(url: string, data?: object, config?: AxiosRequestConfig): Promise { + return service.post(url, data, config); + }, + + put(url: string, data?: object, config?: AxiosRequestConfig): Promise { + return service.put(url, data, config); + }, + + delete(url: string, config?: AxiosRequestConfig): Promise { + return service.delete(url, config); + }, +}; + +export default service; diff --git a/src/utils/request/useAxiosApi.ts b/src/utils/request/useAxiosApi.ts new file mode 100644 index 0000000..6e975dd --- /dev/null +++ b/src/utils/request/useAxiosApi.ts @@ -0,0 +1,11 @@ +import { useAxios } from '@vueuse/integrations/useAxios'; + +import 'vant/es/toast/style'; + +/** + * reactive useFetchApi + */ + +export default function useAxiosApi(url: string, config: any) { + return useAxios(url, config); +} diff --git a/src/utils/useFetchApi.ts b/src/utils/request/useFetchApi.ts similarity index 100% rename from src/utils/useFetchApi.ts rename to src/utils/request/useFetchApi.ts diff --git a/src/utils/useAxiosApi.ts b/src/utils/useAxiosApi.ts deleted file mode 100644 index 5f7e7c7..0000000 --- a/src/utils/useAxiosApi.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { useAxios } from '@vueuse/integrations/useAxios'; -import axios from 'axios'; -import { showToast } from 'vant'; -import 'vant/es/toast/style'; - -// create an axios instance -const instance = axios.create({ - withCredentials: false, - timeout: 5000, -}); - -// request interceptor -instance.interceptors.request.use( - (config) => { - // do something before request is sent - // const token = store.state.user.token; - - // if (token) { - // // let each request carry token - // config.headers = { - // ...config.headers, - // Authorization: `Bearer ${token}` - // }; - // } - return config; - }, - (error) => { - // do something with request error - console.log(error); // for debug - return Promise.reject(error); - }, -); - -// response interceptor -instance.interceptors.response.use( - /** - * If you want to get http information such as headers or status - * Please return response => response - */ - - /** - * Determine the request status by custom code - * Here is just an example - * You can also judge the status by HTTP Status Code - */ - (response) => { - const res = response.data; - // if the custom code is not 200, it is judged as an error. - if (res.code !== 200) { - showToast(res.msg); - // 412: Token expired; - if (res.code === 412) { - // store.dispatch('user/userLogout'); - } - return Promise.reject(res.msg || 'Error'); - } else { - return res; - } - }, - (error) => { - console.log('err' + error); - showToast(error.message); - return Promise.reject(error.message); - }, -); - -/** - * reactive useFetchApi - */ - -export default function useAxiosApi(url: string, config: any) { - return useAxios(url, config); -} diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue index 9e8abc7..f81574c 100644 --- a/src/views/demo/index.vue +++ b/src/views/demo/index.vue @@ -51,7 +51,7 @@