Skip to content

Commit cfbc2ed

Browse files
YunaiVYunaiV
committed
code review：订单列表、订单详情
1 parent 69a66b2 commit cfbc2ed

File tree

11 files changed

+116
-90
lines changed

11 files changed

+116
-90
lines changed

‎src/api/mall/promotion/bargain/bargainActivity.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface BargainActivityVO {
2020
successCount?: number // 砍价成功数量
2121
}
2222

23-
// 砍价活动所需属性。 选择的商品和属性的时候使用方便使用活动的通用封装
23+
// 砍价活动所需属性。选择的商品和属性的时候使用方便使用活动的通用封装
2424
export interface BargainProductVO {
2525
spuId: number
2626
skuId: number

‎src/utils/dict.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ export enum DICT_TYPE {
9090
USER_TYPE = 'user_type',
9191
COMMON_STATUS = 'common_status',
9292
SYSTEM_TENANT_PACKAGE_ID = 'system_tenant_package_id',
93+
TERMINAL = 'terminal', // 终端
9394

9495
// ========== SYSTEM 模块 ==========
9596
SYSTEM_USER_SEX = 'system_user_sex',
@@ -130,7 +131,7 @@ export enum DICT_TYPE {
130131
BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type',
131132

132133
// ========== PAY 模块 ==========
133-
PAY_CHANNEL_CODE_TYPE = 'pay_channel_code_type', // 支付渠道编码类型
134+
PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
134135
PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
135136
PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
136137
PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
@@ -155,7 +156,7 @@ export enum DICT_TYPE {
155156
TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型
156157
TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态
157158
TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态
158-
TERMINAL = 'terminal', // 终端
159+
TRADE_DELIVERY_TYPE = 'trade_delivery_type', // 配送方式
159160

160161
// ========== MALL - 营销模块 ==========
161162
PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
@@ -164,8 +165,5 @@ export enum DICT_TYPE {
164165
PROMOTION_COUPON_STATUS = 'promotion_coupon_status', // 优惠劵的状态
165166
PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
166167
PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
167-
PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
168-
169-
// ========== MALL - 物流模块 ==========
170-
DELIVERY_TYPE = 'delivery_type' // 配送方式
168+
PROMOTION_CONDITION_TYPE = 'promotion_condition_type' // 营销的条件类型枚举
171169
}

‎src/views/mall/promotion/bargain/activity/BargainActivityForm.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ const ruleConfig: RuleConfig[] = [
8383
{
8484
name: 'productConfig.bargainFirstPrice',
8585
rule: (arg) => arg > 0,
86-
message: '商品砍价起始价格不能小于0 ！！！'
86+
message: '商品砍价起始价格不能小于 0 ！！！'
8787
},
8888
{
8989
name: 'productConfig.bargainPrice',
9090
rule: (arg) => arg >= 0,
91-
message: '商品砍价底价不能小于0 ！！！'
91+
message: '商品砍价底价不能小于 0 ！！！'
9292
},
9393
{
9494
name: 'productConfig.stock',
9595
rule: (arg) => arg >= 1,
96-
message: '商品活动库存不能小于1 ！！！'
96+
message: '商品活动库存不能小于 1 ！！！'
9797
}
9898
]
9999
const selectSpu = (spuId: number, skuIds: number[]) => {

‎src/views/mall/trade/order/components/DeliveryOrderForm.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,23 @@
3333
import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
3434
import * as TradeOrderApi from '@/api/mall/trade/order'
3535
36+
// TODO @puhui999：是不是名字叫 OrderDeliveryForm 保持统一
3637
defineOptions({ name: 'DeliveryOrderForm' })
3738
3839
const { t } = useI18n() // 国际化
3940
const message = useMessage() // 消息弹窗
4041
4142
const dialogVisible = ref(false) // 弹窗的是否展示
4243
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
43-
const radio = ref('1')
44+
const radio = ref('1') // TODO @puhui999：尽量不用 radio 这种命名，无业务含义。这里的话，可以考虑用 expressType，如果值是 express，则是快递；none 则是无；未来做同城配送，就比较容易拓展啦；
4445
const formData = ref<TradeOrderApi.DeliveryVO>({
4546
id: 0, // 订单编号
4647
logisticsId: null, // 物流公司编号
4748
logisticsNo: '' // 物流编号
4849
})
4950
const formRef = ref() // 表单 Ref
5051
52+
// TODO @puhui999：每次点击发货的时候，是不是可以把之前的信息带过来哈。
5153
/** 打开弹窗 */
5254
const open = async (orderId: number) => {
5355
resetForm()
@@ -65,6 +67,7 @@ const submitForm = async () => {
6567
try {
6668
const data = unref(formData)
6769
if (radio.value === '2') {
70+
// 无需发货的情况
6871
data.logisticsId = 0
6972
data.logisticsNo = ''
7073
}

‎src/views/mall/trade/order/components/OrderAdjustAddressForm.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<el-form-item label="收件人手机">
88
<el-input v-model="formData.receiverMobile" />
99
</el-form-item>
10+
<!-- TODO @puhui999：应该是个地区下拉框，可以看下 UserForm 所在地 -->
1011
<el-form-item label="收件人地区编号">
1112
<el-input v-model="formData.receiverAreaId" />
1213
</el-form-item>
@@ -24,6 +25,7 @@
2425
import * as TradeOrderApi from '@/api/mall/trade/order'
2526
import { copyValueToTarget } from '@/utils'
2627
28+
// TODO @puhui999：OrderAdjustAddressForm 改成 OrderUpdateAddressForm 更新哈，保持统一；
2729
defineOptions({ name: 'OrderAdjustAddressForm' })
2830
2931
const { t } = useI18n() // 国际化

‎src/views/mall/trade/order/components/OrderAdjustPriceForm.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import * as TradeOrderApi from '@/api/mall/trade/order'
2323
import { convertToInteger, formatToFraction } from '@/utils'
2424
import { cloneDeep } from 'lodash-es'
2525
26+
// TODO @puhui999：OrderAdjustPriceForm 改成 OrderUpdatePriceForm 更新哈，保持统一；
2627
defineOptions({ name: 'OrderAdjustPriceForm' })
2728
2829
const { t } = useI18n() // 国际化

‎src/views/mall/trade/order/components/OrderDetailForm.vue

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<el-descriptions title="订单信息">
55
<el-descriptions-item label="订单号: ">{{ orderInfo.no }}</el-descriptions-item>
66
<el-descriptions-item label="配送方式: ">
7-
<dict-tag :type="DICT_TYPE.DELIVERY_TYPE" :value="orderInfo.deliveryType" />
7+
<dict-tag :type="DICT_TYPE.TRADE_DELIVERY_TYPE" :value="orderInfo.deliveryType" />
88
</el-descriptions-item>
99
<!-- TODO 营销活动待实现 -->
1010
<el-descriptions-item label="营销活动: ">秒杀活动</el-descriptions-item>
@@ -20,7 +20,7 @@
2020
<el-descriptions-item label="商家备注: ">{{ orderInfo.remark }}</el-descriptions-item>
2121
<el-descriptions-item label="支付单号: ">{{ orderInfo.payOrderId }}</el-descriptions-item>
2222
<el-descriptions-item label="付款方式: ">
23-
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE_TYPE" :value="orderInfo.payChannelCode" />
23+
<dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="orderInfo.payChannelCode" />
2424
</el-descriptions-item>
2525
<!-- <el-descriptions-item label="买家: ">{{ orderInfo.user.nickname }}</el-descriptions-item> -->
2626
<!-- TODO 芋艿：待实现：跳转会员 -->
@@ -41,14 +41,10 @@
4141
<dict-tag :type="DICT_TYPE.TRADE_ORDER_STATUS" :value="orderInfo.status" />
4242
</el-descriptions-item>
4343
<el-descriptions-item label-class-name="no-colon">
44-
<el-button size="small" type="primary" @click="openForm('adjustPrice')">调整价格</el-button>
45-
<el-button size="small" type="primary" @click="openForm('remark')">备注</el-button>
46-
<el-button size="small" type="primary" @click="openForm('delivery')">发货</el-button>
47-
<el-button size="small" type="primary" @click="openForm('adjustAddress')">
48-
修改地址
49-
</el-button>
50-
<!-- TODO 后台商家也需要收货功能吗？ -->
51-
<el-button size="small" type="primary">确认收货</el-button>
44+
<el-button type="primary" @click="openForm('adjustPrice')">调整价格</el-button>
45+
<el-button type="primary" @click="openForm('remark')">备注</el-button>
46+
<el-button type="primary" @click="openForm('delivery')">发货</el-button>
47+
<el-button type="primary" @click="openForm('adjustAddress')">修改地址</el-button>
5248
</el-descriptions-item>
5349
<el-descriptions-item>
5450
<template #label><span style="color: red">提醒: </span></template>
@@ -201,6 +197,8 @@
201197
</el-descriptions>
202198
</div>
203199
</ContentWrap>
200+
201+
<!-- 各种操作的弹窗 -->
204202
<DeliveryOrderForm ref="deliveryFormRef" @success="getDetail" />
205203
<OrderRemarksForm ref="remarksFormRef" @success="getDetail" />
206204
<OrderAdjustAddressForm ref="adjustAddressFormRef" @success="getDetail" />
@@ -215,10 +213,12 @@ import DeliveryOrderForm from '@/views/mall/trade/order/components/DeliveryOrder
215213
import OrderAdjustAddressForm from '@/views/mall/trade/order/components/OrderAdjustAddressForm.vue'
216214
import OrderAdjustPriceForm from '@/views/mall/trade/order/components/OrderAdjustPriceForm.vue'
217215
216+
// TODO @puhui999：TradeOrderDetailForm 可以挪到 order/detail/index.vue 中，它是一个 vue 界面哈。
218217
defineOptions({ name: 'TradeOrderDetailForm' })
219218
220219
const message = useMessage() // 消息弹窗
221220
const { params } = useRoute() // 查询参数
221+
// TODO @puhui999：orderInfo 应该不用把属性弄出来也；
222222
const orderInfo = ref<TradeOrderApi.OrderVO>({
223223
no: '',
224224
createTime: null,
@@ -263,6 +263,7 @@ const orderInfo = ref<TradeOrderApi.OrderVO>({
263263
user: {}
264264
})
265265
266+
// TODO @puhui999：这个改成直接读属性，不用按照这种写法；
266267
const detailGroups = ref([
267268
{
268269
title: '物流信息',
@@ -281,6 +282,7 @@ const detailGroups = ref([
281282
}
282283
])
283284
285+
// TODO @puhui999：从后台读数据哈。
284286
const detailInfo = ref({
285287
// 物流信息
286288
expressInfo: {

‎src/views/mall/trade/order/components/OrderRemarksForm.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<script lang="ts" setup>
1515
import * as TradeOrderApi from '@/api/mall/trade/order'
1616
17+
// TODO @puhui999：OrderRemarksForm 改成 OrderUpdateRemarkForm 更新哈，保持统一；
1718
defineOptions({ name: 'OrderRemarksForm' })
1819
1920
const { t } = useI18n() // 国际化

0 commit comments

Comments
 (0)