历史消费车辆优化

# Conflicts:
#	pages/user/historySpend.vue

pages/user/historySpend.vue

@@ -12,17 +12,17 @@
 		</view>
 		<view style="height: 90rpx;"></view>
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="goDetail(item)">
-			<view class="topBox">
-				<view class="dan">{{item.code}}</view>
-				
-				<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
-				<view class="stateBox" v-if="item.SheetType == 1">
-					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
-					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 0">待施工</view>
-					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 1">施工中</view>
-					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 2">已完工</view>
-					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 3">已质检</view>
-					<view class="danState"   v-if="item.SheetState == 4">已作废</view>
+			<view class="topBox">
+				<view class="dan">{{item.code}}</view>
+				
+				<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
+				<view class="stateBox" v-if="item.SheetType == 1">
+					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
+					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 0">待施工</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 1">施工中</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 2">已完工</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2,danState3:item.PayState == 0}" v-if="item.SheetState == 3">已质检</view>
+					<view class="danState"   v-if="item.SheetState == 4">已作废</view>
 					<!-- 结算状态 -->
 					<view v-if="item.SheetState == 4">
 						<view class="danState" v-if="item.PayState == 0">/未结算</view>
@@ -31,15 +31,15 @@
 					<view v-else>
 						<view class="danState3" v-if="item.PayState == 0">/未结算</view>
 						<view class="danState2" v-if="item.PayState == 2">/已结算</view>
-					</view>
-					
-					
-				</view>
-				<view class="stateBox"  v-if="item.SheetType == 2">
-					<!-- 0待施工（已保存）1施工中（已派工）2已审核 3已质检 4 已作废 -->
-					<view class="danState"  :class="{danState3:item.PayState == 2}" v-if="item.SheetState < 2 ">未审核</view>
-					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 2">已审核</view>
-					<view class="danState"  v-if="item.SheetState == 4">已作废</view>
+					</view>
+					
+					
+				</view>
+				<view class="stateBox"  v-if="item.SheetType == 2">
+					<!-- 0待施工（已保存）1施工中（已派工）2已审核 3已质检 4 已作废 -->
+					<view class="danState"  :class="{danState3:item.PayState == 2}" v-if="item.SheetState < 2 ">未审核</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 2">已审核</view>
+					<view class="danState"  v-if="item.SheetState == 4">已作废</view>
 					<!-- 结算状态 -->
 					<view v-if="item.SheetState == 4">
 						<view class="danState" v-if="item.PayState == 0">/未结算</view>
@@ -48,15 +48,15 @@
 					<view v-else>
 						<view class="danState3" v-if="item.PayState == 0">/未结算</view>
 						<view class="danState2" v-if="item.PayState == 2">/已结算</view>
-					</view>
-					
-					
-					
-				</view>
-				<view class="stateBox"  v-if="item.SheetType == 3">
-					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
-					<view class="danState" :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 0">已保存</view>
-					<view class="danState"  v-if="item.SheetState == 4">已作废</view>
+					</view>
+					
+					
+					
+				</view>
+				<view class="stateBox"  v-if="item.SheetType == 3">
+					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
+					<view class="danState" :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 0">已保存</view>
+					<view class="danState"  v-if="item.SheetState == 4">已作废</view>
 					<!-- 结算状态 -->
 					<view v-if="item.SheetState == 4">
 						<view class="danState" v-if="item.PayState == 0">/未结算</view>
@@ -65,41 +65,41 @@
 					<view v-else>
 						<view class="danState" v-if="item.PayState == 0">/未结算</view>
 						<view class="danState2" v-if="item.PayState == 2">/已结算</view>
-					</view>
-					
-				</view>
-				
-			</view>
-			
+					</view>
+					
+				</view>
+				
+			</view>
+			
 			
 			<view class="carPlate">
-				<view class="plateBox">
-					<view class="plate">{{item.PlateNumber}}</view>
-					
-					<view class="mileage" v-if="item.CurrentMileage>0">{{item.CurrentMileage}}km</view>
-				</view>
+				<view class="plateBox">
+					<view class="plate">{{item.PlateNumber}}</view>
+					
+					<view class="mileage" v-if="item.CurrentMileage>0">{{item.CurrentMileage}}km</view>
+				</view>
 				<view v-if="ReceiptsMoney" class="price"><span style="font-size: 22rpx;">￥</span>{{item.money?item.money:0}}</view>
-			</view>
+			</view>
 			<view class="time">{{item.time}}</view>
 
-			<view class="shopName">{{item.ShopName}}</view>
+			<view class="shopName">{{item.ShopName}}</view>
 			
