1.订单详情,待预约

pages.json

@@ -200,7 +200,16 @@
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		} 
-	],
+	    ,{
+            "path" : "pages/changeStore/changeStore",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"tabBar": {
 		"color": "#8a8a8a",
 		"selectedColor": "#FF4F00",

pages/changeStore/changeStore.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/order/orderDetail.vue

@@ -22,10 +22,43 @@
 			<view class="SheetState" v-if="orderData.SheetState==0">订单已取消</view>
 		</view>
 		<view v-if="orderData">
-			<view class="orderTop">
-				
+
+			<view style="margin-top: -84rpx;"></view>
+
+			<!-- 服务确认码 -->
+			<view class="orderTop" v-if="orderData.SheetState==4 || orderData.SheetState==5">
+
+				<view class="maBox">
+
+					<view class="timeLeft">
+						<span>服务确认码</span>
+					</view>
+					<view style="text-decoration:line-through; color: #999999; font-size: 26rpx;" v-if="orderData.SheetState==5 && orderData.ServiceCode!=null">{{orderData.ServiceCode}}</view>
+					<view class="rightShou" v-if="orderData.SheetState==4">
+						<view class="timeRight" style="color: #FF2400;" @click="showMa">收起</view>
+						<image src="../../static/img/icon_arrow_up_orange.png" style="width: 17rpx; height: 11rpx;"></image>
+					</view>
+					<view style="color: #999999; font-size: 26rpx;" v-if="orderData.SheetState==5">已使用</view>
+				</view>
+				<!-- 确认码 -->
+				<view class="querenMa" v-if="isShowMa==true && orderData.SheetState==4">
+					<view style="color: #FF2400; font-size: 24rpx; text-align: center;">请到店出示券码即可开始服务</view>
+					<view class="maBoximg">
+						<tki-qrcode  cid="qrcode1" ref="qrcode" :val="orderData.ServiceCode" :size="308" :unit="unit"
+							:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
+							:loadMake="loadMake" :usingComponents="true" @result="qrR" />
+					</view>
+					<view style="color: #333333; font-size: 26rpx; font-weight: bold; text-align: center;">36582496825
+					</view>
+				</view>
+
+			</view>
+
+			<!-- 服务信息 -->
+			<view class="orderTop">
+
 				<view class="timeBox">
-					
+
 					<view class="timeLeft">
 						<span>服务信息</span>
 					</view>
@@ -36,7 +69,7 @@
 					<image src="../../static/img/icon_ren.png" mode="" class="shopBoximg"></image>
 					<view class="peopleCont">{{orderData.ContactName}}</view>
 					<view class="peopleCont" style="padding-left: 20rpx;">{{orderData.ContactPhone}}</view>
-				</view>
+				</view>
 				<!-- 车辆信息 -->
 				<view class="PlateNumberBox">
 					<image src="../../static/img/icon_che.png" mode="" class="shopBoximg"></image>
@@ -50,39 +83,60 @@
 						<view class="CarModel">{{orderData.CarModel}}</view>
 					</view>
 				</view>
-				<!-- 店铺信息 -->
-				<view class="shopBox">
-					<image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
-					<view class="shopCont">
-						<view class="shopName">{{orderData.ShopName}}</view>
-						<view class="Address">
-							{{orderData.ProvinceName}}{{orderData.CityName}}{{orderData.AreaName}}{{orderData.Address}}
-						</view>
-						<view style="color: #3F90F7; font-size: 26rpx;" v-if="orderData.SheetState==2">申请更换服务门店</view>
-					</view>
-					<view class="shopRightBox" @click="map">
-						<view>
-							<image src="../../static/img/icon_ditu.png" mode="" class="shopRightImg"></image>
-						</view>
-						<view class="shopRihgtTxt">地图</view>
-					</view>
-					<view class="shopsx"></view>
-					<view class="shopRightBox" @click="call">
-						<view>
-							<image src="../../static/img/icon_phone.png" mode="" class="shopRightImg"></image>
-						</view>
-						<view class="shopRihgtTxt">电话</view>
-					</view>
+				<!-- 店铺信息 -->
+				<view class="shopBox">
+					<image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
+					<view class="shopCont">
+						<view class="shopName">{{orderData.ShopName}}</view>
+						<view class="Address">
+							{{orderData.ProvinceName}}{{orderData.CityName}}{{orderData.AreaName}}{{orderData.Address}}
+						</view>
+						<view style="color: #3F90F7; font-size: 26rpx;" v-if="orderData.SheetState==2">申请更换服务门店</view>
+					</view>
+					<view class="shopRightBox" @click="map">
+						<view>
+							<image src="../../static/img/icon_ditu.png" mode="" class="shopRightImg"></image>
+						</view>
+						<view class="shopRihgtTxt">地图</view>
+					</view>
+					<view class="shopsx"></view>
+					<view class="shopRightBox" @click="call">
+						<view>
+							<image src="../../static/img/icon_phone.png" mode="" class="shopRightImg"></image>
+						</view>
+						<view class="shopRihgtTxt">电话</view>
+					</view>
 				</view>
-			</view>
-			
-			<!-- <view class="timeLeft">
-				   <span v-if="orderData.SheetState==1||orderData.SheetState==2||orderData.SheetState==0">预约到店：{{orderData.OrderTime}}</span>
-				   <span v-else>服务时间：{{orderData.ServiceTime}}</span>
-				   <image v-if="orderData.SheetState==1||orderData.SheetState==2" src="../../static/img/icon_edit.png" mode="" class="timeEditImg" @click="timeShowClick"></image>
-			   </view> -->
-			
-			<view style="margin-top: -40rpx;"></view>
+			</view>
+
+
+
+			<!-- 预约信息 -->
+			<view class="yuyueBox" v-if="orderData.SheetState==4 && (orderData.OrderState==2 || orderData.OrderState==3)">
+
+				<view class="timeBox">
+
+					<view class="timeLeft">
+						<span>预约信息</span>
+					</view>
+
+				</view>
+				<view class="yuyueTime">
+					<image src="../../static/img/icon_time.png" mode="" class="shopBoximg"></image>
+					<view class="peopleCont">预约到店</view>
+					<view class="peopleCont" style="padding-left: 20rpx;">{{orderData.ContactPhone}}</view>
+					<image v-if="orderData.OrderState==2" src="../../static/img/icon_edit.png" mode="" class="timeEditImg"
+						@click="timeShowClick"></image>
+				</view>
+				<view class="yuyueState">
+					<image src="../../static/img/icon_state.png" mode="" class="shopBoximg"></image>
+					<view class="peopleCont">预约状态</view>
+					<view class="peopleCont" style="padding-left: 20rpx;" v-if="orderData.OrderState==2">待确认</view>
+					<view class="peopleCont" style="padding-left: 20rpx;" v-if="orderData.OrderState==3">已确认</view>
+				</view>
+
+			</view>
+
 			<!-- 商品明细-->
 			<view class="detailedBox itemBox" v-if="orderData.goods.length!=0">
 				<view class="detailedTitle">商品明细</view>
@@ -102,7 +156,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<!-- 项目明细 -->
 			<view class="detailedBox itemBox" v-if=" orderData.items.length!=0">
 				<view class="detailedTitle">项目明细</view>
@@ -122,7 +176,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<!-- 费用明细 -->
 			<view class="goodscost">
 				<view class="goodscostLine">
@@ -142,7 +196,7 @@
 					<view class="goodsCostNum" style="color: #FF4F00;">￥{{orderData.PayMoney}}</view>
 				</view>
 			</view>
-			
+
 			<!-- 订单信息 -->
 			<view class="information">
 				<view class="detailedTitle">订单信息</view>
@@ -162,21 +216,22 @@
 				<view class="informationLine">
 					<view class="informationTxt">下单备注：</view>
 					<view class="informationNum">{{orderData.Comment}}</view>
-				</view>
-				<view class="informationLine">
-					<view class="informationTxt">确认订单时间：</view>
-					<view class="informationNum" v-if="orderData.ConfirmTime != null">{{orderData.ConfirmTime}}</view>
-				</view>
-				<view class="informationLine">
-					<view class="informationTxt">确认收货时间：</view>
-					<view class="informationNum" v-if="orderData.ReceivingTime != null">{{orderData.ReceivingTime}}</view>
-				</view>
-				<view class="informationLine">
-					<view class="informationTxt">服务完成时间：</view>
-					<view class="informationNum" v-if="orderData.ServiceTime != null">{{orderData.ServiceTime}}</view>
+				</view>
+				<view class="informationLine">
+					<view class="informationTxt">确认订单时间：</view>
+					<view class="informationNum" v-if="orderData.ConfirmTime != null">{{orderData.ConfirmTime}}</view>
+				</view>
+				<view class="informationLine">
+					<view class="informationTxt">确认收货时间：</view>
+					<view class="informationNum" v-if="orderData.ReceivingTime != null">{{orderData.ReceivingTime}}
+					</view>
+				</view>
+				<view class="informationLine">
+					<view class="informationTxt">服务完成时间：</view>
+					<view class="informationNum" v-if="orderData.ServiceTime != null">{{orderData.ServiceTime}}</view>
 				</view>
 			</view>
-			
+
 			<!-- 支付信息 -->
 			<view class="information">
 				<view class="detailedTitle">支付信息</view>
@@ -184,40 +239,40 @@
 					<view class="informationTxt">支付方式：</view>
 					<view class="informationNum">在线支付</view>
 				</view>
-				
+
 				<view class="informationLine">
 					<view class="informationTxt">支付时间：</view>
 					<view class="informationNum" v-if="orderData.PayTime">{{orderData.PayTime}}</view>
 				</view>
-			</view>
-			
+			</view>
+
 			<!-- 底部按钮 操作 -->
 			<view style="height: 150rpx;"></view>
 			<view class="orderBottom" v-if="orderData.SheetState==1">
 				<view class="cancelBtn" @click="cancelOrder">取消订单</view>
 				<view class="payBtn" @click="orderPay">立即支付</view>
-			</view>
-			
-			<view class="orderBottom" v-if="orderData.SheetState==2">
-				<view class="cancelBtn" @click="cancelOrder">申请退款</view>
-			</view>
-			
-			<view class="orderBottom" v-if="orderData.SheetState==3">
-				<view class="cancelBtn" @click="cancelOrder">申请退款</view>
-			</view>
-			
-			<view class="orderBottom" v-if="orderData.SheetState==4">
-				<view class="cancelBtn" @click="cancelOrder">申请退款</view>
-				<view class="payBtn" @click="orderPay">立即预约</view>
-			</view>
-			
-			<view class="orderBottom" v-if="orderData.SheetState==5&&orderData.EvaluateState==0">
-				<view class="payBtn" @click="evaluate">立即评价</view>
+			</view>
+
+			<view class="orderBottom" v-if="orderData.SheetState==2">
+				<view class="cancelBtn" @click="cancelOrder">申请退款</view>
+			</view>
+
+			<view class="orderBottom" v-if="orderData.SheetState==3">
+				<view class="cancelBtn" @click="cancelOrder">申请退款</view>
+			</view>
+
+			<view class="orderBottom" v-if="orderData.SheetState==4">
+				<view class="cancelBtn" @click="cancelOrder">申请退款</view>
+				<view class="payBtn" @click="timeShowClick">立即预约</view>
+			</view>
+
+			<view class="orderBottom" v-if="orderData.SheetState==5&&orderData.EvaluateState==0">
+				<view class="payBtn" @click="evaluate">立即评价</view>
 			</view>
 			<view class="orderBottom" v-if="orderData.SheetState==5&&orderData.EvaluateState==1">
 				<view class="cancelBtn" style="margin-right: 16rpx;" @click="gopingjia">查看评价</view>
 			</view>
-			
+
 			<!-- 二维码 -->
 			<view v-if="qrcodeShow" class="qrcodeBox" @click="qrcodeShow=false">
 				<view @click.stop="qrc">
@@ -228,7 +283,7 @@
 
 
 			</view>
-			
+
 			<!-- 预约时间 -->
 			<view class="timeBox2" v-if="timeShow&&OrderTimes" @click="timeShow=false">
 				<view class="timeMain">
@@ -295,7 +350,7 @@
 				unit: 'upx', // 单位
 				background: '#b4e9e2', // 背景色
 				foreground: '#309286', // 前景色
-				pdground: '#32dbc6', // 角标色
+				pdground: '#262637', // 角标色
 				icon: '', // 二维码图标
 				iconsize: 40, // 二维码图标大小
 				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
@@ -304,7 +359,9 @@
 				orderTime: '',
 				OrderTimes: '',
 				orderTimeIndex1: 0,
-				orderTimeIndex2: -1,
+				orderTimeIndex2: -1,
+				isShowMa:true,
+				
 			}
 		},
 		onLoad(opt) {
@@ -313,14 +370,17 @@
 			this.id = opt.id
 			this.getData()
 			this.type = opt.type;
-			this.getOrderTimes();
+			
 		},
 		onShow() {
 			if (this.id) {
 				this.getData()
 			}
 		},
