From 3ebdd165fd7a81f767aebc65be9e0719dc79277a Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Sat, 9 Oct 2021 15:51:35 +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/discover/discoverdetails.vue  |  2 +-
 pages/index/activity/detail.vue     |  6 ++++
 pages/order/newdetail/newdetail.vue |  6 ++--
 pages/user/my/center.vue            | 49 ++++++++++++++++++++++++-----
 4 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/pages/discover/discoverdetails.vue b/pages/discover/discoverdetails.vue
index 86f24ca..8b0615c 100644
--- a/pages/discover/discoverdetails.vue
+++ b/pages/discover/discoverdetails.vue
@@ -44,7 +44,7 @@
 			<view class="lf-color-555 lf-font-24">共 {{discover_details.comments_count}}条评论</view>
 			<!-- 评论开始 -->
 			<view v-for="(commentitem,commentindex) of commentList" :key="commentindex">
-				<view class="lf-m-t-20" @click="applySub(commentitem.user.id,commentitem.id)">
+				<view class="lf-m-t-40" @click="applySub(commentitem.user.id,commentitem.id)">
 					<view class="lf-flex">
 						<view @click="$url('/pages/user/my/my?user_id='+commentitem.user_id)">
 							<image class="comment-img" :src="commentitem.user.avatar" v-if="commentitem.user.avatar" mode="widthFix"></image>
diff --git a/pages/index/activity/detail.vue b/pages/index/activity/detail.vue
index a073beb..8d4663f 100644
--- a/pages/index/activity/detail.vue
+++ b/pages/index/activity/detail.vue
@@ -39,6 +39,12 @@
 				:class="{'lf-opacity': is_end}"
 				@click="submit">{{ is_end ? '名额已满' : '立即报名' }}
 			</button>
+			
+			<button v-if="activity_details.apply != null" class="btn lf-opacity"
+				:disabled="true" 
+				>
+				已经报名
+			</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index f0517a0..9078fd0 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -95,13 +95,13 @@
 			</view>
 		</view>
 		<view class="card" v-if="type == 'default'">
-			<view class="lf-row-between lf-font-28">
+			<view class="lf-row-between lf-font-28" v-if="order_details.adjustments[0].origin_type == 'coupon'">
 				<text class="lf-color-777">优惠券</text>
-				<text style="color: #F63434;">-¥20</text>
+				<text style="color: #F63434;">{{order_details.adjustments_total_yuan}}</text>
 			</view>
 			<view class="lf-row-between lf-m-t-30 lf-font-28">
 				<text class="lf-color-777">运费</text>
-				<text class="lf-color-222">+￥{{order_details.payable_freight_yuan}}</text>
+				<text class="lf-color-222">+{{order_details.payable_freight_yuan}}</text>
 			</view>
 			<view class="lf-row-between lf-m-t-30 lf-font-28">
 				<text class="lf-color-777">订单总价</text>
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index a524f8e..a399480 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -73,13 +73,40 @@
 					</view>
 				</view>
 				<view class="order-tag lf-flex-wrap">
-					<view class="order-children" 
+					<view class="order-children" @click="$url('/pages/order/index/onlineorder?current=1')">
+						<view>
+							<view class="function-tag" v-if="centerInfo.newCount != 0 && $isRight(centerInfo)">{{centerInfo.newCount}}</view>
+							<view class="lf-iconfont lf-font-50 icon-daifukuan"></view>
+						</view>
+						<view class="lf-color-black lf-font-28 lf-m-t-20">待付款</view>
+					</view>
+					<view class="order-children" @click="$url('/pages/order/index/onlineorder?current=2')">
+						<view>
+							<view class="function-tag" v-if="centerInfo.paidCount != 0 && $isRight(centerInfo)">{{centerInfo.paidCount}}</view>
+							<view class="lf-iconfont lf-font-50 icon-31daifahuo"></view>
+						</view>
+						<view class="lf-color-black lf-font-28 lf-m-t-20">待发货</view>
+					</view>
+					<view class="order-children" @click="$url('/pages/order/index/onlineorder?current=3')">
+						<view>
+							<view class="function-tag" v-if="centerInfo.deliveredCount != 0 && $isRight(centerInfo)">{{centerInfo.deliveredCount}}</view>
+							<view class="lf-iconfont lf-font-50 icon-daishouhuo"></view>
+						</view>
+						<view class="lf-color-black lf-font-28 lf-m-t-20">待收货</view>
+					</view>
+					<view class="order-children" @click="$url('/pages/order/index/onlineorder?current=4')">
+						<view>
+							<view class="function-tag" v-if="centerInfo.receiveCount != 0 && $isRight(centerInfo)">{{centerInfo.receiveCount}}</view>
+							<view class="lf-iconfont lf-font-50 icon-tihuo"></view>
+						</view>
+						<view class="lf-color-black lf-font-28 lf-m-t-20">待提货</view>
+					</view>
+					<!-- <view class="order-children" 
 						v-for="(item, index) in order_tablist" :key="index"
 						@click="$url(item.path)">
-						<!-- <view class="function-tag"></view> -->
 						<view class="lf-iconfont lf-font-50" :class="item.icon"></view>
 						<view class="lf-color-black lf-font-28 lf-m-t-20">{{ item.name }}</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -427,6 +454,7 @@
 	}
 	.order-children {
 		width: 134rpx;
+		position: relative;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
@@ -459,11 +487,18 @@
 		}
 	}
 	.function-tag {
-		width: 50rpx;
-		height: 50rpx;
-		background: #D8D8D8;
-		border: 1rpx solid #979797;
+		color: white;
+		font-size: 24rpx;
+		position: absolute;
+		right: 18rpx;
+		width: 39rpx;
+		height: 40rpx;
+		background: red;
+		top: -12rpx;
 		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 	.order-tag {
 		padding: 50rpx 0;