diff --git a/apps/web-ele/src/views/mall/trade/order/data.ts b/apps/web-ele/src/views/mall/trade/order/data.ts
index f1d671d9c..3ec9e5e3b 100644
--- a/apps/web-ele/src/views/mall/trade/order/data.ts
+++ b/apps/web-ele/src/views/mall/trade/order/data.ts
@@ -77,10 +77,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
component: 'ApiSelect',
componentProps: {
api: getSimpleDeliveryExpressList,
- fieldNames: {
- label: 'name',
- value: 'id',
- },
+ labelField: 'name',
+ valueField: 'id',
placeholder: '请选择快递公司',
clearable: true,
},
@@ -315,6 +313,8 @@ export function usePriceFormSchema(): VbenFormSchema[] {
placeholder: '请输入订单调价',
step: 0.1,
precision: 2,
+ controlsPosition: 'right',
+ class: '!w-full',
},
help: '订单调价。 正数,加价;负数,减价',
rules: 'required',
@@ -431,10 +431,8 @@ export function useDeliveryFormSchema(): VbenFormSchema[] {
component: 'ApiSelect',
componentProps: {
api: getSimpleDeliveryExpressList,
- fieldNames: {
- label: 'name',
- value: 'id',
- },
+ labelField: 'name',
+ valueField: 'id',
placeholder: '请选择物流公司',
},
dependencies: {
diff --git a/apps/web-ele/src/views/mall/trade/order/detail/index.vue b/apps/web-ele/src/views/mall/trade/order/detail/index.vue
index 7fc9ce5cb..9efb70aef 100644
--- a/apps/web-ele/src/views/mall/trade/order/detail/index.vue
+++ b/apps/web-ele/src/views/mall/trade/order/detail/index.vue
@@ -25,8 +25,8 @@ import * as TradeOrderApi from '#/api/mall/trade/order';
import { DictTag } from '#/components/dict-tag';
import { TableAction } from '#/components/table-action';
-import DeliveryForm from '../modules/delivery-form.vue';
import AddressForm from '../modules/address-form.vue';
+import DeliveryForm from '../modules/delivery-form.vue';
import PriceForm from '../modules/price-form.vue';
import RemarkForm from '../modules/remark-form.vue';
import {
@@ -374,27 +374,19 @@ onMounted(async () => {
优惠劵优惠:
- {{ fenToYuan(order.couponPrice ?? 0) }} 元
+ {{ fenToYuan(order.couponPrice ?? 0) }} 元
VIP 优惠:
- {{ fenToYuan(order.vipPrice ?? 0) }} 元
+ {{ fenToYuan(order.vipPrice ?? 0) }} 元
活动优惠:
- {{ fenToYuan(order.discountPrice ?? 0) }} 元
+ {{ fenToYuan(order.discountPrice ?? 0) }} 元
积分抵扣:
- {{ fenToYuan(order.pointPrice ?? 0) }} 元
+ {{ fenToYuan(order.pointPrice ?? 0) }} 元
应付金额:
@@ -426,10 +418,8 @@ onMounted(async () => {
收货地址:
- {{ order.receiverAreaName }}
- {{ order.receiverDetailAddress }}
+ {{ order.receiverAreaName }}
+ {{ order.receiverDetailAddress }}
发货时间:
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 281cd50e7..60b3923d7 100644
--- a/apps/web-ele/src/views/mall/trade/order/index.vue
+++ b/apps/web-ele/src/views/mall/trade/order/index.vue
@@ -109,11 +109,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
-
+
@@ -121,8 +117,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
{{ item.spuName }}
@@ -149,6 +145,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
:actions="[
{
label: $t('common.detail'),
+ type: 'primary',
link: true,
icon: ACTION_ICON.VIEW,
auth: ['trade:order:query'],
@@ -158,6 +155,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
:drop-down-actions="[
{
label: '发货',
+ type: 'primary',
link: true,
ifShow: () =>
row.deliveryType === DeliveryTypeEnum.EXPRESS.type &&
@@ -166,6 +164,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
},
{
label: '备注',
+ type: 'primary',
link: true,
onClick: handleRemark.bind(null, row),
},
diff --git a/apps/web-ele/src/views/mall/trade/order/modules/delivery-form.vue b/apps/web-ele/src/views/mall/trade/order/modules/delivery-form.vue
index ea1e8124f..a284d6287 100644
--- a/apps/web-ele/src/views/mall/trade/order/modules/delivery-form.vue
+++ b/apps/web-ele/src/views/mall/trade/order/modules/delivery-form.vue
@@ -1,6 +1,8 @@
-
+
diff --git a/apps/web-ele/src/views/mall/trade/order/modules/price-form.vue b/apps/web-ele/src/views/mall/trade/order/modules/price-form.vue
index cf68d7fc9..bb6eafd78 100644
--- a/apps/web-ele/src/views/mall/trade/order/modules/price-form.vue
+++ b/apps/web-ele/src/views/mall/trade/order/modules/price-form.vue
@@ -1,17 +1,28 @@
-
+