From 7a37c679eee39774e070dceb1b767552e458339c Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 29 Sep 2021 20:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=B3=BB=E5=88=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/activity/detail.vue     |  5 ++++-
 pages/index/activity/hot.vue        |  5 ++++-
 pages/order/index/onlineorder.vue   | 17 ++++++++++++++++-
 pages/order/newdetail/newdetail.vue | 11 ++++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/pages/index/activity/detail.vue b/pages/index/activity/detail.vue
index 7670590..a073beb 100644
--- a/pages/index/activity/detail.vue
+++ b/pages/index/activity/detail.vue
@@ -71,7 +71,10 @@
 				        api: 'api/activity/detail',
 						data: {
 							activity_id: this.activity_id
-						}
+						},
+						header: {
+						   Authorization: this.$cookieStorage.get('user_token')
+						},
 				    })
 				    .then(res => {
 				        if (res.data.code == 200) {
diff --git a/pages/index/activity/hot.vue b/pages/index/activity/hot.vue
index 7abdfc0..28cb287 100644
--- a/pages/index/activity/hot.vue
+++ b/pages/index/activity/hot.vue
@@ -114,7 +114,10 @@
 				        api: 'api/activity',
 						data:{
 							is_expired: this.tab_current+1
-						}
+						},
+						header: {
+						   Authorization: this.$cookieStorage.get('user_token')
+						},
 				    })
 				    .then(res => {
 						let tab_item = this.tab_list[this.tab_current];
diff --git a/pages/order/index/onlineorder.vue b/pages/order/index/onlineorder.vue
index 483f9e2..888de67 100644
--- a/pages/order/index/onlineorder.vue
+++ b/pages/order/index/onlineorder.vue
@@ -18,9 +18,10 @@
 				<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
 					<scroll-view :style="{height: autoHeight}" class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
 						
-						<view v-for="(item2,index2) of tabItem.list" :key="index2" class="online-card" @click="goDetails(item2.pick_self,item2.order_no)">
+						<view v-for="(item2,index2) of tabItem.list" :key="index2" style="position: relative;" class="online-card" @click="goDetails(item2.pick_self,item2.order_no)">
 							<view class="lf-font-24 lf-color-777">
 								订单编号{{item2.order_no}}
+								<view class="pick-self" v-if="item2.pick_self !=0">自提</view>
 							</view>
 							<view class="lf-m-t-30">
 								<text class="lf-iconfont icon-Group- lf-font-28"></text>
@@ -341,6 +342,20 @@
 </style>
 
 <style scoped lang="scss">
+	.pick-self {
+		border-radius: 0px 20rpx 0px 10rpx;
+		background: #15716E;
+		width: 108rpx;
+		height: 53rpx;
+		font-size: 24rpx;
+		color: white;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		right: 0;
+		top: 0;
+	}
 	.content-img {
 		width: 130rpx;
 		height: 130rpx;
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index d9baffa..6b9015a 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -28,7 +28,7 @@
 				查看详情
 			</view>
 		</view>
-		<view class="card" style="margin-top: 0;">
+		<view class="card" style="margin-top: 0;" v-if="order_details.pick_self == 0">
 			<view class="lf-font-28">
 				<text class="lf-color-222 lf-font-bold">{{order_details.accept_name}}</text>
 				<text class="lf-color-777 lf-m-l-20">{{order_details.mobile}}</text>
@@ -37,6 +37,15 @@
 				<text>{{order_details.address_name}}{{order_details.address}}</text>
 			</view>
 		</view>
+		<view class="card" style="margin-top: 0;" v-else>
+			<view class="lf-font-28">
+				<text class="lf-color-222 lf-font-bold">{{order_details.brand.name}}</text>
+				<text class="lf-color-777 lf-m-l-20">{{order_details.brand.tel}}</text>
+			</view>
+			<view class="lf-font-28 lf-color-333 lf-m-t-20">
+				<text>{{order_details.brand.floor}}</text>
+			</view>
+		</view>
 		<view class="card goods">
 			<view>
 				<text class="lf-iconfont icon-Group- lf-font-30"></text>