-			<!-- <view class="itemN" v-if="item.listItems.length != 0">
-				<view class="itemContent" v-if="item.listItems.length != 0" v-for="(v,i) in item.listItems">{{v.ItemName}},</view>
-			</view>
-			<view class="itemN" v-if="item.listParts.length != 0">
-				<view class="itemContent" v-if="item.listParts.length != 0" v-for="(v,i) in item.listParts">{{v.GoodsName}},</view>
+			<!-- <view class="itemN" v-if="item.listItems.length != 0">
+				<view class="itemContent" v-if="item.listItems.length != 0" v-for="(v,i) in item.listItems">{{v.ItemName}},</view>
+			</view>
+			<view class="itemN" v-if="item.listParts.length != 0">
+				<view class="itemContent" v-if="item.listParts.length != 0" v-for="(v,i) in item.listParts">{{v.GoodsName}},</view>
 			</view> -->
 			<view class="itemN" v-if="item.ItemName">
 				<view class="itemContent" >{{item.ItemName}}</view>
 			</view>
 			<view class="itemN" v-if="item.GoodsName">
 				<view class="itemContent" >{{item.GoodsName}}</view>
-			</view>
-			
-			<view v-if="((item.PayState == 2) && (appraise == true) && ((item.lastDay <= 30 && item.EvaluateState == 0) || item.EvaluateState == 1))" class="bottom">
-				<view v-if="(item.EvaluateState == 0) && (item.lastDay <= 30) && appraise == true && item.PayState == 2" @click.stop="goAppraise(item)" class="ping">评价</view>
-				<view v-if="item.EvaluateState == 1" @click.stop="goAppraiseDetail(item)" class="kan">查看评价</view>
+			</view>
+			
+			<view v-if="((item.PayState == 2) && (appraise == true) && ((item.lastDay <= 30 && item.EvaluateState == 0) || item.EvaluateState == 1))" class="bottom">
+				<view v-if="(item.EvaluateState == 0) && (item.lastDay <= 30) && appraise == true && item.PayState == 2" @click.stop="goAppraise(item)" class="ping">评价</view>
+				<view v-if="item.EvaluateState == 1" @click.stop="goAppraiseDetail(item)" class="kan">查看评价</view>
 			</view>
 		</view>
 		<view class="itemHistory" v-for="(item,index) in oldlist" :key="index" @click="goDetail2(item)">
@@ -145,7 +145,7 @@
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
-				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">
@@ -168,11 +168,11 @@
 				page: 1,
 				itemData: [],
 				oldlist:[],
-				noMoreShow: false,
-				appraise:false,
+				noMoreShow: false,
+				appraise:false,
 				ReceiptsMoney:false,//支付金额
 				iStatusBarHeight:'',
-				array: [],
+				array: ['全部'],
 				index: 0,
 				wxOpenData: '',
 				plateNumber:'',
@@ -252,48 +252,50 @@
 				this.$http('openweiXinCardInfoController/plateNumber-by-customerId', {
 				    customerId:this.wxOpenData.loginInfo.uid
 				}, 'GET').then(res => {
-					this.array=res.data.split(',')
-					this.array.unshift('全部')
+					//res.data='黑A036M7,黑A1BQ82,黑AF17330'
+					var arr = res.data.split(',')
+					this.array=this.array.concat(arr)
+					//this.array.unshift('全部')
+				}) 
+			},
+			//显示权限
+			showPower() {
+				this.$http('openweiXinCardInfoController/getShowSetting', {
+			
+				}, 'GET').then(res => {
+					var list = res.data
+					list.forEach((item, index) => {
+						
+						if (item.fieldValue == 'ReceiptsMoney') {
+							this.ReceiptsMoney = item.isChecked
+						}
+						
+						
+						
+					})
+					
+				})
+			},
+			//评价权限
+			myPower() {
+				this.$http('openMiniEvaluate/getEvaluateSetting', {
+			
+				}, 'GET').then(res => {
+					// var list = res.data.Items
+					this.appraise = res.data
+					
+					
+				})
+			},
+			goAppraiseDetail(item) {
+				uni.navigateTo({
+					url: 'myAppraiseDetail?sheetId=' + item.id
+				})
+			},
+			goAppraise(item){
+				uni.navigateTo({
+					url: 'appraise?sheetID=' + item.id + '&shopID=' + item.shopID
 				})
-			},
-			//显示权限
-			showPower() {
-				this.$http('openweiXinCardInfoController/getShowSetting', {
-			
-				}, 'GET').then(res => {
-					var list = res.data
-					list.forEach((item, index) => {
-						
-						if (item.fieldValue == 'ReceiptsMoney') {
-							this.ReceiptsMoney = item.isChecked
-						}
-						
-						
-						
-					})
-					
-				})
-			},
-			//评价权限
-			myPower() {
-				this.$http('openMiniEvaluate/getEvaluateSetting', {
-			
-				}, 'GET').then(res => {
-					// var list = res.data.Items
-					this.appraise = res.data
-					
-					
-				})
-			},
-			goAppraiseDetail(item) {
-				uni.navigateTo({
-					url: 'myAppraiseDetail?sheetId=' + item.id
-				})
-			},
-			goAppraise(item){
-				uni.navigateTo({
-					url: 'appraise?sheetID=' + item.id + '&shopID=' + item.shopID
-				})
 			},
 			goDetail(item) {
 				 uni.navigateTo({
@@ -306,7 +308,7 @@
 					url: '../subPack/oldhistoryDetail?id=' + item.id + '&lastDay=' + item.lastDay
 				})
 			},
