From b5896bc69cdb20fedf34ceffcc5e77d6091568ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 15 Nov 2024 18:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/CompanyList.vue | 19 ++-- pages/components/Flash.vue | 4 +- pages/index.vue | 3 +- pages/item/components/PageBanner.vue | 30 +++--- pages/passport/login.vue | 105 ++++++++++++++++---- pages/plug11/components/CardList.vue | 71 ------------- pages/plug11/components/PageBanner.vue | 115 ---------------------- pages/plug11/detail/[plugId].vue | 114 --------------------- pages/plug11/detail/components/Header.vue | 99 ------------------- pages/plug11/index.vue | 84 ---------------- pages/product/components/CardList.vue | 45 +++------ pages/product/create/index.vue | 30 ++++-- 12 files changed, 142 insertions(+), 577 deletions(-) delete mode 100644 pages/plug11/components/CardList.vue delete mode 100644 pages/plug11/components/PageBanner.vue delete mode 100644 pages/plug11/detail/[plugId].vue delete mode 100644 pages/plug11/detail/components/Header.vue delete mode 100644 pages/plug11/index.vue diff --git a/components/CompanyList.vue b/components/CompanyList.vue index 7ce467c..519d089 100644 --- a/components/CompanyList.vue +++ b/components/CompanyList.vue @@ -32,13 +32,15 @@ {{ item.companyName }} - 立即开通 - - - - - - + + @@ -47,9 +49,6 @@ - - - diff --git a/pages/components/Flash.vue b/pages/components/Flash.vue index a98e9ca..a0db57f 100644 --- a/pages/components/Flash.vue +++ b/pages/components/Flash.vue @@ -98,10 +98,10 @@
- 立即开始 + 立即开始 源码下载 - 商业版演示 + 商业版演示
diff --git a/pages/index.vue b/pages/index.vue index d402c4c..3f4d29d 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -2,7 +2,8 @@ - + + diff --git a/pages/item/components/PageBanner.vue b/pages/item/components/PageBanner.vue index 4fa10ae..3c4aa62 100644 --- a/pages/item/components/PageBanner.vue +++ b/pages/item/components/PageBanner.vue @@ -47,24 +47,16 @@
- - - - - - - - - - - - - - - - - 立即开通 - 产品控制台 + + + 帮助文档 @@ -106,7 +98,7 @@ import {FullScreen} from '@element-plus/icons-vue' import Breadcrumb from "~/components/Breadcrumb.vue"; import type {ApiResult} from "~/api"; import type {Company} from "~/api/system/company/model"; -import {loginAdminByToken, openSpmUrl} from "~/utils/common"; +import {loginAdminByToken, loginDeveloperCenterByToken, openSpmUrl} from "~/utils/common"; const token = useToken(); diff --git a/pages/passport/login.vue b/pages/passport/login.vue index 7f3ed89..f476a55 100644 --- a/pages/passport/login.vue +++ b/pages/passport/login.vue @@ -15,17 +15,17 @@
- + - + - + - + @@ -43,13 +43,13 @@
- - + + - + @@ -82,8 +82,8 @@
- - + + 未注册手机号验证通过后将自动注册 @@ -91,7 +91,7 @@ - + @@ -100,10 +100,10 @@ - - + + - + @@ -163,10 +163,13 @@ import {useConfigInfo, useToken, useUser, useWebsite} from "~/composables/config import useFormData from '@/utils/use-form-data'; import type { User } from '@/api/system/user/model'; import { ref } from 'vue' +import type {FormInstance, FormRules, UploadProps, UploadUserFile} from 'element-plus' import { Shop, Key, Avatar, Briefcase } from '@element-plus/icons-vue' import {useServerRequest} from "~/composables/useServerRequest"; import type {ApiResult} from "~/api"; import type {CaptchaResult, LoginResult} from "~/api/passport/login/model"; +import type {ShopMerchantApply} from "~/api/shop/shopMerchantApply/model"; +import {useClientRequest} from "~/composables/useClientRequest"; // 配置信息 const runtimeConfig = useRuntimeConfig(); @@ -174,6 +177,7 @@ const website = useWebsite(); const config = useConfigInfo(); const token = useToken(); const user = useUser(); +const formRef = ref() const activeName = ref('account') @@ -197,15 +201,15 @@ if(getIdBySpm(0) == 'register'){ } // 配置信息 -const { form } = useFormData({ +const { form,assignFields, resetFields } = useFormData({ userId: undefined, companyName: undefined, email: undefined, - username: '', - phone: '', - password: '', - code: '', - smsCode: '', + username: undefined, + phone: undefined, + password: undefined, + code: undefined, + smsCode: undefined, isAgree: false, remember: true, isSuperAdmin: true @@ -232,6 +236,33 @@ const checkUser = async () => { } }; +// 验证规则 +const rules = reactive>({ + phone: [ + {required: true, message: '请输入手机号码', trigger: 'blur'}, + {pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur'}, + ], + password: [ + {required: true, message: '请输入密码', trigger: 'blur'}, + ], + code: [ + {required: true, message: '请输入验证码', trigger: 'blur'}, + ], + smsCode: [ + {required: true, message: '请输入短信验证码', trigger: 'blur'}, + ], + username: [ + {required: true, message: '请输入用户名', trigger: 'blur'}, + ], + companyName: [ + {required: true, message: '请输入公司名称', trigger: 'blur'}, + ], + email: [ + {required: true, message: '请输入邮箱', trigger: 'blur'}, + {pattern: /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/, message: '请输入正确的邮箱', trigger: 'blur'}, + ] +}) + /* 发送短信验证码 */ const sendCode = async () => { @@ -297,6 +328,18 @@ useHead({ * 执行登录 */ const onSubmit = async () => { + if(!form.username){ + ElMessage.error('请填登录账号') + return; + } + if(!form.password){ + ElMessage.error('请填密码') + return; + } + if(!form.code){ + ElMessage.error('请填验证码') + return; + } const {data: response} = await useServerRequest>('/login',{baseURL: runtimeConfig.public.apiServer,method: "post",body: form}) // 登录成功 if(response.value?.code == 0){ @@ -313,6 +356,14 @@ const onSubmit = async () => { * 短信验证码登录 */ const onSubmitBySms = async () => { + if(!form.phone){ + ElMessage.error('请填手机号码') + return; + } + if(!form.code){ + ElMessage.error('请填验证码') + return; + } const {data: response} = await useServerRequest>('/loginBySms',{baseURL: runtimeConfig.public.apiServer,method: "post",body: { phone: form.phone, code: form.code, @@ -333,6 +384,22 @@ const onSubmitBySms = async () => { * 账号密码注册 */ const onRegister = async () => { + if(!form.phone){ + ElMessage.error('请填手机号码') + return; + } + if(!form.companyName){ + ElMessage.error('请填写企业名称') + return; + } + if(!form.code){ + ElMessage.error('请填验证码') + return; + } + if(!form.email){ + ElMessage.error('请填邮箱') + return; + } const loading = ElLoading.service({ lock: true, text: 'Loading' diff --git a/pages/plug11/components/CardList.vue b/pages/plug11/components/CardList.vue deleted file mode 100644 index ed6fad4..0000000 --- a/pages/plug11/components/CardList.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - diff --git a/pages/plug11/components/PageBanner.vue b/pages/plug11/components/PageBanner.vue deleted file mode 100644 index df21871..0000000 --- a/pages/plug11/components/PageBanner.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - diff --git a/pages/plug11/detail/[plugId].vue b/pages/plug11/detail/[plugId].vue deleted file mode 100644 index 2eb62c9..0000000 --- a/pages/plug11/detail/[plugId].vue +++ /dev/null @@ -1,114 +0,0 @@ - - - diff --git a/pages/plug11/detail/components/Header.vue b/pages/plug11/detail/components/Header.vue deleted file mode 100644 index f286dbd..0000000 --- a/pages/plug11/detail/components/Header.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - diff --git a/pages/plug11/index.vue b/pages/plug11/index.vue deleted file mode 100644 index aef6c1b..0000000 --- a/pages/plug11/index.vue +++ /dev/null @@ -1,84 +0,0 @@ - - diff --git a/pages/product/components/CardList.vue b/pages/product/components/CardList.vue index fe1a3f1..d75a655 100644 --- a/pages/product/components/CardList.vue +++ b/pages/product/components/CardList.vue @@ -25,36 +25,15 @@ {{ item.companyName }} - 立即开通 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
@@ -65,9 +44,6 @@
- - - diff --git a/pages/product/create/index.vue b/pages/product/create/index.vue index 89d7f23..c2b2a9b 100644 --- a/pages/product/create/index.vue +++ b/pages/product/create/index.vue @@ -13,8 +13,25 @@
- - + + + 基础版 + 专业版 + 定制版 + + + + + + + + + + @@ -23,13 +40,6 @@ - - - - - - - @@ -385,7 +395,7 @@ const onDone = () => { ElMessage.success('购买成功'); visible.value = !visible.value; setTimeout(() => { - navigateTo(`/user/order`) + openSpmUrl(`https://console.websoft.top/cost-center/order`) },500) } if(res.code == 1){