From 00b0b522e2f5bc11518d13d649a0a84d87d377dd Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Tue, 20 Jun 2023 14:07:48 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E7=89=A9=E6=96=99=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=EF=BC=8C=E5=AE=A2=E6=88=B7=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/views/order/orderDetails.vue | 8 ++------
 pages/views/order/orderList.vue    | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pages/views/order/orderDetails.vue b/pages/views/order/orderDetails.vue
index a26fc2c..8e71e4e 100644
--- a/pages/views/order/orderDetails.vue
+++ b/pages/views/order/orderDetails.vue
@@ -136,12 +136,8 @@
 	  </view>
 	 
     </view>
-    <view class="bottom_btn" v-if="goods.state == 0 
-	|| goods.state == 6 
-	|| goods.state == 1
-	">
-		<block v-if="goods.state == 0 
-	|| goods.state == 6">
+    <view class="bottom_btn" v-if="goods.state == 6 || goods.state == 1">
+		<block v-if="goods.state == 6">
 			<view class="moneys">
 			合计: <text >￥{{goods.totalAmount}}</text>
 			</view>
diff --git a/pages/views/order/orderList.vue b/pages/views/order/orderList.vue
index 12629b2..312e682 100644
--- a/pages/views/order/orderList.vue
+++ b/pages/views/order/orderList.vue
@@ -47,7 +47,7 @@
 							<view class="address">总计：<text style="color: #FF1929;font-size: 36upx;">￥{{item.totalAmount}}</text> </view>
 							<!-- <view class="address">店铺地址：北京市海淀区苏家坨乡前沙涧村</view> -->
 							<view class="btns">
-								<block v-if="item.state == 0 || item.state == 6">
+								<block v-if="item.state == 6">
 									<!-- <view class="pay" :style="'color:#fff;background:' + colors+ ';border-color:' + colors" @tap="jumpDetails(item)">去付款</view> -->
 									<view class="pay shouhou"  @tap="cencalOrder(item)">取消订单</view>	
 								</block>