-			myOrderCoupon() {
+			myOrderCoupon() {
 				let that = this
 				uni.showLoading({
 					title: '加载中'
@@ -317,9 +319,9 @@
 					// limit: 10,
 				}, 'POST').then(res => {
 					uni.hideLoading();
-					// var list = res.data.Items
+					// var list = res.data.Items
 					var list = res.data
-					
+					
 					
 
 					if (this.page == 1) {
@@ -355,62 +357,62 @@
 					}
 				})
 			},
-			//时间对比
-			getDateBeforeNow(stringTime) {
-							console.log("传参未格式化", stringTime);
-							stringTime = new Date(stringTime.replace(/-/g, '/'))
-			
-							// 统一单位换算
-							var minute = 1000 * 60;
-							var hour = minute * 60;
-							var day = hour * 24;
-							var week = day * 7;
-							var month = day * 30;
-							var year = month * 12;
-			
-							var time1 = new Date().getTime(); //当前的时间戳
-							console.log("当前时间", time1);
-			
-							// 对时间进行毫秒单位转换
-							var time2 = new Date(stringTime).getTime(); //指定时间的时间戳
-			
-							console.log("传过来的时间", time2);
-			
-							var time = time1 - time2;
-							console.log("计算后的时间", time);
-			
-							var result = null;
-							// if (time < 0) {
-							// 	// alert("传过来的时间的时间不能晚于当前时间！");
-							// 	result = stringTime;
-							// } else if (time / year >= 1) {
-							// 	result = parseInt(time / year) + "年前";
-							// } else if (time / month >= 1) {
-							// 	result = parseInt(time / month) + "月前";
-							// } else if (time / week >= 1) {
-							// 	result = parseInt(time / week) + "周前";
-							// } else if (time / day >= 1) {
-							// 	result = parseInt(time / day) + "天前";
-							// } else if (time / hour >= 1) {
-							// 	result = parseInt(time / hour) + "小时前";
-							// } else if (time / minute >= 1) {
-							// 	result = parseInt(time / minute) + "分钟前";
-							// } else {
-							// 	result = "刚刚";
-							// }
-							
-							if (time < 0) {
-								// alert("传过来的时间的时间不能晚于当前时间！");
-								result = -1;
-							} else if (time / day >= 0) {
-								result = parseInt(time / day);//多少天前
-							}
-							console.log("多少天前", result);
-							return result;
+			//时间对比
+			getDateBeforeNow(stringTime) {
+							console.log("传参未格式化", stringTime);
+							stringTime = new Date(stringTime.replace(/-/g, '/'))
+			
+							// 统一单位换算
+							var minute = 1000 * 60;
+							var hour = minute * 60;
+							var day = hour * 24;
+							var week = day * 7;
+							var month = day * 30;
+							var year = month * 12;
+			
+							var time1 = new Date().getTime(); //当前的时间戳
+							console.log("当前时间", time1);
+			
+							// 对时间进行毫秒单位转换
+							var time2 = new Date(stringTime).getTime(); //指定时间的时间戳
+			
+							console.log("传过来的时间", time2);
+			
+							var time = time1 - time2;
+							console.log("计算后的时间", time);
+			
+							var result = null;
+							// if (time < 0) {
+							// 	// alert("传过来的时间的时间不能晚于当前时间！");
+							// 	result = stringTime;
+							// } else if (time / year >= 1) {
+							// 	result = parseInt(time / year) + "年前";
+							// } else if (time / month >= 1) {
+							// 	result = parseInt(time / month) + "月前";
+							// } else if (time / week >= 1) {
+							// 	result = parseInt(time / week) + "周前";
+							// } else if (time / day >= 1) {
+							// 	result = parseInt(time / day) + "天前";
+							// } else if (time / hour >= 1) {
+							// 	result = parseInt(time / hour) + "小时前";
+							// } else if (time / minute >= 1) {
+							// 	result = parseInt(time / minute) + "分钟前";
+							// } else {
+							// 	result = "刚刚";
+							// }
+							
+							if (time < 0) {
+								// alert("传过来的时间的时间不能晚于当前时间！");
+								result = -1;
+							} else if (time / day >= 0) {
+								result = parseInt(time / day);//多少天前
+							}
+							console.log("多少天前", result);
+							return result;
 						},
 			
 
-		},
+		},
 		
 
 		// 下拉刷新 
