From 7f30cf80200c113975fc215d656b821eaf9311eb Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Fri, 21 Aug 2020 14:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=89=A9=E6=B5=81=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageD/logistics/logistics.vue | 14 ++++++++++----
 pageE/order/Details.vue       |  5 ++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pageD/logistics/logistics.vue b/pageD/logistics/logistics.vue
index f7c7e12..7eabb61 100644
--- a/pageD/logistics/logistics.vue
+++ b/pageD/logistics/logistics.vue
@@ -10,7 +10,7 @@
 				</view>
 				<view class="xiantiao"></view>
 				<view class="title">{{item.title}}</view>
-				<view class="images_about" @click="viewLogistics(item.order_id)">
+				<view class="images_about" @click="viewLogistics(item)">
 					<image :src="item.picture"></image>
 					<view>
 						<text>{{item.summary}}</text>
@@ -41,9 +41,15 @@
                     }
                 })
 			},
-			viewLogistics(id) {
-				this.$u.route('/pageE/order/Logistics', {
-					oid: id,
+			viewLogistics(item) {
+				let url;
+				if(item.takeawayer_phone) {
+					url = '/pageE/order/Details';
+				} else {
+					url = '/pageE/order/Logistics';
+				}
+				this.$u.route(url, {
+					oid: item.order_id,
 				});
 			}
 		},
diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index 4c8d77d..448e13e 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -76,7 +76,7 @@
 			<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" @click="toOtherPage('Logistics')">查看物流</view>
-			<view class="phone" v-if="orderstate == '1' && orderInfo.takeawayer_phone" @click="makePhone(order.takeawayer_phone)">
+			<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>
 			</view>
@@ -153,7 +153,6 @@ export default {
 		clearInterval(this.timer);
 	},
 	methods: {
-		
 		viewStoreDetails(id) {
 			this.$u.route('pageC/merchant/index', {
 				id: id
@@ -201,7 +200,7 @@ export default {
 			this.$u.api.getOrderInfo({
 				order_id: id,
 			}).then(res => {
-				console.log(res)
+				// console.log(res)
 				if(res.errCode == 0) {
 					this.orderInfo = res.data;
 					this.setTitle(this.orderInfo.view_type);
-- 
2.45.2