diff --git a/apps/web-antd/src/views/mall/trade/order/index.vue b/apps/web-antd/src/views/mall/trade/order/index.vue index 84387940e..dbd2e2145 100644 --- a/apps/web-antd/src/views/mall/trade/order/index.vue +++ b/apps/web-antd/src/views/mall/trade/order/index.vue @@ -117,7 +117,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ {{ property.propertyName }} : {{ property.valueName }} diff --git a/apps/web-antd/src/views/member/user/detail/index.vue b/apps/web-antd/src/views/member/user/detail/index.vue index 991c3fa49..b0c0d322f 100644 --- a/apps/web-antd/src/views/member/user/detail/index.vue +++ b/apps/web-antd/src/views/member/user/detail/index.vue @@ -20,6 +20,7 @@ import AddressList from './modules/address-list.vue'; import BalanceList from './modules/balance-list.vue'; import BasicInfo from './modules/basic-info.vue'; import ExperienceRecordList from './modules/experience-record-list.vue'; +import OrderList from './modules/order-list.vue'; import PointList from './modules/point-list.vue'; import SignList from './modules/sign-list.vue'; @@ -100,10 +101,7 @@ onMounted(async () => { - - - 订单管理 - + diff --git a/apps/web-antd/src/views/member/user/detail/modules/account-info.vue b/apps/web-antd/src/views/member/user/detail/modules/account-info.vue index d148e5158..1bc7a0c9c 100644 --- a/apps/web-antd/src/views/member/user/detail/modules/account-info.vue +++ b/apps/web-antd/src/views/member/user/detail/modules/account-info.vue @@ -8,7 +8,7 @@ import { Card } from 'ant-design-vue'; import { useDescription } from '#/components/description'; -withDefaults( +const props = withDefaults( defineProps<{ mode?: 'kefu' | 'member'; user: MemberUserApi.User; @@ -20,6 +20,8 @@ withDefaults( ); const [Descriptions] = useDescription({ + bordered: false, + column: props.mode === 'member' ? 2 : 1, schema: [ { field: 'levelName', diff --git a/apps/web-antd/src/views/member/user/detail/modules/basic-info.vue b/apps/web-antd/src/views/member/user/detail/modules/basic-info.vue index e19dd298f..c3a8b4294 100644 --- a/apps/web-antd/src/views/member/user/detail/modules/basic-info.vue +++ b/apps/web-antd/src/views/member/user/detail/modules/basic-info.vue @@ -11,7 +11,7 @@ import { Avatar, Card, Col, Row } from 'ant-design-vue'; import { useDescription } from '#/components/description'; import { DictTag } from '#/components/dict-tag'; -withDefaults( +const props = withDefaults( defineProps<{ mode?: 'kefu' | 'member'; user: MemberUserApi.User }>(), { mode: 'member', @@ -19,6 +19,8 @@ withDefaults( ); const [Descriptions] = useDescription({ + bordered: false, + column: props.mode === 'member' ? 2 : 1, schema: [ { field: 'name', @@ -35,10 +37,10 @@ const [Descriptions] = useDescription({ { field: 'sex', label: '性别', - content: (data) => + render: (val) => h(DictTag, { type: DICT_TYPE.SYSTEM_USER_SEX, - value: data.sex, + value: val, }), }, { @@ -52,17 +54,17 @@ const [Descriptions] = useDescription({ { field: 'birthday', label: '生日', - content: (data) => formatDate(data.birthday)?.toString() || '-', + render: (val) => formatDate(val)?.toString() || '-', }, { field: 'createTime', label: '注册时间', - content: (data) => formatDate(data.createTime)?.toString() || '-', + render: (val) => formatDate(val)?.toString() || '-', }, { field: 'loginDate', label: '最后登录时间', - content: (data) => formatDate(data.loginDate)?.toString() || '-', + render: (val) => formatDate(val)?.toString() || '-', }, ], }); diff --git a/apps/web-antd/src/views/member/user/detail/modules/order-list.vue b/apps/web-antd/src/views/member/user/detail/modules/order-list.vue new file mode 100644 index 000000000..23b5e1b30 --- /dev/null +++ b/apps/web-antd/src/views/member/user/detail/modules/order-list.vue @@ -0,0 +1,128 @@ + + + + + + + + + + + {{ item.spuName }} + + {{ property.propertyName }} : {{ property.valueName }} + + + + + + + {{ + `原价:${fenToYuan(item.price)} 元 / 数量:${item.count} 个` + }} + | + + + + + + + + + + + + diff --git a/apps/web-ele/src/views/mall/trade/order/index.vue b/apps/web-ele/src/views/mall/trade/order/index.vue index ac9a14238..c19b0fdf4 100644 --- a/apps/web-ele/src/views/mall/trade/order/index.vue +++ b/apps/web-ele/src/views/mall/trade/order/index.vue @@ -122,7 +122,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ {{ item.spuName }} @@ -133,7 +133,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ class="flex items-center justify-between text-xs text-gray-500" > - 原价:{{ fenToYuan(item.price) }} 元 / 数量:{{ + 原价:{{ fenToYuan(item.price!) }} 元 / 数量:{{ item.count }}个 diff --git a/apps/web-ele/src/views/member/user/detail/index.vue b/apps/web-ele/src/views/member/user/detail/index.vue index 19d3b5e69..1fdb3d4ff 100644 --- a/apps/web-ele/src/views/member/user/detail/index.vue +++ b/apps/web-ele/src/views/member/user/detail/index.vue @@ -19,6 +19,7 @@ import AccountInfo from './modules/account-info.vue'; import BalanceList from './modules/balance-list.vue'; import BasicInfo from './modules/basic-info.vue'; import ExperienceRecordList from './modules/experience-record-list.vue'; +import OrderList from './modules/order-list.vue'; import PointList from './modules/point-list.vue'; import SignList from './modules/sign-list.vue'; import UserAddressList from './modules/user-address-list.vue'; @@ -26,7 +27,6 @@ import UserAfterSaleList from './modules/user-after-sale-list.vue'; import UserBrokerageList from './modules/user-brokerage-list.vue'; import UserCouponList from './modules/user-coupon-list.vue'; import UserFavoriteList from './modules/user-favorite-list.vue'; -import UserOrderList from './modules/user-order-list.vue'; const route = useRoute(); const { closeCurrentTab, refreshTab } = useTabs(); @@ -70,6 +70,7 @@ onMounted(async () => { + 基本信息 @@ -106,10 +107,7 @@ onMounted(async () => { - - - - + diff --git a/apps/web-ele/src/views/member/user/detail/modules/account-info.vue b/apps/web-ele/src/views/member/user/detail/modules/account-info.vue index f95cccad4..352cdfed7 100644 --- a/apps/web-ele/src/views/member/user/detail/modules/account-info.vue +++ b/apps/web-ele/src/views/member/user/detail/modules/account-info.vue @@ -22,7 +22,6 @@ const props = withDefaults( const [Descriptions] = useDescription({ border: false, column: props.mode === 'member' ? 2 : 1, - labelWidth: 140, schema: [ { field: 'levelName', diff --git a/apps/web-ele/src/views/member/user/detail/modules/basic-info.vue b/apps/web-ele/src/views/member/user/detail/modules/basic-info.vue index 55f1e0d9c..d2c33e1a6 100644 --- a/apps/web-ele/src/views/member/user/detail/modules/basic-info.vue +++ b/apps/web-ele/src/views/member/user/detail/modules/basic-info.vue @@ -21,7 +21,6 @@ const props = withDefaults( const [Descriptions] = useDescription({ border: false, column: props.mode === 'member' ? 2 : 1, - labelWidth: 140, schema: [ { field: 'name', diff --git a/apps/web-ele/src/views/member/user/detail/modules/order-list.vue b/apps/web-ele/src/views/member/user/detail/modules/order-list.vue new file mode 100644 index 000000000..37b562b51 --- /dev/null +++ b/apps/web-ele/src/views/member/user/detail/modules/order-list.vue @@ -0,0 +1,133 @@ + + + + + + + + + + + + + {{ item.spuName }} + + {{ property.propertyName }}: {{ property.valueName }} + + + + + 原价:{{ fenToYuan(item.price!) }} 元 / 数量:{{ item.count }}个 + + + + + + + + + + + + diff --git a/apps/web-ele/src/views/member/user/detail/modules/user-order-list.vue b/apps/web-ele/src/views/member/user/detail/modules/user-order-list.vue deleted file mode 100644 index c00784265..000000000 --- a/apps/web-ele/src/views/member/user/detail/modules/user-order-list.vue +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - {{ item.spuName }} - - {{ property.propertyName }}: {{ property.valueName }} - - - - - 原价:{{ fenToYuan(item.price) }} 元 / 数量:{{ item.count }} 个 - - - - - - - - - - - - -