From aed8ac332fc2b6db9e63218106cdfa11b21612b0 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Thu, 4 Jul 2024 18:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/index.vue | 122 +++++++++++++++++++++++++++++++-----------
 1 file changed, 92 insertions(+), 30 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index 81b5617..e9266a5 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -19,16 +19,16 @@
 					</image>
 					<view class="margin-left-xs ">{{item.artificerName}}</view>
 				</view>
-				<view class="text-green" v-if="item.status ==1"><span>{{item.ordersNo}}</span><span>待支付</span></view>
-				<view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view>
-				<view class="text-green" v-if="item.status ==3"><span>{{item.ordersNo}}</span><span>待评价</span></view>
-				<view class="text-green" v-if="item.status ==4"><span>{{item.ordersNo}}</span><span>已取消</span></view>
-				<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view>
-				<view class="text-green" v-if="item.status ==6"><span>{{item.ordersNo}}</span><span>服务中</span></view>
-				<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>技师出发</span></view>
-				<view class="text-green" v-if="item.status ==8"><span>{{item.ordersNo}}</span><span>技师到达</span></view>
-				<view class="text-green" v-if="item.status ==9"><span>{{item.ordersNo}}</span><span>待确认</span></view>
-				<view class="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view>
+				<view v-if="item.status ==1"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-a">待支付</span></view>
+				<view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-b">待服务</span></view>
+				<view v-if="item.status ==3"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-c">待评价</span></view>
+				<view v-if="item.status ==4"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-d">已取消</span></view>
+				<view v-if="item.status ==5"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-e">已完成</span></view>
+				<view v-if="item.status ==6"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-f">服务中</span></view>
+				<view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">技师出发</span></view>
+				<view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">技师到达</span></view>
+				<view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待确认</span></view>
+				<view  v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view>
 				
 				<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
 			</view>
@@ -48,10 +48,10 @@
 							{{item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}}
 						</view>
 					</view>
-					<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;">
+					<view class="u-font-13 u-tips-color flex justify-between" style="margin-top: 6rpx;">
 						预约时间：{{item.serveTime}}
 					</view>
-					<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
+					<view class="flex-sub u-font-13 margin-top-xs" style="color: #999999;">
 						实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text>
 					</view>
 				</view>
@@ -127,21 +127,24 @@
 						<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1">
 							更多
 						</view>
-						<u-button
-							v-if="item.addNum==null&&item.oldOrdersId==null"
-							:custom-style="customStyle" shape="circle" :plain="true"
-							 class="btns xianshi"
-							@click="cancelOrder(item)">
-							取消订单
-						</u-button>
-						<u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
-								@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
-							充值
-						</u-button>
-						<u-button v-if="item.addNum ==null" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
-								@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
-							加钟
-						</u-button>
+						<view class="gengduoShow">
+							<u-button
+								v-if="item.addNum==null&&item.oldOrdersId==null"
+								:custom-style="customStyle" shape="circle" :plain="true"
+								 class="btns xianshi"
+								@click="cancelOrder(item)">
+								取消订单
+							</u-button>
+							<u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+									@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
+								充值
+							</u-button>
+							<u-button v-if="item.addNum ==null" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+									@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
+								加钟
+							</u-button>
+						</view>
+						
 						
 						<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
 							<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
@@ -804,6 +807,11 @@
 </script>
 
 <style lang="scss" scoped>
+	.gengduoShow{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
 	.gengduoBtn{
 		background: #fff;
 		color: #019C88;
@@ -827,7 +835,7 @@
 		margin-top: 5px !important;
 	}
 	/deep/.justify-between{
-		height: 60rpx;
+		height: 54rpx;
 	}
 	.gengduo{
 		font-weight: 400;
@@ -849,8 +857,10 @@
 		bottom: 0;
 		background-color: #fff;
 		padding: 10px;
-		margin-bottom: 50px;
-		margin-left: 10px;		
+		margin-bottom: 48px;
+		margin-left: 7px;
+		box-shadow: 1px 1px 3px 1px #f5f5f5;
+		border-radius:20rpx 20rpx  20rpx 1rpx;
 	}
 	.showBtn{
 	}
@@ -1035,4 +1045,56 @@
 	.bg {
 		background-color: #FFFFFF;
 	}
+	.margin-left-xs{
+		font-size: 31rpx;
+		font-weight: bold;
+	}
+	.status-button{
+		font-weight: bold;
+		color: #019c88;
+		font-size: 31rpx;
+	}
+	.status-button-a{
+		font-weight: bold;
+		color: #ff932a;
+	}
+	.status-button-b{
+		font-weight: bold;
+		color: #7446fc;
+	}
+	.status-button-d{
+		font-weight: bold;
+		color: #888888;
+	}
+	.status-button-e{
+		font-weight: bold;
+		color: #999999;
+	}
+	.status-button-f{
+		font-weight: bold;
+		color: #019c88;
+	}
+	.status-button-g{
+		font-weight: bold;
+		color: #e04f3c;
+	}
+	.status-button-h{
+		font-weight: bold;
+		color: #965fb9;
+	}
+	.status-button-i{
+		font-weight: bold;
+		color: #002ea4;
+	}
+	.status-button-g{
+		font-weight: bold;
+		color: #43b943;
+	}
+	.status-button-h{
+		font-weight: bold;
+		color: #1bcada;
+	}
+	.status-num{
+		margin-right: 15rpx;
+	}
 </style>
\ No newline at end of file