From 57c9888d7589aa7d6334e7d7d1dcab222baa4745 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 10:23:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E9=80=80=E6=AC=BE=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/orderdetail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index 708d6de..ed97f45 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -28,7 +28,7 @@
 
         </tr>
         <tr>
-            <td class="text-nowrap" scope="col" v-if="total_refund_note">拒绝退款原因：{{total_refund_note}}</td>
+            <td class="text-nowrap" scope="col" v-if="total_refund_note">退款原因：{{total_refund_note}}</td>
         </tr>
         </tbody>
     </table>

From 2689160dff5ac2582328dba416782cf2d1cc3ef0 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 11:04:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=80=80=E6=AC=BE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/orderdetail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index ed97f45..5e2133f 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -49,7 +49,7 @@
 
                 </div>
                 <p class="mb-0" style="color: red;font-size: 1.4rem;">￥{{goods.price}}</p>
-                <el-button type="info" plain style="float: right;" @click="refundNote(goods.name,goods.id,item.id)" v-if="state==4&&show_refund[goods.id].show_refund_2">{{refund_2}}</el-button>
+                <el-button type="info" plain style="float: right;" @click="refundNote(goods.name,goods.id,item.id)" v-if="(state==4||state==10)&&(goods.status!=3)&&(show_refund[goods.id].show_refund_2)">{{refund_2}}</el-button>
                 <p style="float: right; color: red" v-if="goods.status==3">{{refund_3}}</p>
                 <p style="float: right; color: red" v-if="show_refund[goods.id].show_refund_3">{{refund_3}}</p>
             </div>