diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue index f474ee10..eee64ef4 100644 --- a/src/views/mall/trade/order/index.vue +++ b/src/views/mall/trade/order/index.vue @@ -12,7 +12,7 @@ @@ -27,7 +27,7 @@ > @@ -48,7 +48,7 @@ @@ -58,7 +58,7 @@ @@ -363,7 +363,6 @@ const handleDropType = (command: string) => { } //所有页按钮 if (command === '2') { - initSelect() //重置之前选中的类容清空 orderSelect.selectAllFlag = !orderSelect.selectAllFlag if (orderSelect.selectAllFlag) { @@ -379,6 +378,7 @@ const handleDropType = (command: string) => { for (i; i < list.value.length; i++) { list.value[i]['itemSelect'] = false } + initSelect() //重置之前选中的类容清空 } } } @@ -494,54 +494,6 @@ const getList = async () => { } } -// const getList = async () => { -// loading.value = true -// try { -// const data = await TradeOrderApi.getOrderList(queryParams) -// list.value = data.list -// total.value = data.total -// let i = 0 -// //给数组添加选中属性 itemSelect 默认为false 当前状态如果时全选 则新加载的页面都为选中状态 - -// if (orderSelect.selectAllFlag) { -// if (orderSelect.selectData && orderSelect.selectData.has(queryParams.pageNo)) { -// //页面已经加载过了 -// for (i = 0; i < list.value.length; i++) { -// if (orderSelect.selectData.get(queryParams.pageNo)!.has(list.value[i].id)) { -// list.value[i]['itemSelect'] = true //之前已经选取过了 -// } else { -// list.value[i]['itemSelect'] = false -// } -// } -// } else { -// //首次加载页面 默认全部选中 -// orderSelect.selectData.set(queryParams.pageNo, new Set()) -// for (i = 0; i < list.value.length; i++) { -// list.value[i]['itemSelect'] = true -// orderSelect.selectData.get(queryParams.pageNo)!.add(list.value[i].id) -// } -// } -// } else { -// if (orderSelect.selectData && orderSelect.selectData.has(queryParams.pageNo)) { -// //页面已经加载过了 -// for (i = 0; i < list.value.length; i++) { -// if (orderSelect.selectData.get(queryParams.pageNo)!.has(list.value[i].id)) { -// list.value[i]['itemSelect'] = true //之前已经选取过了 -// } else { -// list.value[i]['itemSelect'] = false -// } -// } -// } else { -// for (i; i < list.value.length; i++) { -// list.value[i]['itemSelect'] = false //设置状态为未选中状态 -// } -// } -// } -// } finally { -// loading.value = false -// } -// } - /** * 跳转订单详情 */ diff --git a/src/views/mall/trade/order/tradeOrderDetail.vue b/src/views/mall/trade/order/tradeOrderDetail.vue index 2cba774b..9f2cf3fc 100644 --- a/src/views/mall/trade/order/tradeOrderDetail.vue +++ b/src/views/mall/trade/order/tradeOrderDetail.vue @@ -124,11 +124,14 @@ parseFloat((order.adjustPrice / 100.0) as unknown as string).toFixed(2) }} + ¥{{ - parseFloat((order.totalPrice - order.totalPrice / 100.0) as unknown as string).toFixed(2) + parseFloat(((order.totalPrice - order.totalPrice) / 100.0) as unknown as string).toFixed( + 2 + ) }} @@ -163,6 +166,7 @@ +
@@ -222,6 +226,7 @@