diff --git a/admin/src/views/article/lists/edit.vue b/admin/src/views/article/lists/edit.vue index dfffd3a8..d5b27d04 100644 --- a/admin/src/views/article/lists/edit.vue +++ b/admin/src/views/article/lists/edit.vue @@ -4,13 +4,7 @@ - +
@@ -19,17 +13,9 @@
- - + + @@ -91,7 +77,7 @@ import type { FormInstance } from 'element-plus' import feedback from '@/utils/feedback' import { useDictOptions } from '@/hooks/useDictOptions' -import { articleCateAll, articleDetail, articleEdit } from '@/api/article' +import { articleCateAll, articleDetail, articleEdit, articleAdd } from '@/api/article' const route = useRoute() const router = useRouter() @@ -105,7 +91,7 @@ const formData = reactive({ content: '', visit: 0, sort: 0, - isShow: '', + isShow: 1, summary: '' }) @@ -135,7 +121,11 @@ const { optionsData } = useDictOptions<{ const handleSave = async () => { await formRef.value?.validate() - await articleEdit(formData) + if (route.query.id) { + await articleEdit(formData) + } else { + await articleAdd(formData) + } feedback.msgSuccess('操作成功') router.back() } diff --git a/app/src/api/app.ts b/app/src/api/app.ts index ccaab74c..1a9da580 100644 --- a/app/src/api/app.ts +++ b/app/src/api/app.ts @@ -8,3 +8,7 @@ export function smsSend(data: any) { export function getConfig() { return request.get({ url: '/config' }) } + +export function getPolicy(data: any) { + return request.get({ url: '/policy', data: data }) +} diff --git a/app/src/api/user.ts b/app/src/api/user.ts index 8b8af224..84a2384a 100644 --- a/app/src/api/user.ts +++ b/app/src/api/user.ts @@ -3,3 +3,24 @@ import request from '@/utils/request' export function getUserCenter() { return request.get({ url: '/user/center' }) } + +// 个人信息 +export function getUserInfo() { + return request.get({ url: '/user/info' }) +} + +// 个人编辑 +export function userEdit(data: any) { + return request.post({ url: '/user/edit', data: data }) +} + +// 绑定手机 +export function userBindMobile(data: any) { + return request.post({ url: '/user/bindMobile', data: data }) +} + +// 微信电话 +export function userMnpMobile(data: any) { + return request.post({ url: '/user/mnpMobile', data: data }) +} + diff --git a/app/src/components/news-card/news-card.vue b/app/src/components/news-card/news-card.vue index 66347442..29c88202 100644 --- a/app/src/components/news-card/news-card.vue +++ b/app/src/components/news-card/news-card.vue @@ -11,7 +11,7 @@ {{ item.createTime }} - + {{ item.visit }} diff --git a/app/src/enums/agreementEnums.ts b/app/src/enums/agreementEnums.ts new file mode 100644 index 00000000..a49c4f1c --- /dev/null +++ b/app/src/enums/agreementEnums.ts @@ -0,0 +1,6 @@ +//菜单主题类型 +export enum AgreementEnum { + PRIVACY = 'privacy', + SERVICE = 'service' +} + diff --git a/app/src/pages.json b/app/src/pages.json index f916abae..4516a40e 100644 --- a/app/src/pages.json +++ b/app/src/pages.json @@ -48,6 +48,12 @@ "navigationBarTitleText": "详情" } }, + { + "path": "pages/user_set/user_set", + "style": { + "navigationBarTitleText": "个人设置" + } + }, { "path": "pages/collection/collection", "style": { @@ -55,6 +61,30 @@ }, "auth": true }, + { + "path": "pages/as_us/as_us", + "style": { + "navigationBarTitleText": "关于我们" + } + }, + { + "path": "pages/agreement/agreement", + "style": { + "navigationBarTitleText": "协议" + } + }, + { + "path": "pages/change_password/change_password", + "style": { + "navigationBarTitleText": "修改密码" + } + }, + { + "path": "pages/user_data/user_data", + "style": { + "navigationBarTitleText": "个人资料" + } + }, { "path": "pages/search/search", "style": { diff --git a/app/src/pages/agreement/agreement.vue b/app/src/pages/agreement/agreement.vue new file mode 100644 index 00000000..7a646e23 --- /dev/null +++ b/app/src/pages/agreement/agreement.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/app/src/pages/as_us/as_us.vue b/app/src/pages/as_us/as_us.vue new file mode 100644 index 00000000..43f4988c --- /dev/null +++ b/app/src/pages/as_us/as_us.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/app/src/pages/change_password/change_password.vue b/app/src/pages/change_password/change_password.vue new file mode 100644 index 00000000..4d0601bb --- /dev/null +++ b/app/src/pages/change_password/change_password.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/app/src/pages/news/component/news-list.vue b/app/src/pages/news/component/news-list.vue index 08585786..f585803a 100644 --- a/app/src/pages/news/component/news-list.vue +++ b/app/src/pages/news/component/news-list.vue @@ -1,6 +1,5 @@