diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue index b158085..f0fb295 100644 --- a/src/views/order_manage/order_list.vue +++ b/src/views/order_manage/order_list.vue @@ -68,7 +68,7 @@
总金额
--> -
+
@@ -150,7 +150,8 @@ @@ -207,24 +208,24 @@ export default { filters: { orderTypeFilter(t) { if (t) { - const item= orderEnum.orderType.find(item => item.key == t); - return t && item?item.label:''; + const item = orderEnum.orderType.find(item => item.key == t); + return t && item ? item.label : ''; } else { return t; } }, sendTypeFilter(t) { if (t) { - const item= orderEnum.sendType.find(item => item.key == t); - return item?item.label:''; + const item = orderEnum.sendType.find(item => item.key == t); + return item ? item.label : ''; } else { return t; } }, statusFilter(t) { if (t) { - const item= orderEnum.status.find(item => item.key == t); - return t && item?item.label:''; + const item = orderEnum.status.find(item => item.key == t); + return t && item ? item.label : ''; } else { return t; } @@ -245,7 +246,7 @@ export default { this.query.orderNo = this.$route.query.orderNo } this.resetQuery = { ...this.query }; - this.tbShopPayTypeGet(); + // this.tbShopPayTypeGet(); this.getTableData(); // 从商品库存-库存记录-点击订单号跳转过来 if (this.$route.query.orderNo) { @@ -254,11 +255,11 @@ export default { this.getTableData(); }, 200); } - + }, methods: { //结账 - payOrder(order){ + payOrder(order) { console.log(order); this.$router.push({ path: "/tool/Instead/index", @@ -268,7 +269,7 @@ export default { useType: order.useType, masterId: order.masterId, orderId: order.id, - key:'isJieZhang' + key: 'isJieZhang' }, }); }, @@ -324,7 +325,7 @@ export default { async getTableData(switchs = false) { this.tableData.loading = true; try { - this.payCount(); + // this.payCount(); const productName = this.query.productName.replace(/\s+/g, '') const res = await tbOrderInfoData({ page: this.tableData.page,