修改和精简代码

This commit is contained in:
mkm 2024-01-20 22:43:00 +08:00
parent 01bdcd0b59
commit 3a8551d6a4
11 changed files with 21 additions and 755 deletions

View File

@ -2,38 +2,38 @@ import request from '@/utils/request'
// 字典类型列表
export function dictTypeLists(params: any) {
return request.get({ url: '/setting.dict.dict_type/lists', params })
return request.get({ url: '/setting/dict/DictType/lists', params })
}
// 字典类型列表全部
export function dictTypeAll(params: any) {
return request.get({ url: '/setting.dict.dict_type/all', params })
return request.get({ url: '/setting/dict/DictType/all', params })
}
// 添加字典类型
export function dictTypeAdd(params: any) {
return request.post({ url: '/setting.dict.dict_type/add', params })
return request.post({ url: '/setting/dict/DictType/add', params })
}
// 编辑字典类型
export function dictTypeEdit(params: any) {
return request.post({ url: '/setting.dict.dict_type/edit', params })
return request.post({ url: '/setting/dict/DictType/edit', params })
}
// 删除字典类型
export function dictTypeDelete(params: any) {
return request.post({ url: '/setting.dict.dict_type/delete', params })
return request.post({ url: '/setting/dict/DictType/delete', params })
}
// 字典类型详情
export function dictTypeDetail(params: any) {
return request.get({ url: '/setting.dict.dict_type/detail', params })
return request.get({ url: '/setting/dict/DictType/detail', params })
}
// 字典数据列表
export function dictDataLists(params: any) {
return request.get(
{ url: '/setting.dict.dict_data/lists', params },
{ url: '/setting/dict/DictData/lists', params },
{
ignoreCancelToken: true
}
@ -42,20 +42,20 @@ export function dictDataLists(params: any) {
// 添加字典数据
export function dictDataAdd(params: any) {
return request.post({ url: '/setting.dict.dict_data/add', params })
return request.post({ url: '/setting/dict/DictData/add', params })
}
// 编辑字典数据
export function dictDataEdit(params: any) {
return request.post({ url: '/setting.dict.dict_data/edit', params })
return request.post({ url: '/setting/dict/DictData/edit', params })
}
// 删除字典数据
export function dictDataDelete(params: any) {
return request.post({ url: '/setting.dict.dict_data/delete', params })
return request.post({ url: '/setting/dict/DictData/delete', params })
}
// 字典数据详情
export function dictDataDetail(params: any) {
return request.get({ url: '/setting.dict.dict_data/detail', params })
return request.get({ url: '/setting/dict/DictData/detail', params })
}

View File

@ -2,50 +2,50 @@ import request from '@/utils/request'
// 代码生成已选数据表列表接口
export function generateTable(params: any) {
return request.get({ url: '/tools.generator/generateTable', params })
return request.get({ url: '/tools/generator/generateTable', params })
}
// 数据表列表接口
export function dataTable(params: any) {
return request.get({ url: '/tools.generator/dataTable', params })
return request.get({ url: '/tools/generator/dataTable', params })
}
//选择要生成代码的数据表
export function selectTable(params: any) {
return request.post({ url: '/tools.generator/selectTable', params })
return request.post({ url: '/tools/generator/selectTable', params })
}
// 已选择的数据表详情
export function tableDetail(params: any) {
return request.get({ url: '/tools.generator/detail', params })
return request.get({ url: '/tools/generator/detail', params })
}
//同步字段
export function syncColumn(params: any) {
return request.post({ url: '/tools.generator/syncColumn', params })
return request.post({ url: '/tools/generator/syncColumn', params })
}
//删除已选择的数据表
export function generateDelete(params: any) {
return request.post({ url: '/tools.generator/delete', params })
return request.post({ url: '/tools/generator/delete', params })
}
//编辑已选表字段
export function generateEdit(params: any) {
return request.post({ url: '/tools.generator/edit', params })
return request.post({ url: '/tools/generator/edit', params })
}
//预览代码
export function generatePreview(params: any) {
return request.post({ url: '/tools.generator/preview', params })
return request.post({ url: '/tools/generator/preview', params })
}
//生成代码
export function generateCode(params: any) {
return request.post({ url: '/tools.generator/generate', params })
return request.post({ url: '/tools/generator/generate', params })
}
//获取模型
export function getModels() {
return request.get({ url: '/tools.generator/getModels' })
return request.get({ url: '/tools/generator/getModels' })
}

View File

@ -1,42 +0,0 @@
<template>
<div class="custom-link mt-[30px]">
<div class="flex flex-wrap items-center">
自定义链接
<div class="ml-4 flex-1 min-w-[100px]">
<el-input
:model-value="modelValue.query?.url"
placeholder="请输入链接地址"
@input="handleInput"
/>
</div>
</div>
<div class="form-tips">
请填写完整的带有https://http://
</div>
</div>
</template>
<script lang="ts" setup>
import type { PropType } from 'vue'
import { LinkTypeEnum, type Link } from '.'
defineProps({
modelValue: {
type: Object as PropType<Link>,
default: () => ({})
}
})
const emit = defineEmits<{
(event: 'update:modelValue', value: Link): void
}>()
const handleInput = (value: string) => {
emit('update:modelValue', {
path: '/pages/webview/webview',
query: {
url: value
},
type: LinkTypeEnum.CUSTOM_LINK
})
}
</script>

View File

@ -1,11 +0,0 @@
export enum LinkTypeEnum {
'SHOP_PAGES' = 'shop',
'CUSTOM_LINK' = 'custom'
}
export interface Link {
path: string
name?: string
type: string
query?: Record<string, any>
}

View File

@ -1,96 +0,0 @@
<template>
<div class="link flex">
<el-menu
:default-active="activeMenu"
class="w-[160px] min-h-[350px] link-menu"
@select="handleSelect"
>
<el-menu-item v-for="(item, index) in menus" :index="item.type" :key="index">
<span>{{ item.name }}</span>
</el-menu-item>
</el-menu>
<div class="flex-1 pl-4">
<shop-pages v-model="activeLink" v-if="LinkTypeEnum.SHOP_PAGES == activeMenu" />
<custom-link v-model="activeLink" v-if="LinkTypeEnum.CUSTOM_LINK == activeMenu" />
</div>
</div>
</template>
<script lang="ts" setup>
import type { PropType } from 'vue'
import { LinkTypeEnum, type Link } from '.'
import ShopPages from './shop-pages.vue'
import CustomLink from './custom-link.vue'
const props = defineProps({
modelValue: {
type: Object as PropType<Link>,
required: true
}
})
const emit = defineEmits<{
(event: 'update:modelValue', value: any): void
}>()
const menus = ref([
{
name: '商城页面',
type: LinkTypeEnum.SHOP_PAGES,
link: {}
},
{
name: '自定义链接',
type: LinkTypeEnum.CUSTOM_LINK,
link: {}
}
])
const activeLink = computed({
get() {
return menus.value.find((item) => item.type == activeMenu.value)?.link as Link
},
set(value) {
menus.value.forEach((item) => {
if (item.type == activeMenu.value) {
item.link = value
}
})
}
})
const activeMenu = ref<string>(LinkTypeEnum.SHOP_PAGES)
const handleSelect = (index: string) => {
activeMenu.value = index
}
watch(activeLink, (value) => {
if (!value.type) return
emit('update:modelValue', value)
})
watch(
() => props.modelValue,
(value) => {
activeMenu.value = value.type
activeLink.value = value
},
{
immediate: true
}
)
</script>
<style lang="scss" scoped>
.link-menu {
--el-menu-item-height: 40px;
:deep(.el-menu-item) {
border-color: transparent;
&.is-active {
border-right-width: 2px;
border-color: var(--el-color-primary);
background-color: var(--el-color-primary-light-9);
}
}
}
</style>

View File

@ -1,84 +0,0 @@
<template>
<div class="link-picker flex-1" @click="!disabled && popupRef?.open()">
<el-input :model-value="getLink" placeholder="请选择链接" readonly :disabled="disabled">
<template #suffix>
<icon v-if="!modelValue?.path" name="el-icon-ArrowRight" />
<icon
v-else
name="el-icon-Close"
@click.stop="!disabled && emit('update:modelValue', {})"
/>
</template>
</el-input>
<popup ref="popupRef" width="700px" title="链接选择" @confirm="handleConfirm">
<link-content v-model="activeLink" />
</popup>
</div>
</template>
<script lang="ts" setup>
import { LinkTypeEnum, type Link } from '.'
import LinkContent from './index.vue'
import Popup from '@/components/popup/index.vue'
const props = defineProps({
modelValue: {
type: Object
},
disabled: {
type: Boolean,
default: false
}
})
const emit = defineEmits<{
(event: 'update:modelValue', value: any): void
}>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const activeLink = ref<Link>({ path: '', type: LinkTypeEnum.SHOP_PAGES })
const handleConfirm = () => {
emit('update:modelValue', activeLink.value)
}
const getLink = computed(() => {
switch (props.modelValue?.type) {
case LinkTypeEnum.SHOP_PAGES:
return props.modelValue.name
case LinkTypeEnum.CUSTOM_LINK:
return props.modelValue.query?.url
default:
return props.modelValue?.name
}
})
watch(
() => props.modelValue,
(value) => {
if (value?.type) {
activeLink.value = value as Link
}
},
{
immediate: true
}
)
</script>
<style scoped lang="scss">
.link-picker {
:deep(.el-input) {
&.is-disabled {
.el-input__inner {
cursor: not-allowed;
}
.el-input__suffix {
cursor: not-allowed;
}
}
.el-input__inner {
cursor: pointer;
}
.el-input__suffix {
cursor: pointer;
}
}
}
</style>

View File

@ -1,101 +0,0 @@
<template>
<div class="shop-pages">
<div class="link-list flex flex-wrap">
<div
class="link-item border border-br px-5 py-[5px] rounded-[3px] cursor-pointer mr-[10px] mb-[10px]"
v-for="(item, index) in linkList"
:class="{
'border-primary text-primary':
modelValue.path == item.path && modelValue.name == item.name
}"
:key="index"
@click="handleSelect(item)"
>
{{ item.name }}
</div>
</div>
</div>
</template>
<script lang="ts" setup>
import type { PropType } from 'vue'
import { LinkTypeEnum, type Link } from '.'
defineProps({
modelValue: {
type: Object as PropType<Link>,
default: () => ({})
}
})
const emit = defineEmits<{
(event: 'update:modelValue', value: Link): void
}>()
const linkList = ref([
{
path: '/pages/index/index',
name: '商城首页',
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/news/news',
name: '文章资讯',
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/user/user',
name: '个人中心',
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/collection/collection',
name: '我的收藏',
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/customer_service/customer_service',
name: '联系客服',
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/user_set/user_set',
name: '个人设置',
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/as_us/as_us',
name: '关于我们',
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/user_data/user_data',
name: '个人资料',
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/agreement/agreement',
name: '隐私政策',
query: {
type: 'privacy'
},
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/agreement/agreement',
name: '服务协议',
query: {
type: 'service'
},
type: LinkTypeEnum.SHOP_PAGES
},
{
path: '/pages/search/search',
name: '搜索',
type: LinkTypeEnum.SHOP_PAGES
}
])
const handleSelect = (value: Link) => {
emit('update:modelValue', value)
}
</script>

View File

@ -1,130 +0,0 @@
<template>
<div>
<el-card class="!border-none" shadow="never">
<el-page-header content="编辑通知设置" @back="$router.back()" />
</el-card>
<el-form
ref="formRef"
:model="formData"
label-width="120px"
:rules="rules"
v-loading="loading"
>
<el-card class="!border-none mt-4" shadow="never">
<div class="font-medium mb-7">通知名称</div>
<el-form-item label="通知名称"> {{ formData.scene_name }} </el-form-item>
<el-form-item label="通知类型"> {{ formData.type }} </el-form-item>
<el-form-item label="通知业务"> {{ formData.scene_desc }} </el-form-item>
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<div class="font-medium mb-7">短信通知</div>
<el-form-item label="开启状态" prop="sms_notice.status" required>
<el-radio-group v-model="formData.sms_notice.status">
<el-radio label="0">关闭</el-radio>
<el-radio label="1">开启</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="模板ID" prop="sms_notice.template_id">
<div class="w-80">
<el-input
v-model="formData.sms_notice.template_id"
placeholder="请输入模板ID"
/>
</div>
</el-form-item>
<el-form-item label="短信内容" prop="sms_notice.content">
<div class="flex-1">
<div class="w-full max-w-[320px]">
<el-input
type="textarea"
:autosize="{ minRows: 6, maxRows: 6 }"
v-model="formData.sms_notice.content"
/>
</div>
<div class="form-tips">
<div v-for="(item, index) in formData.sms_notice.tips" :key="index">
{{ item }}
</div>
</div>
</div>
</el-form-item>
</el-card>
</el-form>
<footer-btns>
<el-button type="primary" @click="handleSave">保存</el-button>
</footer-btns>
</div>
</template>
<script lang="ts" setup name="noticeEdit">
import type { FormInstance } from 'element-plus'
import feedback from '@/utils/feedback'
import { noticeDetail, setNoticeConfig } from '@/api/message'
import useMultipleTabs from '@/hooks/useMultipleTabs'
import { pick } from 'lodash'
const route = useRoute()
const router = useRouter()
const loading = ref(false)
const formData = reactive({
id: '',
scene_name: '',
type: '',
scene_desc: '',
sms_notice: {
status: 0,
template_id: '',
content: '',
tips: []
},
oa_notice: {},
mnp_notice: {},
system_notice: {}
})
const rules = {
'sms_notice.template_id': [
{
required: true,
message: '请输入模板ID',
trigger: 'blur'
}
],
'sms_notice.content': [
{
required: true,
message: '请输入短信内容',
trigger: 'blur'
}
]
}
const { removeTab } = useMultipleTabs()
const formRef = shallowRef<FormInstance>()
const getDetails = async () => {
loading.value = true
const data = await noticeDetail({
id: route.query.id
})
Object.keys(data).forEach((key) => {
//@ts-ignore
formData[key] = data[key]
})
loading.value = false
}
const handleSave = async () => {
await formRef.value?.validate()
const data = {
id: formData.id,
template: pick(formData, ['sms_notice', 'oa_notice', 'mnp_notice', 'system_notice'])
}
await setNoticeConfig(data)
feedback.msgSuccess('操作成功')
removeTab()
router.back()
}
route.query.id && getDetails()
</script>

View File

@ -1,86 +0,0 @@
<template>
<div>
<el-card class="!border-none" shadow="never">
<el-alert
type="warning"
title="温馨提示:平台配置在各个场景下的通知发送方式和内容模板"
:closable="false"
show-icon
></el-alert>
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<el-tabs v-model="tabsActive" @tab-change="getLists">
<el-tab-pane
v-for="(item, index) in tabsMap"
:key="index"
:label="item.name"
:name="item.type"
lazy
></el-tab-pane>
</el-tabs>
<el-table size="large" :data="pager.lists" border v-loading="pager.loading">
<el-table-column label="通知场景" prop="scene_name" min-width="120" />
<el-table-column label="通知类型" prop="type_desc" min-width="160" />
<el-table-column label="短信通知" min-width="80">
<template #default="{ row }">
<el-tag v-if="row.sms_notice?.status == 1">开启</el-tag>
<el-tag type="danger" v-else>关闭</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" min-width="80" fixed="right">
<template #default="{ row }">
<el-button v-perms="['notice/notice/set']" type="primary" link>
<router-link
:to="{
path: getRoutePath('notice/notice/set'),
query: {
id: row.id
}
}"
>
设置
</router-link>
</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</div>
</template>
<script lang="ts" setup name="notice">
import { noticeLists } from '@/api/message'
import { usePaging } from '@/hooks/usePaging'
import { getRoutePath } from '@/router'
enum NoticeEnums {
USER = 1,
PLATFORM = 2
}
const tabsActive = ref(NoticeEnums.USER)
const tabsMap = [
{
name: '通知用户',
type: NoticeEnums.USER
},
{
name: '通知平台',
type: NoticeEnums.PLATFORM
}
]
//
const params = reactive({
recipient: tabsActive
})
const { pager, getLists } = usePaging({
fetchFun: noticeLists,
params
})
onActivated(() => {
getLists()
})
getLists()
</script>

View File

@ -1,128 +0,0 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
title="设置短信"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item label="短信渠道">
<div>
{{ formData.name }}
</div>
</el-form-item>
<el-form-item label="短信签名" prop="sign">
<el-input v-model="formData.sign" placeholder="请输入短信签名" />
</el-form-item>
<el-form-item label="APP_KEY" prop="app_key" v-if="formData.type == 'ali'">
<el-input v-model="formData.app_key" placeholder="请输入APP_KEY" />
</el-form-item>
<el-form-item label="APP_ID" prop="app_id" v-if="formData.type == 'tencent'">
<el-input v-model="formData.app_id" placeholder="请输入APP_ID" />
</el-form-item>
<el-form-item label="SECRET_ID" prop="secret_id" v-if="formData.type == 'tencent'">
<el-input v-model="formData.secret_id" placeholder="请输入SECRET_ID" />
</el-form-item>
<el-form-item label="SECRET_KEY" prop="secret_key">
<el-input v-model="formData.secret_key" placeholder="请输入SECRET_KEY" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="0">关闭</el-radio>
<el-radio :label="1">开启</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup>
import { setSmsConfig, smsDetail } from '@/api/message'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
const emit = defineEmits(['success'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const formData = reactive({
name: '',
type: '',
sign: '',
app_key: '',
app_id: '',
secret_key: '',
secret_id: '',
status: 0
})
const formRules = {
sign: [
{
required: true,
message: '请输入短信签名',
trigger: 'blur'
}
],
app_id: [
{
required: true,
message: '请输入APP_ID',
trigger: 'blur'
}
],
app_key: [
{
required: true,
message: '请输入APP_KEY',
trigger: 'blur'
}
],
secret_key: [
{
required: true,
message: '请输入SECRET_KEY',
trigger: 'blur'
}
],
secret_id: [
{
required: true,
message: '请输入SECRET_ID',
trigger: 'blur'
}
]
}
const handleSubmit = async () => {
await formRef.value?.validate()
await setSmsConfig(formData)
popupRef.value?.close()
emit('success')
}
const getDetail = async () => {
const data = await smsDetail({
type: formData.type
})
for (const key in data) {
//@ts-ignore
formData[key] = data[key]
}
}
const open = (type: string) => {
formData.type = type
popupRef.value?.open()
getDetail()
}
const handleClose = () => {
formRef.value?.resetFields()
}
defineExpose({
open
})
</script>

View File

@ -1,56 +0,0 @@
<template>
<div>
<el-card class="!border-none" shadow="never" v-loading="state.loading">
<el-table size="large" border :data="state.lists">
<el-table-column label="短信渠道" prop="name" min-width="120" />
<el-table-column label="状态" min-width="120">
<template #default="{ row }">
<el-tag v-if="row.status == 1">开启</el-tag>
<el-tag type="danger" v-else>关闭</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" min-width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['notice/SmsConfig/setConfig']"
type="primary"
link
@click="handleSet(row.type)"
>
设置
</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<edit-popup ref="editRef" @success="getLists" />
</div>
</template>
<script lang="ts" setup name="shortLetter">
import { smsLists } from '@/api/message'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const state = reactive({
loading: false,
lists: []
})
//
const getLists = async () => {
try {
state.loading = true
state.lists = await smsLists()
state.loading = false
} catch (error) {
state.loading = false
}
}
const handleSet = (alias: string) => {
editRef.value?.open(alias)
}
getLists()
</script>