From efb2988c8ec76ebcd2a87e40961a4623bf79d031 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Sat, 5 Sep 2020 15:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageE/order/Details.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index 20017a4..de0319c 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -76,11 +76,11 @@
 		<view class="btn" v-if="['1', '2', '6'].indexOf(orderstate) >= 0">
 			<!-- orderstate == '4' ||  -->
 			<view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
+			<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
+			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.is_selfraising != 1" @click="toOtherPage('Logistics')">查看物流</view>
 			<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
 			<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
 			<view class="cancel" v-if="orderstate == '6'" @click="cancelOrder">取消支付</view>
-			<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
-			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.is_selfraising != 1" @click="toOtherPage('Logistics')">查看物流</view>
 			<view class="phone" v-if="orderstate == '1' && orderInfo.takeawayer_mobile" @click="makePhone(orderInfo.takeawayer_mobile)">
 				<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
 				<text>联系骑手</text>