1.历史消费

pages/user/historyDetail.vue

@@ -12,28 +12,35 @@
 				 -->
 
 					<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
-					<view v-if="orderData.billsheet.SheetType == 1">
+					<view class="stateBox" v-if="orderData.billsheet.SheetType == 1">
 						<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 0">待施工</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 1">施工中</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 2">已完工</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 3">已质检</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 4">已作废</view>
+						<!-- 结算状态 -->
+						<view class="SheetState" v-if="orderData.billsheet.PayState == 0">/未结算</view>
+						<view class="SheetState" v-if="orderData.billsheet.PayState == 2">/已结算</view>
 
 					</view>
-					<view v-if="orderData.billsheet.SheetType == 2">
+					<view class="stateBox" v-if="orderData.billsheet.SheetType == 2">
 						<!-- 0待施工（已保存）1施工中（已派工）2已审核 3已质检 4 已作废 -->
 						<view class="SheetState" v-if="orderData.billsheet.SheetState < 2 ">未审核</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 2">已审核</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 4">已作废</view>
-
+						<!-- 结算状态 -->
+						<view class="SheetState" v-if="orderData.billsheet.PayState == 0">/未结算</view>
+						<view class="SheetState" v-if="orderData.billsheet.PayState == 2">/已结算</view>
 
 					</view>
-					<view v-if="orderData.billsheet.SheetType == 3">
+					<view class="stateBox" v-if="orderData.billsheet.SheetType == 3">
 						<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 0">已保存</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 4">已作废</view>
-
+						<!-- 结算状态 -->
+						<view class="SheetState" v-if="orderData.billsheet.PayState == 0">/未结算</view>
+						<view class="SheetState" v-if="orderData.billsheet.PayState == 2">/已结算</view>
 					</view>
 				</view>
 
@@ -118,8 +125,8 @@
 				<view class="detailedLineBox">
 					<view class="detailedLine" v-for="(item,index) in orderData.listItems">
 
-						<view class="detailedName"><span
-								:class="{kaColor:item.CardDetailID}">卡</span>{{item.ItemName}}</view>
+						<view class="detailedName"><span :class="{kaColor:item.CardDetailID}">卡</span>{{item.ItemName}}
+						</view>
 						<view class="secondBox" :class="{noLine:index == orderData.listItems.length-1}">
 							<view class="comment" v-if="ItemComment">{{item.Comment}}</view>
 							<view class="secondRight">
@@ -145,7 +152,7 @@
 
 						<view class="goodTop">
 							<view class="detailedName"><span
-								:class="{kaColor:item.CardDetailID}">卡</span>{{item.GoodsName}}</view>
+									:class="{kaColor:item.CardDetailID}">卡</span>{{item.GoodsName}}</view>
 							<view class="qty">x{{item.SaleQty}}</view>
 						</view>
 						<view class="secondBox" :class="{noLine:index == orderData.listParts.length-1}">
@@ -423,7 +430,7 @@
 					uni.hideLoading();
 					this.orderData = res.data;
 
-					console.log('data===',this.orderData);
+					console.log('data===', this.orderData);
 
 				})
 			},
@@ -450,7 +457,7 @@
 				console.log("计算后的时间", time);
 
 				var result =
-				null; // if (time < 0) {						// 	// alert("传过来的时间的时间不能晚于当前时间！");						// 	result = stringTime;						// } else if (time / year >= 1) {
+					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) + "月前";
@@ -509,6 +516,10 @@
 
 	}
 
+	.stateBox {
+		display: flex;
+	}
+
 	.orderState {
 		display: flex;
 		justify-content: center;
@@ -716,13 +727,13 @@
 	}
 
 	.kaColor {
-		
+
 		background: #F19D01;
 		border-radius: 4rpx;
 
 		color: #FFFFFF;
-		font-size: 24rpx;
-		margin-right: 8rpx;
+		font-size: 24rpx;
+		margin-right: 8rpx;
 		padding: 3rpx 5rpx;
 	}
 
@@ -803,9 +814,9 @@
 		padding: 20rpx 20rpx;
 		color: #333333;
 	}
-	
+
 	.goodsCostNum {
-		color: #FF0000;
+		color: #FF0000;
 		font-weight: bold;
 	}
 

pages/user/historySpend.vue

@@ -5,29 +5,38 @@
 				<view class="dan">{{item.code}}</view>
 				
 				<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
-				<view v-if="item.SheetType == 1">
+				<view class="stateBox" v-if="item.SheetType == 1">
 					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
-					<view class="danState" v-if="item.SheetState == 0">待施工</view>
-					<view class="danState" v-if="item.SheetState == 1">施工中</view>
-					<view class="danState" v-if="item.SheetState == 2">已完工</view>
-					<view class="danState" v-if="item.SheetState == 3">已质检</view>
-					<view class="danState" v-if="item.SheetState == 4">已作废</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 0">待施工</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 1">施工中</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 2">已完工</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 3">已质检</view>
+					<view class="danState"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 4">已作废</view>
+					<!-- 结算状态 -->
+					<view class="danState" v-if="item.PayState == 0">/未结算</view>
+					<view class="danState2" v-if="item.PayState == 2">/已结算</view>
 					
 				</view>
-				<view v-if="item.SheetType == 2">
+				<view class="stateBox"  v-if="item.SheetType == 2">
 					<!-- 0待施工（已保存）1施工中（已派工）2已审核 3已质检 4 已作废 -->
-					<view class="danState" v-if="item.SheetState < 2 ">未审核</view>
-					<view class="danState" v-if="item.SheetState == 2">已审核</view>
-					<view class="danState" v-if="item.SheetState == 4">已作废</view>
-					
+					<view class="danState"  :class="{danState2: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"  :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 4">已作废</view>
+					<!-- 结算状态 -->
+					<view class="danState" v-if="item.PayState == 0">/未结算</view>
+					<view class="danState2" v-if="item.PayState == 2">/已结算</view>
 					
 					
 				</view>
-				<view v-if="item.SheetType == 3">
+				<view class="stateBox"  v-if="item.SheetType == 3">
 					<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
-					<view class="danState" v-if="item.SheetState == 0">已保存</view>
-					<view class="danState" v-if="item.SheetState == 4">已作废</view>
+					<view class="danState" :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 0">已保存</view>
+					<view class="danState" :class="{danState2:item.PayState == 2}" v-if="item.SheetState == 4">已作废</view>
+					<!-- 结算状态 -->
+					<view class="danState" v-if="item.PayState == 0">/未结算</view>
+					<view class="danState2" v-if="item.PayState == 2">/已结算</view>
 				</view>
+				
 			</view>
 			
 			
@@ -264,10 +273,17 @@
 		
 		color: #999999;
 	}
+	.stateBox{
+		display: flex;
+	}
 	.danState{
 		font-size: 24rpx;
 		
 		color: #FF4F00;
+	}
+	.danState2{
+		font-size: 24rpx;
+		color: #999999;
 	}
 	.time {
 		font-size: 24rpx;