diff --git a/admin/src/views/decoration/component/pages/attr-setting.vue b/admin/src/views/decoration/component/pages/attr-setting.vue index d4c90f3c..196aa799 100644 --- a/admin/src/views/decoration/component/pages/attr-setting.vue +++ b/admin/src/views/decoration/component/pages/attr-setting.vue @@ -11,6 +11,7 @@ :is="widgets[widget?.name]?.attr" :content="widget?.content" :styles="widget?.styles" + :type="type" /> @@ -23,6 +24,10 @@ const props = defineProps({ widget: { type: Object as PropType>, default: () => ({}) + }, + type: { + type: String as PropType<'mobile' | 'pc'>, + default: 'mobile' } }) diff --git a/pc/api/account.ts b/pc/api/account.ts index cca33f08..60273b76 100644 --- a/pc/api/account.ts +++ b/pc/api/account.ts @@ -7,10 +7,6 @@ export function login(params: any) { params: { ...params, client: getClient() } }) } -// // 登录 -export function logout() { - return $request.post({ url: '/login/logout' }) -} //注册 export function register(params: any) { @@ -33,3 +29,8 @@ export function getWxCodeUrl() { export function wxLogin(params: any) { return $request.post({ url: '/login/scanLogin', params }) } + +//忘记密码 +export function forgotPassword(params: Record) { + return $request.post({ url: '/login/forgotPassword', params }) +} diff --git a/pc/api/news.ts b/pc/api/news.ts index 7e9b698c..8aa579e9 100644 --- a/pc/api/news.ts +++ b/pc/api/news.ts @@ -19,7 +19,7 @@ export function getArticleList(params) { * @return { Promise } */ export function getArticleCenter() { - return $request.get({ url: '/pc/infoCenter' }) + return $request.get({ url: '/pc/articleCenter' }) } /** diff --git a/pc/api/user.ts b/pc/api/user.ts index c2a45913..bce9100b 100644 --- a/pc/api/user.ts +++ b/pc/api/user.ts @@ -9,7 +9,7 @@ export function getUserInfo() { // 个人编辑 export function userEdit(params: any) { - return $request.post({ url: '/user/setInfo', params }) + return $request.post({ url: '/user/edit', params }) } // 绑定手机 @@ -20,17 +20,7 @@ export function userBindMobile(params: any, headers?: any) { ) } -// 微信电话 -export function userMnpMobile(params: any) { - return $request.post({ url: '/user/getMobileByMnp', params }) -} - // 更改密码 export function userChangePwd(params: any) { - return $request.post({ url: '/user/changePassword', params }) -} - -//忘记密码 -export function forgotPassword(params: Record) { - return $request.post({ url: '/user/resetPassword', params }) + return $request.post({ url: '/user/changePwd', params }) } diff --git a/pc/app.vue b/pc/app.vue index 5533ae99..8aa3457c 100644 --- a/pc/app.vue +++ b/pc/app.vue @@ -10,17 +10,17 @@ const config = { locale: zhCn } const appStore = useAppStore() -const { pc_title, pc_ico, pc_keywords, pc_desc } = appStore.getWebsiteConfig +const { pcTitle, pcIco, pcKeywords, pcDesc } = appStore.getWebsiteConfig useHead({ - title: pc_title, + title: pcTitle, meta: [ - { name: 'description', content: pc_desc }, - { name: 'keywords', content: pc_keywords } + { name: 'description', content: pcDesc }, + { name: 'keywords', content: pcKeywords } ], link: [ { rel: 'icon', - href: pc_ico + href: pcIco } ] }) diff --git a/pc/components/cropper-upload/index.vue b/pc/components/cropper-upload/index.vue index 1c837fbf..d87f979e 100644 --- a/pc/components/cropper-upload/index.vue +++ b/pc/components/cropper-upload/index.vue @@ -65,7 +65,7 @@ const handleConfirmCropper = () => { }) const data = await uploadImage({ file: imgFile }) state.cropperVisible = false - emit('change', data.uri) + emit('change', data.path) uploadRef.value?.clearFiles() }) } diff --git a/pc/layouts/components/account/bind-mobile.vue b/pc/layouts/components/account/bind-mobile.vue index d0ad795c..a80ffb3d 100644 --- a/pc/layouts/components/account/bind-mobile.vue +++ b/pc/layouts/components/account/bind-mobile.vue @@ -80,8 +80,9 @@ const formRules: FormRules = { ] } const hasMobile = computed(() => !!userStore.userInfo.mobile) + const formData = reactive({ - type: hasMobile ? 'change' : 'bind', + type: hasMobile.value ? 'change' : 'bind', mobile: '', code: '' }) @@ -89,7 +90,7 @@ const formData = reactive({ const sendSms = async () => { await formRef.value?.validateField(['mobile']) await smsSend({ - scene: hasMobile ? SMSEnum.CHANGE_MOBILE : SMSEnum.BIND_MOBILE, + scene: hasMobile.value ? SMSEnum.CHANGE_MOBILE : SMSEnum.BIND_MOBILE, mobile: formData.mobile }) verificationCodeRef.value?.start() diff --git a/pc/layouts/components/account/forgot-pwd.vue b/pc/layouts/components/account/forgot-pwd.vue index be2f5c95..b09d194e 100644 --- a/pc/layouts/components/account/forgot-pwd.vue +++ b/pc/layouts/components/account/forgot-pwd.vue @@ -46,9 +46,9 @@ show-password /> - + () const verificationCodeRef = shallowRef() const formRules: FormRules = { @@ -119,7 +120,7 @@ const formRules: FormRules = { trigger: ['change', 'blur'] } ], - password_confirm: [ + passwordConfirm: [ { validator(rule: any, value: any, callback: any) { if (value === '') { @@ -138,7 +139,7 @@ const formData = reactive({ mobile: '', password: '', code: '', - password_confirm: '' + passwordConfirm: '' }) const sendSms = async () => { @@ -153,6 +154,8 @@ const sendSms = async () => { const handleConfirm = async () => { await formRef.value?.validate() await forgotPassword(formData) + feedback.msgSuccess('操作成功') + userStore.logout() setPopupType(PopupTypeEnum.LOGIN) } const { lockFn: handleConfirmLock, isLock } = useLockFn(handleConfirm) diff --git a/pc/layouts/components/account/login.vue b/pc/layouts/components/account/login.vue index bc7afb3f..122aa8d7 100644 --- a/pc/layouts/components/account/login.vue +++ b/pc/layouts/components/account/login.vue @@ -278,7 +278,7 @@ const handleLogin = async () => { params.code = formData.code } const data = await login(params) - if (isForceBindMobile.value && !data.mobile) { + if (isForceBindMobile.value && !data.isBindMobile) { userStore.temToken = data.token setPopupType(PopupTypeEnum.BIND_MOBILE) return diff --git a/pc/layouts/components/account/register.vue b/pc/layouts/components/account/register.vue index c3a8d926..bf52c468 100644 --- a/pc/layouts/components/account/register.vue +++ b/pc/layouts/components/account/register.vue @@ -31,9 +31,9 @@ placeholder="请输入6-20位数字+字母或符号组合" /> - + { diff --git a/pc/layouts/components/header/logo.vue b/pc/layouts/components/header/logo.vue index 17d5ba09..b9bde141 100644 --- a/pc/layouts/components/header/logo.vue +++ b/pc/layouts/components/header/logo.vue @@ -1,6 +1,6 @@