From 4a62f56c9635468ddf4b4213fafddd746888f4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Mon, 25 Nov 2024 14:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=B1=E8=97=8F=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD=E6=80=BB=E9=87=91=E9=A2=9D=E9=82=A3=E4=B8=AA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order_manage/order_list.vue | 29 ++++++++++++++-------------
 1 file changed, 15 insertions(+), 14 deletions(-)

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 @@
             <div class="t">总金额</div>
           </div>
         </div> -->
-        <div class="item" v-for="item in payCountList" :key="item.payType">
+        <!-- <div class="item" v-for="item in payCountList" :key="item.payType">
           <div class="icon_wrap" style="--bg-color:#fff">
             <el-image class="img" :src="item.icon"></el-image>
           </div>
@@ -76,7 +76,7 @@
             <div class="m">￥{{ item.payAmount || 0 }}</div>
             <div class="t">{{ item.payType }}</div>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
     <div class="head-container">
@@ -150,7 +150,8 @@
           <template v-slot="scope">
             <div class="u-flex gap-10">
               <el-button type="text" @click="$refs.orderDetail.show(scope.row)">详情</el-button>
-              <el-button v-if="scope.row.status == 'unpaid'" type="primary" size="mini" @click="payOrder(scope.row)">结账</el-button>
+              <el-button v-if="scope.row.status == 'unpaid'" type="primary" size="mini"
+                @click="payOrder(scope.row)">结账</el-button>
             </div>
           </template>
         </el-table-column>
@@ -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,