From ecaf26c40ed47e43fde296d5252d8ee3200e276b Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Tue, 20 Jun 2023 11:46:46 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6=E6=9C=89?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/views/order/orderDetails.vue | 8 +++-----
 pages/views/tabBar/cart.vue        | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pages/views/order/orderDetails.vue b/pages/views/order/orderDetails.vue
index efb4e21..a26fc2c 100644
--- a/pages/views/order/orderDetails.vue
+++ b/pages/views/order/orderDetails.vue
@@ -109,21 +109,19 @@
         {{ goods.createTime }}
       </view>
     </view>
-	<view class="tips margin0" v-if="goods.dispacherRemark || goods.financeRemark || goods.materialRemark">
+	<view class="tips margin0" v-if="goods.state == 5 && (goods.financeRemark ||goods.materialRemark || goods.dispacherRemark)">
 	  <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-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-if="goods.financeRemark">
+	  <view class="textarea_box"  v-else-if="goods.financeRemark">
 	    <textarea disabled="true" placeholder-class="font-size: 24upx" maxlength="-1" 
 	  			  v-model="goods.financeRemark">
 	  		</textarea>
diff --git a/pages/views/tabBar/cart.vue b/pages/views/tabBar/cart.vue
index 196b6d8..7bbd0d8 100644
--- a/pages/views/tabBar/cart.vue
+++ b/pages/views/tabBar/cart.vue
@@ -384,6 +384,7 @@
 			},
 			settlement() { //结算
 				if (this.sum == 0) {
+					this.$toast('您还没选择商品')
 					return
 				}