Merge branch 'master' of http://47.98.226.240:3000/twt/txCar

# Conflicts:
#	pages.json
#	pages/order/orderDetail.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDetail.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/pages/order/orderDetail.js
#	unpackage/dist/dev/mp-weixin/pages/order/orderDetail.wxml
#	unpackage/dist/dev/mp-weixin/pages/order/orderDetail.wxss

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 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>
@@ -75,14 +108,35 @@
 					</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 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>
@@ -169,14 +223,15 @@
 				</view>
 				<view class="informationLine">
 					<view class="informationTxt">确认收货时间：</view>
-					<view class="informationNum" v-if="orderData.ReceivingTime != null">{{orderData.ReceivingTime}}</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 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 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, // 二维码容错级别 ， 一般不用设置，默认就行
@@ -305,6 +360,8 @@
 				OrderTimes: '',
 				orderTimeIndex1: 0,
 				orderTimeIndex2: -1,
+				isShowMa:true,
+				
 			}
 		},
 		onLoad(opt) {
@@ -313,7 +370,7 @@
 			this.id = opt.id
 			this.getData()
 			this.type = opt.type;
-			this.getOrderTimes();
+			
 		},
 		onShow() {
 			if (this.id) {
@@ -321,6 +378,9 @@
 			}
 		},
 		methods: {
+			showMa(){
+				this.isShowMa = !this.isShowMa
+			},
 			gopingjia() {
 				uni.navigateTo({
 					url: '../me/myAppraiseDetail?id=' + this.id
@@ -406,6 +466,8 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					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;
@@ -655,7 +709,6 @@
 	.shopName {
 		font-size: 28rpx;
 		color: #3C3C3C;
-		font-weight: bold;
 	}
 
 	.Address {
@@ -677,7 +730,6 @@
 
 	.peopleCont {
 		font-size: 28rpx;
-		font-weight: bold;
 		color: #3C3C3C;
 		padding-left: 20rpx;
 	}
@@ -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 {
@@ -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>