diff --git a/src/api/system/operatelog/index.ts b/src/api/system/operatelog/index.ts index 0ebe0d33..e5d3d364 100644 --- a/src/api/system/operatelog/index.ts +++ b/src/api/system/operatelog/index.ts @@ -42,7 +42,7 @@ export type OperateLogV2VO = { creator: string creatorName: string createTime: Date - // 数据扩展-渲染时使用 + // 数据扩展,渲染时使用 title: string // 操作标题(如果为空则取 name 值) colSize: number // 变更记录行数 contentStrList: string[] diff --git a/src/components/AppLinkInput/data.ts b/src/components/AppLinkInput/data.ts index fe6bb291..36412565 100644 --- a/src/components/AppLinkInput/data.ts +++ b/src/components/AppLinkInput/data.ts @@ -157,10 +157,6 @@ export const APP_LINK_GROUP_LIST = [ name: '分销中心', path: '/pages/commission/index' }, - { - name: '申请分销商', - path: '/pages/commission/apply' - }, { name: '推广商品', path: '/pages/commission/goods' @@ -169,10 +165,6 @@ export const APP_LINK_GROUP_LIST = [ name: '分销订单', path: '/pages/commission/order' }, - { - name: '分享记录', - path: '/pages/commission/share-log' - }, { name: '我的团队', path: '/pages/commission/team' @@ -193,10 +185,6 @@ export const APP_LINK_GROUP_LIST = [ { name: '申请提现', path: '/pages/pay/withdraw' - }, - { - name: '提现记录', - path: '/pages/pay/withdraw-log' } ] }, diff --git a/src/components/OperateLogV2/src/OperateLogV2.vue b/src/components/OperateLogV2/src/OperateLogV2.vue index cb5663b2..e3409276 100644 --- a/src/components/OperateLogV2/src/OperateLogV2.vue +++ b/src/components/OperateLogV2/src/OperateLogV2.vue @@ -49,10 +49,13 @@ import { formatDate } from '@/utils/formatTime' import { DICT_TYPE, getDictLabel, getDictObj } from '@/utils/dict' import { ElTag } from 'element-plus' +defineOptions({ name: 'OperateLogV2' }) + const props = defineProps<{ logList: OperateLogV2VO[] // 操作日志列表 }>() -defineOptions({ name: 'OperateLogV2' }) + +const logDataList = ref([]) // 操作日志列表 /** 获得 userType 颜色 */ const getUserTypeColor = (type: number) => { @@ -69,7 +72,7 @@ const getUserTypeColor = (type: number) => { } return '#409EFF' } -const logDataList = ref([]) // 操作日志列表 + // 提取 tag 所需内容和位置 const renderTags = (content: string) => { let newStr = unref(content).slice() // 去掉引用 @@ -89,6 +92,7 @@ const renderTags = (content: string) => { }) return [newStr.split(fg), matchStr] } + const initLog = () => { logDataList.value = props.logList.map((logItem) => { const keyValue = renderTags(logItem.action) @@ -105,6 +109,7 @@ const initLog = () => { return logItem }) } + watch( () => props.logList.length, (newObj) => {