From a8b73da9011af8f0c5970965401638b4bd6658f0 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Sat, 14 Dec 2024 05:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E7=9A=84=E5=94=AE=E5=90=8E=E7=94=B3=E8=AF=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=89=A9=E4=B8=9A=E5=8A=A1=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/dialogOrderAfterSale.vue | 6 +++---
 pages/order/index.vue               | 4 +++-
 pages/order_details.vue             | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/components/dialogOrderAfterSale.vue b/components/dialogOrderAfterSale.vue
index ddee778..5c932c3 100644
--- a/components/dialogOrderAfterSale.vue
+++ b/components/dialogOrderAfterSale.vue
@@ -21,7 +21,7 @@
           <li>
             <input type="radio" name="refundType" v-model="formData.refund_type" value="1">
             <div class="left">
-              <strong>退货无需退款</strong>
+              <strong>退款无需货退</strong>
               <span>没收到货,或与卖家写上同意无需要退货只退款</span>
             </div>
           </li>
@@ -36,8 +36,8 @@
           <li>
             <input type="radio" name="refundType" v-model="formData.refund_type" value="4">
             <div class="left">
-              <strong>仅退款</strong>
-              <span>仅退款</span>
+              <strong>仅退货</strong>
+              <span>仅退货</span>
             </div>
           </li>
         </ul>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 9aef6ed..adeba86 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -219,10 +219,12 @@
               @click="deliver(scope.row)"
               >提醒发货</el-button
             >
+
+<!--            没付钱的可以取消-->
             <el-button
               type="text"
               size="small"
-              v-if="scope.row.order_status == 0"
+              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
             >
diff --git a/pages/order_details.vue b/pages/order_details.vue
index 3c23c42..d82412d 100644
--- a/pages/order_details.vue
+++ b/pages/order_details.vue
@@ -242,9 +242,10 @@
       </div>
       <div class="btns" v-if="orderType != -1">
 
+
 <!--审核情况展示"申请售后"按钮|待支付 or 全款支付时 && 订单状态=[待发货,已发货,已收货]-->
 <!--        <div class="hs" v-if="orderType == 1 && integralGoods == 0" @click="clickSpsh">申请售后</div>-->
-        <div class="hs" v-if="[1,3,4].includes(orderData.order_status) && [0,2].includes(payInfo.pay_status) && integralGoods == 0" @click="clickSpsh">申请售后</div>
+        <div class="hs" v-if="[0,1,3,4].includes(orderData.order_status) && [0,2].includes(payInfo.pay_status) && integralGoods == 0" @click="clickSpsh">申请售后</div>
 
         <div class="gl" v-if="orderType == 1" @click="clickQrsh">确定收货</div>
         <!-- <div class="hs" v-if="orderType == 2" @click="clickGhdz">更换地址</div> -->