-		methods: {
+		methods: {
+			showMa(){
+				this.isShowMa = !this.isShowMa
+			},
 			gopingjia() {
 				uni.navigateTo({
 					url: '../me/myAppraiseDetail?id=' + this.id
@@ -405,7 +465,9 @@
 					id: this.id,
 				}, 'GET').then(res => {
 					uni.hideLoading();
-					this.orderData = res.data;
+					this.orderData = res.data;
+					
+					this.getOrderTimes();
 				})
 			},
 			goback() {
@@ -423,11 +485,7 @@
 					url: 'evaluate?sheetID=' + this.id + '&shopID=' + this.orderData.ShopID
 				})
 			},
-			goIndex() {
-				uni.switchTab({
-					url: '../index/index'
-				})
-			},
+			
 			cancelOrder() {
 				var that = this;
 				uni.showModal({
@@ -436,7 +494,7 @@
 					success: function(res) {
 						if (res.confirm) {
 							uni.showLoading({});
-							that.$http('miniAppMyBMemberCar/updateBMSheetState', {
+							that.$http('worldKeepCar/keepCarMy/cancelMiNiTMSheet', {
 								id: that.orderData.ID
 							}, 'POST').then(res => {
 								uni.hideLoading();
@@ -491,7 +549,7 @@
 			},
 			timeCk() {
 				this.timeShow = false;
-				this.$http('miniApp/maintainOrder/changeOrderTime', {
+				this.$http('worldKeepCar/keepCarMy/changeTSheetTime', {
 					id: this.id,
 					orderTime: this.orderTime
 				}, 'POST').then(res => {
@@ -506,8 +564,8 @@
 				})
 			},
 			getOrderTimes() {
-				this.$http('miniApp/maintainOrder/getOrderTimes', {
-
+				this.$http('worldKeepCar/keepCarMy/getTSheetTimes', {
+					shopId: this.orderData.ShopID,
 				}, 'GET').then(res => {
 
 					this.OrderTimes = res.data;
@@ -589,10 +647,9 @@
 	}
 
 	.orderTop {
-		width: 702rpx;
 		background: #FFFFFF;
 		border-radius: 10rpx;
-		margin-left: 24rpx;
+		margin: 20rpx 24rpx;
 	}
 
 	.timeEditImg {
@@ -604,7 +661,7 @@
 	.timeLeft {
 		font-size: 32rpx;
 		color: #3C3C3C;
-		
+
 	}
 
 	.timeRight {
@@ -619,10 +676,7 @@
 		border-bottom: 1rpx solid #EEEEEE;
 	}
 
-	.orderTop {
-		position: relative;
-		top: -44rpx;
-	}
+
 
 	.shopBoximg {
 		width: 40rpx;
@@ -654,8 +708,7 @@
 
 	.shopName {
 		font-size: 28rpx;
-		color: #3C3C3C;
-		font-weight: bold;
+		color: #3C3C3C;
 	}
 
 	.Address {
@@ -677,14 +730,13 @@
 
 	.peopleCont {
 		font-size: 28rpx;
-		font-weight: bold;
 		color: #3C3C3C;
 		padding-left: 20rpx;
 	}
 
 	.people {
 		display: flex;
-		padding-left: 20rpx;
+		padding-left: 20rpx;
 		padding-top: 30rpx;
 		padding-bottom: 36rpx;
 	}
@@ -729,12 +781,11 @@
 	}
 
 	.detailedBox {
-		width: 702rpx;
+
 		background: #FFFFFF;
 		border-radius: 10px;
-		margin-left: 24rpx;
-		margin-top: -60rpx;
-		padding-bottom: 20rpx;
+		margin: 20rpx 24rpx;
+		padding: 20rpx 0;
 	}
 
 	.itemBox {
@@ -865,8 +916,8 @@
 		line-height: 56rpx;
 		font-size: 28rpx;
 		color: #3C3C3C;
-		margin-top: 21rpx;
-		margin-right: 16rpx;
+		margin-top: 21rpx;
+		margin-right: 16rpx;
 		margin-left: 20rpx;
 	}
 
@@ -1025,4 +1076,52 @@
 		padding: 28rpx 10rpx;
 		border-bottom: 1px solid #EEEEEE;
 	}
+
+	.yuyueBox {
+
+		background: #FFFFFF;
+		border-radius: 10rpx;
+		margin-left: 24rpx;
+		margin-right: 24rpx;
+
+	}
+
+	.yuyueTime {
+		display: flex;
+		padding-left: 20rpx;
+		padding-top: 30rpx;
+		padding-bottom: 36rpx;
+		align-items: center;
+	}
+
+	.yuyueState {
+		display: flex;
+		padding-left: 20rpx;
+		padding-top: 30rpx;
+		padding-bottom: 36rpx;
+	}
+
+	.maBox {
+		display: flex;
+		justify-content: space-between;
+		padding: 24rpx 20rpx;
+	}
+
+	.querenMa {
+
+		margin: 20rpx 0;
+		padding-bottom: 30rpx;
+	}
+
+	.maBoximg {
+		width: 308rpx;
+		height: 308rpx;
+		margin: 30rpx 197rpx;
+
+	}
+	.rightShou{
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
 </style>

unpackage/dist/dev/mp-weixin/app.json

@@ -27,7 +27,8 @@
     "pages/me/myAppraiseDetail",
     "pages/me/feedBack",
     "pages/shop/ckShop",
-    "pages/shop/shopDetail"
+    "pages/shop/shopDetail",
+    "pages/changeStore/changeStore"
   ],
   "subPackages": [],
   "window": {
@@ -67,6 +68,5 @@
       "desc": "获取定位"
     }
   },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/order/orderDetail.js

@@ -452,6 +452,61 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -496,7 +551,7 @@ __webpack_require__.r(__webpack_exports__);
       unit: 'upx', // 单位
       background: '#b4e9e2', // 背景色
       foreground: '#309286', // 前景色
-      pdground: '#32dbc6', // 角标色
+      pdground: '#262637', // 角标色
       icon: '', // 二维码图标
       iconsize: 40, // 二维码图标大小
       lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
@@ -505,7 +560,9 @@ __webpack_require__.r(__webpack_exports__);
       orderTime: '',
       OrderTimes: '',
       orderTimeIndex1: 0,
-      orderTimeIndex2: -1 };
+      orderTimeIndex2: -1,
+      isShowMa: true };
+
 
   },
   onLoad: function onLoad(opt) {
@@ -514,7 +571,7 @@ __webpack_require__.r(__webpack_exports__);
     this.id = opt.id;
     this.getData();
     this.type = opt.type;
-    this.getOrderTimes();
+
   },
   onShow: function onShow() {
     if (this.id) {
@@ -522,6 +579,9 @@ __webpack_require__.r(__webpack_exports__);
     }
   },
   methods: {
+    showMa: function showMa() {
+      this.isShowMa = !this.isShowMa;
+    },
     gopingjia: function gopingjia() {
       uni.navigateTo({
         url: '../me/myAppraiseDetail?id=' + this.id });
@@ -607,6 +667,8 @@ __webpack_require__.r(__webpack_exports__);
       'GET').then(function (res) {
         uni.hideLoading();
         _this.orderData = res.data;
+
+        _this.getOrderTimes();
       });
     },
     goback: function goback() {
@@ -624,11 +686,7 @@ __webpack_require__.r(__webpack_exports__);
         url: 'evaluate?sheetID=' + this.id + '&shopID=' + this.orderData.ShopID });
 
     },
-    goIndex: function goIndex() {
-      uni.switchTab({
-        url: '../index/index' });
 
-    },
     cancelOrder: function cancelOrder() {
       var that = this;
       uni.showModal({
@@ -637,7 +695,7 @@ __webpack_require__.r(__webpack_exports__);
         success: function success(res) {
           if (res.confirm) {
             uni.showLoading({});
-            that.$http('miniAppMyBMemberCar/updateBMSheetState', {
+            that.$http('worldKeepCar/keepCarMy/cancelMiNiTMSheet', {
               id: that.orderData.ID },
             'POST').then(function (res) {
               uni.hideLoading();
@@ -692,7 +750,7 @@ __webpack_require__.r(__webpack_exports__);
     },
     timeCk: function timeCk() {var _this2 = this;
       this.timeShow = false;
-      this.$http('miniApp/maintainOrder/changeOrderTime', {
+      this.$http('worldKeepCar/keepCarMy/changeTSheetTime', {
         id: this.id,
         orderTime: this.orderTime },
       'POST').then(function (res) {
@@ -707,8 +765,8 @@ __webpack_require__.r(__webpack_exports__);
       });
     },
     getOrderTimes: function getOrderTimes() {var _this3 = this;
-      this.$http('miniApp/maintainOrder/getOrderTimes', {},
-
+      this.$http('worldKeepCar/keepCarMy/getTSheetTimes', {
+        shopId: this.orderData.ShopID },
       'GET').then(function (res) {
 
         _this3.OrderTimes = res.data;

unpackage/dist/dev/mp-weixin/pages/order/orderDetail.wxss

@@ -54,10 +54,9 @@
 	padding-top: 50rpx;
 }
 .orderTop.data-v-cbd5a456 {
-	width: 702rpx;
 	background: #FFFFFF;
 	border-radius: 10rpx;
-	margin-left: 24rpx;
+	margin: 20rpx 24rpx;
 }
 .timeEditImg.data-v-cbd5a456 {
 	width: 25rpx;
@@ -78,10 +77,6 @@
 	padding: 24rpx 20rpx;
 	border-bottom: 1rpx solid #EEEEEE;
 }
-.orderTop.data-v-cbd5a456 {
-	position: relative;
-	top: -44rpx;
-}
 .shopBoximg.data-v-cbd5a456 {
 	width: 40rpx;
 	height: 40rpx;
@@ -108,7 +103,6 @@
 .shopName.data-v-cbd5a456 {
 	font-size: 28rpx;
 	color: #3C3C3C;
-	font-weight: bold;
 }
 .Address.data-v-cbd5a456 {
 	color: #999999;
@@ -126,7 +120,6 @@
 }
 .peopleCont.data-v-cbd5a456 {
 	font-size: 28rpx;
-	font-weight: bold;
 	color: #3C3C3C;
 	padding-left: 20rpx;
 }
@@ -171,12 +164,11 @@
 	width: 600rpx;
 }
 .detailedBox.data-v-cbd5a456 {
-	width: 702rpx;
+
 	background: #FFFFFF;
 	border-radius: 10px;
-	margin-left: 24rpx;
-	margin-top: -60rpx;
-	padding-bottom: 20rpx;
+	margin: 20rpx 24rpx;
+	padding: 20rpx 0;
 }
 .itemBox.data-v-cbd5a456 {
 	margin-top: 20rpx;
@@ -423,4 +415,44 @@
 	padding: 28rpx 10rpx;
 	border-bottom: 1px solid #EEEEEE;
 }
+.yuyueBox.data-v-cbd5a456 {
+
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	margin-left: 24rpx;
+	margin-right: 24rpx;
+}
+.yuyueTime.data-v-cbd5a456 {
+	display: flex;
+	padding-left: 20rpx;
+	padding-top: 30rpx;
+	padding-bottom: 36rpx;
+	align-items: center;
+}
+.yuyueState.data-v-cbd5a456 {
+	display: flex;
+	padding-left: 20rpx;
+	padding-top: 30rpx;
+	padding-bottom: 36rpx;
+}
+.maBox.data-v-cbd5a456 {
+	display: flex;
+	justify-content: space-between;
+	padding: 24rpx 20rpx;
+}
+.querenMa.data-v-cbd5a456 {
+
+	margin: 20rpx 0;
+	padding-bottom: 30rpx;
+}
+.maBoximg.data-v-cbd5a456 {
+	width: 308rpx;
+	height: 308rpx;
+	margin: 30rpx 197rpx;
+}
+.rightShou.data-v-cbd5a456{
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+}