From 78dfbcab212e9704c2962c0d89d7a8ba6b29dee0 Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Tue, 20 Jun 2023 14:33:01 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E8=B0=83=E6=95=B4=E9=80=80=E5=8D=95?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/views/order/orderDetails.vue | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pages/views/order/orderDetails.vue b/pages/views/order/orderDetails.vue
index 8e71e4e..e3f9dc7 100644
--- a/pages/views/order/orderDetails.vue
+++ b/pages/views/order/orderDetails.vue
@@ -109,23 +109,23 @@
         {{ goods.createTime }}
       </view>
     </view>
-	<view class="tips margin0" v-if="goods.state == 5 && (goods.financeRemark ||goods.materialRemark || goods.dispacherRemark)">
+	<view class="tips margin0" v-if="goods.state == 5 && (goods.financeRemark ||goods.materialRemark)">
 	  <view class="tips_name">退单原因</view>
-	  <view class="textarea_box"  v-if="goods.materialRemark">
-	    <textarea disabled="true" placeholder-class="font-size: 24upx" maxlength="-1" 
-			  v-model="goods.materialRemark">
-		</textarea>
-	  </view>
-	  <view class="textarea_box"  v-else-if="goods.dispacherRemark">
+<!-- 	  <view class="textarea_box"  v-else-if="goods.dispacherRemark">
 	    <textarea disabled="true" placeholder-class="font-size: 24upx" maxlength="-1" 
 			  v-model="goods.dispacherRemark">
 		</textarea>
-	  </view>
-	  <view class="textarea_box"  v-else-if="goods.financeRemark">
+	  </view> -->
+	  <view class="textarea_box"  v-if="goods.financeRemark">
 	    <textarea disabled="true" placeholder-class="font-size: 24upx" maxlength="-1" 
 	  			  v-model="goods.financeRemark">
 	  		</textarea>
 	  </view>
+	  <view class="textarea_box"  v-else-if="goods.materialRemark">
+	    <textarea disabled="true" placeholder-class="font-size: 24upx" maxlength="-1" 
+	  			  v-model="goods.materialRemark">
+	  		</textarea>
+	  </view>
 	</view>
 	  <view class="tips">
 		<view class="tips_name">订单备注</view>
@@ -167,7 +167,6 @@
 			   <!-- <view class="btns shouhou" @click="jumpSale">退款/售后</view> -->
 			   <!-- <view class="btns" :style="'background:' + colors + ';margin-left:20upx;'">再次购买</view> -->
 			   <view class="btns shouhou" @tap="onafterSale">退款/售后</view>
-			  
 		</block>
 		<block v-if="goods.state == 4">
 			   <view class="btns shouhou" @click="delOrder">删除订单</view>