From 10a301ba3b1cbea0b6aeb8c3d0c8eb7855ca679c Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Mon, 16 Dec 2024 17:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/index.vue | 46 ++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index 814f302..8daa7c7 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -187,19 +187,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          prop="name"
-          label="支付状态"
-          align="center"
-          width="180"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.pay.pay_status == 2">已支付</span>
-            <span v-else-if="scope.row.pay.pay_status == 0 && scope.row.pay.pay_money > 0 && scope.row.pay.received_money > 0">部分支付</span>
-            <span v-else-if="scope.row.pay.pay_status == 0 && scope.row.pay.pay_money > 0 && scope.row.pay.received_money == 0">未支付</span>
-          </template>
-        </el-table-column>
-
         <!--待审核是展示-->
         <el-table-column
           prop="refund_status_name"
@@ -236,13 +223,15 @@
             >
 
 <!--            没付钱的可以取消-->
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.order_status == 0 && scope.row.pay.pay_status == 0 && scope.row.pay.received_money == 0"
-              @click="cancelOrder(scope.row)"
-              >取消订单</el-button
-            >
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="scope.row.order_status == 0 && scope.row.pay?.pay_status == 0 && scope.row.pay?.received_money == 0"-->
+<!--              @click="cancelOrder(scope.row)"-->
+<!--              >取消订单-->
+<!--            </el-button>-->
+
+
 <!--            <el-button-->
 <!--              type="text"-->
 <!--              size="small"-->
@@ -251,16 +240,15 @@
 <!--                (scope.row.order_status == 4 && !isEvaluate)-->
 <!--              "-->
 <!--              @click="refund(scope.row)"-->
-<!--              >申请售后</el-button-->
-<!--            >-->
+<!--              >申请售后</el-button>-->
 
-            <el-button
-              type="text"
-              size="small"
-              v-if="[0,1,3,4].includes(scope.row.order_status) && [0,2].includes(scope.row.pay.pay_status)"
-              @click="clickSpsh(scope.row)">
-              申请售后
-            </el-button>
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              size="small"-->
+<!--              v-if="[0,1,3,4].includes(scope.row.order_status) && [0,2].includes(scope.row.pay?.pay_status)"-->
+<!--              @click="clickSpsh(scope.row)">-->
+<!--              申请售后-->
+<!--            </el-button>-->
 
             <el-button
               type="text"