@@ -420,8 +422,8 @@
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
-		},
-		
+		},
+		
 		// 上拉加载更多
 		onReachBottom() {
 			// this.page++;
@@ -434,7 +436,7 @@
 	.box {
 		min-height: 100vh;
 		background-color: #F4F5F7;
-		padding-top: 20rpx;
+		padding-top: 20rpx;
 		
 	}
 .jtImg{
@@ -458,28 +460,28 @@
 		padding: 20rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
-	}
-	.topBox{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
 	}
-	.dan {
-		font-size: 24rpx;
-		
-		color: #999999;
-	}
-	.stateBox{
-		display: flex;
-	}
-	.danState{
-		font-size: 24rpx;
-		color: #999999;
-		
-	}
-	.danState2{
+	.topBox{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.dan {
+		font-size: 24rpx;
+		
+		color: #999999;
+	}
+	.stateBox{
+		display: flex;
+	}
+	.danState{
+		font-size: 24rpx;
+		color: #999999;
+		
+	}
+	.danState2{
 		font-size: 24rpx;
-		    color: #00A040;
+		    color: #00A040;
 	}
 	.danState3{
 		font-size: 24rpx;
@@ -496,9 +498,9 @@
 		align-items: center;
 		justify-content: space-between;
 	}
-	
-	.plateBox {
-		display: flex;
+	
+	.plateBox {
+		display: flex;
 	}
 	.plate {
 		font-size: 30rpx;
@@ -515,19 +517,19 @@
 		border-radius: 4rpx;
 		height: 33rpx;
 	}
-	.price{
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #FF0000;
-	}
-	.itemN {
-		margin-top: 15rpx;
-		display: flex;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
+	.price{
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #FF0000;
+	}
+	.itemN {
+		margin-top: 15rpx;
+		display: flex;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 	
 	.shopName{
 		color: #666666;
@@ -542,43 +544,43 @@
 		color: #666666;
 		font-size: 24rpx;
 		
-	}
-	.bottom{
-		padding-top: 20rpx;
-		border-top: 1rpx solid #EEEEEE;
-		margin-top: 20rpx;
-		display: flex;
-		justify-content: flex-end;
-		font-size: 28rpx;
-		margin-left: -24rpx;
-		margin-right: -24rpx;
-	}
-	
-	.ping{
-		text-align: center;
-		color: #666666;
-		width: 150rpx;
-		height: 56rpx;
-		line-height: 56rpx;
-		border-radius: 36rpx;
-		border: 2rpx solid #DDDDDD;
-		margin-right: 24rpx;
-	}
-	.kan{
-		text-align: center;
-		color: #666666;
-		width: 150rpx;
-		height: 56rpx;
-		line-height: 56rpx;
-		border-radius: 36rpx;
-		border: 2rpx solid #DDDDDD;
-		margin-right: 24rpx;
-	}
-	.noMore {
-		text-align: center;
-		line-height: 50rpx;
-		color: #999999;
-		font-size: 28rpx;
+	}
+	.bottom{
+		padding-top: 20rpx;
+		border-top: 1rpx solid #EEEEEE;
+		margin-top: 20rpx;
+		display: flex;
+		justify-content: flex-end;
+		font-size: 28rpx;
+		margin-left: -24rpx;
+		margin-right: -24rpx;
+	}
+	
+	.ping{
+		text-align: center;
+		color: #666666;
+		width: 150rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		border-radius: 36rpx;
+		border: 2rpx solid #DDDDDD;
+		margin-right: 24rpx;
+	}
+	.kan{
+		text-align: center;
+		color: #666666;
+		width: 150rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		border-radius: 36rpx;
+		border: 2rpx solid #DDDDDD;
+		margin-right: 24rpx;
+	}
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
 	}
 	.authorizBox{
 			width: 100vw;
@@ -639,4 +641,4 @@
 			margin-top: 62rpx;
 			margin-left:71rpx;
 		}
-</style>
+</style>