From 2f615b36c10222bf4739dbd1fb708f54cbc42121 Mon Sep 17 00:00:00 2001 From: xingyy <373639591@qq.com> Date: Mon, 12 Aug 2024 19:55:59 +0800 Subject: [PATCH] =?UTF-8?q?"=E5=AE=9E=E7=8E=B0=E4=B8=BB=E9=A2=98=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=92=8C=E4=BD=9C=E5=93=81=E9=9B=86=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E4=BC=98=E5=8C=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 24 +++++++ src/components/imgModal/index.vue | 108 +++++++++++++++++++++-------- src/dict/index.js | 2 +- src/main.js | 17 ++++- src/store/auth/index.js | 3 +- src/views/login/index.vue | 54 ++++++--------- src/views/login/size768/index.vue | 6 +- src/views/signup/index.vue | 28 +++----- src/views/signup/size768/index.vue | 11 +-- 10 files changed, 163 insertions(+), 91 deletions(-) diff --git a/package.json b/package.json index c0137dc..e0bc30d 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "postcss-pxtorem": "^6.1.0", "postcss-responsive-type": "^1.0.0", "vant": "^4.9.4", + "vconsole": "^3.15.1", "vue": "^3.4.31", "vue-router": "^4.2.5" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ce21a44..1721fa8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,6 +44,9 @@ importers: vant: specifier: ^4.9.4 version: 4.9.4(vue@3.4.35) + vconsole: + specifier: ^3.15.1 + version: 3.15.1 vue: specifier: ^3.4.31 version: 3.4.35 @@ -1563,6 +1566,10 @@ packages: convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} + copy-text-to-clipboard@3.2.0: + resolution: {integrity: sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==} + engines: {node: '>=12'} + core-js-compat@3.38.0: resolution: {integrity: sha512-75LAicdLa4OJVwFxFbQR3NdnZjNgX6ILpVcVzcC4T2smerB5lELMrJQQQoWV6TiuC/vlaFqgU2tKQx9w5s0e0A==} @@ -1943,6 +1950,9 @@ packages: ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + mutation-observer@1.0.3: + resolution: {integrity: sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==} + naive-ui@2.39.0: resolution: {integrity: sha512-5oUJzRG+rtLSH8eRU+fJvVYiQids2BxF9jp+fwGoAqHOptEINrBlgBu9uy+95RHE5FLJ7Q/z41o+qkoGnUrKxQ==} peerDependencies: @@ -2477,6 +2487,9 @@ packages: peerDependencies: vue: ^3.0.0 + vconsole@3.15.1: + resolution: {integrity: sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==} + vdirs@0.1.8: resolution: {integrity: sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==} peerDependencies: @@ -4286,6 +4299,8 @@ snapshots: convert-source-map@2.0.0: {} + copy-text-to-clipboard@3.2.0: {} + core-js-compat@3.38.0: dependencies: browserslist: 4.23.3 @@ -4653,6 +4668,8 @@ snapshots: ms@2.1.2: {} + mutation-observer@1.0.3: {} + naive-ui@2.39.0(vue@3.4.35): dependencies: '@css-render/plugin-bem': 0.15.14(css-render@0.15.14) @@ -5297,6 +5314,13 @@ snapshots: '@vue/shared': 3.4.35 vue: 3.4.35 + vconsole@3.15.1: + dependencies: + '@babel/runtime': 7.25.0 + copy-text-to-clipboard: 3.2.0 + core-js: 3.38.0 + mutation-observer: 1.0.3 + vdirs@0.1.8(vue@3.4.35): dependencies: evtd: 0.2.4 diff --git a/src/components/imgModal/index.vue b/src/components/imgModal/index.vue index 079c399..713d34e 100644 --- a/src/components/imgModal/index.vue +++ b/src/components/imgModal/index.vue @@ -1,3 +1,54 @@ + - diff --git a/src/dict/index.js b/src/dict/index.js index b9e83fc..4608add 100644 --- a/src/dict/index.js +++ b/src/dict/index.js @@ -1 +1 @@ -export const sizes = [ {minWidth:'0px',maxWidth:'768px'}, {minWidth:'768px',maxWidth:'1440px'}, {minWidth:'1440px',maxWidth: '1920px'}, {minWidth:'1920px'}] +export const sizes = [ {minWidth:'0px',maxWidth:'768px'}, {minWidth:'0px',maxWidth:'768px'}, {minWidth:'768px',maxWidth:'1440px'}, {minWidth:'1440px',maxWidth: '1920px'}, {minWidth:'1920px'}] diff --git a/src/main.js b/src/main.js index a6a9115..2cfe03d 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,8 @@ import '@unocss/reset/sanitize/assets.css' import 'virtual:uno.css' import "vant/es/image-preview/style"; import { ImagePreview } from 'vant'; - +import Vconsole from 'vconsole' +new Vconsole() import router from "./router/index.js"; const app = createApp(App); app.use(router); @@ -24,4 +25,18 @@ app.directive('no-space', { }); } }) +app.directive('number-only', { + mounted(el) { + el.addEventListener('input', (event) => { + const { value } = event.target; + // 使用正则表达式限制输入格式 + event.target.value = value.replace(/[^0-9.]/g, ''); // 只保留数字和小数点 + if (event.target.value.indexOf('.') !== -1) { + // 如果已经包含小数点 + const parts = event.target.value.split('.'); + event.target.value = `${parts[0]}.${parts[1].slice(0, 1)}`; // 只保留一位小数 + } + }); + }, +}); app.mount('#app'); diff --git a/src/store/auth/index.js b/src/store/auth/index.js index 247fd30..05730ca 100644 --- a/src/store/auth/index.js +++ b/src/store/auth/index.js @@ -128,13 +128,14 @@ export const useAuth=createGlobalState(()=>{ } const res=await loginRegister(data) if(res.status===0){ + token.value=res.data.token if (res.data.status===1){ message.warning('您已经报名') await getDetail() router.push('/details') }else { message.success('登录成功') - token.value=res.data.token + router.push('/signup') } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 4a7df9f..d64ee05 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,42 +1,30 @@ diff --git a/src/views/login/size768/index.vue b/src/views/login/size768/index.vue index f001977..e054e21 100644 --- a/src/views/login/size768/index.vue +++ b/src/views/login/size768/index.vue @@ -15,14 +15,14 @@ const {clickSendCode,telNum,code,showTextCode ,clickLogin }= useAuth()
手机号
- +
验证码
- -
{{showTextCode}}
+ +
{{showTextCode}}
登录/注册
diff --git a/src/views/signup/index.vue b/src/views/signup/index.vue index a488f13..81c000f 100644 --- a/src/views/signup/index.vue +++ b/src/views/signup/index.vue @@ -1,6 +1,4 @@ diff --git a/src/views/signup/size768/index.vue b/src/views/signup/size768/index.vue index fb24e26..1b509cf 100644 --- a/src/views/signup/size768/index.vue +++ b/src/views/signup/size768/index.vue @@ -2,6 +2,7 @@ import {useAuth} from "@/store/auth/index.js"; import {NSelect} from "naive-ui"; const {formData,genderOptions,clickAddWorks,removeWorks,goConfirm,deleteImg,afterRead} =useAuth() + -