diff --git a/admin/src/api/setting/search.ts b/admin/src/api/setting/search.ts new file mode 100644 index 00000000..eba0c814 --- /dev/null +++ b/admin/src/api/setting/search.ts @@ -0,0 +1,29 @@ +import request from '@/utils/request' + +/** + * @return { Promise } + * @description 获取热门搜索数据 + */ +export function getSearch() { + return request.get({ url: '/setting/search/detail' }) +} + +export interface List { + name: string // 搜索关键字 + sort: number // 热门搜索排序 +} + +export interface Search { + isHotSearch: number // 是否开启搜索0/1 + list: List[] +} +/** + * @return { Promise } + * @param { Search } Search + * @description 设置热门搜索 + */ +export function setSearch(params: Search) { + return request.post({ url: '/setting/search/save', params }) +} + + diff --git a/admin/src/views/channel/wx_oa/menu.vue b/admin/src/views/channel/wx_oa/menu.vue index aac222e4..8bcba3ec 100644 --- a/admin/src/views/channel/wx_oa/menu.vue +++ b/admin/src/views/channel/wx_oa/menu.vue @@ -12,13 +12,13 @@ - 保存 + 保存 diff --git a/admin/src/views/setting/search/index.vue b/admin/src/views/setting/search/index.vue new file mode 100644 index 00000000..45663f6b --- /dev/null +++ b/admin/src/views/setting/search/index.vue @@ -0,0 +1,176 @@ + + + + + \ No newline at end of file diff --git a/admin/src/views/setting/user/login_register.vue b/admin/src/views/setting/user/login_register.vue index 32d54090..d9d8f636 100644 --- a/admin/src/views/setting/user/login_register.vue +++ b/admin/src/views/setting/user/login_register.vue @@ -126,29 +126,37 @@ const rules = reactive({ openOtherAuth: [{ required: true, trigger: "blur" }], }); -// 获取备案信息 +// 获取登录注册数据 const getData = async () => { - const data = await getLogin(); - for (const key in formData) { - //@ts-ignore - formData[key] = data[key]; + try { + const data = await getLogin(); + for (const key in formData) { + //@ts-ignore + formData[key] = data[key]; + } + } catch (error) { + console.log('获取=>', error) } }; -// 设置备案信息 +// 保存登录注册数据 const handleSubmit = async () => { const loginWay = formData.loginWay.join('') const autoLoginAuth = formData.autoLoginAuth.join('') await formRef.value?.validate(); - await setLogin({ - ...formData, - loginWay: loginWay.length == 2 ? `${loginWay[0]},${loginWay[1]}` : loginWay, - autoLoginAuth: autoLoginAuth.length == 2 ? `${autoLoginAuth[0]},${autoLoginAuth[1]}` : autoLoginAuth, + try { + await setLogin({ + ...formData, + loginWay: loginWay.length == 2 ? `${loginWay[0]},${loginWay[1]}` : loginWay, + autoLoginAuth: autoLoginAuth.length == 2 ? `${autoLoginAuth[0]},${autoLoginAuth[1]}` : autoLoginAuth, - }); - feedback.msgSuccess("操作成功"); - getData(); + }); + feedback.msgSuccess("操作成功"); + getData(); + } catch (error) { + console.log('保存=>', error) + } }; getData(); diff --git a/admin/src/views/setting/user/setup.vue b/admin/src/views/setting/user/setup.vue index 00ce3e15..c79b2787 100644 --- a/admin/src/views/setting/user/setup.vue +++ b/admin/src/views/setting/user/setup.vue @@ -26,27 +26,35 @@