diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue index 6414eaab..ff1a21b1 100644 --- a/src/components/DictTag/src/DictTag.vue +++ b/src/components/DictTag/src/DictTag.vue @@ -25,6 +25,10 @@ export default defineComponent({ gutter: { type: String as PropType, default: '5px' + }, + size: { + type: String as PropType, + default: 'small' } }, setup(props) { @@ -71,6 +75,7 @@ export default defineComponent({ return ( // 添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题 import('@/views/member/user/detail/index.vue') + }, + { + path: 'recent/detail/:id', + name: 'MemberRecentDetail', + meta: { + title: '朋友圈详情', + noCache: true, + hidden: true + }, + component: () => import('@/views/member/recent/router/recent.detail.vue') } ] }, diff --git a/src/views/member/feedback/index.vue b/src/views/member/feedback/index.vue index 4b6e7304..2ccdf518 100644 --- a/src/views/member/feedback/index.vue +++ b/src/views/member/feedback/index.vue @@ -2,8 +2,8 @@ - - + @@ -22,10 +22,11 @@ 重置 - + 新增 - 导出 @@ -36,18 +37,21 @@ - - - - + + + + + - @@ -67,6 +71,7 @@ import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' import { FeedbackApi, FeedbackVO } from '@/api/member/feedback' import FeedbackForm from './FeedbackForm.vue' +import { template } from 'lodash-es' /** 用户反馈 列表 */ defineOptions({ name: 'Feedback' }) @@ -78,6 +83,7 @@ const loading = ref(true) // 列表的加载中 const list = ref([]) // 列表的数据 const total = ref(0) // 列表的总页数 const queryParams = reactive({ + memberName: '', pageNo: 1, pageSize: 10, memberId: undefined, diff --git a/src/views/member/recent/RecentForm.vue b/src/views/member/recent/RecentForm.vue index ec586f6b..0397ca2b 100644 --- a/src/views/member/recent/RecentForm.vue +++ b/src/views/member/recent/RecentForm.vue @@ -1,12 +1,6 @@ - - + + - + - {{ user.name || '空' }} + {{ user.name || '未知' }} +