样式修改

pages.json

@@ -581,7 +581,7 @@
 						"style": {
 							/* "navigationBarTitleText": "中奖记录", */
 							"navigationStyle": "custom",
-							"enablePullDownRefresh": false
+							"enablePullDownRefresh": true
 						}
 					
 					}

pages/subPack/luckList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'救援订单'" :cj="4"></homenav>
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'中奖记录'" :cj="4"></homenav>
 		<!-- <view class="tabToptyh">
 		  <view class="tabToplieyh" @click="getList(0)"  :class="{'tablineActyh':chooseTab==0}">未兑奖</view>
 		  <view class="tabToplieyh" @click="getList(1)" :class="{'tablineActyh':chooseTab==1}">已兑奖</view>
@@ -43,7 +43,7 @@
 				list:[],
 				chooseTab: 0,
 				page: 1,
-				limit: 9,
+				limit: 10,
 				loading:false,
 				iStatusBarHeight:'',
 			}
@@ -87,7 +87,20 @@
 
 		},
 
-
+// 下拉刷新 
+		onPullDownRefresh() {
+			this.page = 1
+			this.getList(this.chooseTab)
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		
+		// 上拉加载更多
+		onReachBottom() {
+			this.page++;
+			this.getList(this.chooseTab)
+		},
 	
 
 	}

pages/user/addCar/cailist.vue

@@ -152,11 +152,15 @@
 	.nextCaretxt{
 		color: #FF0000;
 	}
+	.nextCareTitle{
+		padding-left: 8rpx;
+	}
 	.nextCare{
-		font-size: 20rpx;
-		line-height: 36rpx;
+		color: #333333;
+		font-size: 26rpx;
+		line-height: 37rpx;
+		padding-left: 10rpx;
 		display: flex;
-		padding-left: 6rpx;
 	}
 	.box {
 		min-height: 100vh;

pages/user/historyDetail.vue

@@ -53,21 +53,21 @@
             	</view>
 				
 				<view class="CarModel" v-if="orderData.billsheet.CarModel">{{orderData.billsheet.CarModel}}</view>
-				<view class="informationLine" >
+				<view class="goodscostLine" >
 					<view class="informationTxt">进店里程：</view>
-					<view class="informationNum" v-if="orderData.billsheet.CurrentMileage>0">
+					<view class="goodsCostNum3 " v-if="orderData.billsheet.CurrentMileage>0">
 						{{orderData.billsheet.CurrentMileage}}km
 					</view>
 				</view>
-				<view class="informationLine" >
+				<view class="goodscostLine" >
 					<view class="informationTxt">建议下次保养里程：</view>
-					<view class="informationNum" v-if="orderData.billsheet.NextCareMilage">
+					<view class="goodsCostNum3 " v-if="orderData.billsheet.NextCareMilage">
 						{{orderData.billsheet.NextCareMilage}}km
 					</view>
 				</view>
-				<view class="informationLine" v-if="orderData.billsheet.SheetType==1">
+				<view class="goodscostLine" v-if="orderData.billsheet.SheetType==1">
 					<view class="informationTxt">建议下次保养时间：</view>
-					<view class="informationNum" v-if="orderData.billsheet.NextCareDate">
+					<view class="goodsCostNum3 " v-if="orderData.billsheet.NextCareDate">
 						{{orderData.billsheet.NextCareDate.slice(0,10)}}
 					</view>
 				</view>
@@ -154,7 +154,7 @@
 			</view>
 
 			<!-- 项目明细 -->
-			<view class="detailedBox itemBox" v-if=" orderData.listItems.length!=0" style="padding-bottom: 0;">
+			<view class="detailedBox itemBox" v-if=" orderData.listItems.length!=0" >
 				<view class="detailedTitle">项目</view>
 				<view class="detailedLineBox">
 					<view class="detailedLine" v-for="(item,index) in orderData.listItems">
@@ -168,10 +168,10 @@
 					  </view>
 						<view class="itemWorkHoursBox" v-if="itemWorkHours&&itemWorkHours" :class="{nopb:ItemComment&&item.Comment}">
 							<view class="itemWorkHours" v-if="itemWorkHours">
-								工时：{{item.SaleQty}}
+								工时：<span class="SalePrice">{{item.SaleQty}}</span> 
 							</view>
 							<view class="itemPrice" v-if="itemWorkHours">
-								单价：{{item.SalePrice}}
+								单价：<span class="SalePrice">{{item.SalePrice}}</span>
 							</view>
 						</view>
 						<view class="secondBox" v-if="ItemComment" :class="{noLine:index == orderData.listItems.length-1}">
@@ -197,23 +197,29 @@
 						<view class="goodTop">
 							<view class="detailedName"><span v-if="item.CardDetailID"
 									class="kaColor">卡</span> 
-									<span v-if="brandSetting">{{item.Brand}}</span>
-									 {{item.GoodsName}}
-									 <span v-if="specSetting">{{item.Spec}}</span>
-									 <span v-if="factoryNumber">{{item.FactoryCode}}</span>
+									<span class="GoodsName" style="padding-right: 4rpx;" v-if="brandSetting&&item.Brand">{{item.Brand}} </span>
+									<span class="GoodsName">{{item.GoodsName}}</span> 
+									 <span class="GoodsName" style="padding-left: 4rpx;"  v-if="specSetting&&item.Spec"> {{item.Spec}}</span>
+									 <span  class="GoodsName" v-if="factoryNumber&&item.FactoryCode">({{item.FactoryCode}})</span>
+							</view>
+							<view class="price" v-if="goodsMoney">
+								<span>￥</span>
+								{{item.AmountMoney?item.AmountMoney:0}}
 							</view>
-							<view class="qty" v-if="goodsNumber">x{{item.SaleQty}}</view>
+							<!-- <view class="qty" v-if="goodsNumber">x{{item.SaleQty}}</view> -->
 						</view>
-						<view class="secondBox"  v-if="GoodsComment" :class="{noLine:index == orderData.listParts.length-1}">
-							<view class="comment" v-if="GoodsComment">{{item.Comment}}</view>
-							<view class="secondRight">
-								<!-- <view class="grayPrice">￥{{item.CheckOutTaxRate}}</view> -->
-								<view class="price" v-if="goodsPrice">
-									<span>￥</span>
-									{{item.AmountMoney?item.AmountMoney:0}}
-								</view>
+						<view class="itemWorkHoursBox" v-if="itemWorkHours&&itemWorkHours" :class="{nopb:GoodsComment&&item.Comment}">
+							<view class="itemWorkHours" v-if="goodsNumber">
+								数量：<span class="SalePrice">{{item.SaleQty}}</span> 
+							</view>
+							<view class="itemPrice" v-if="goodsPrice">
+								单价：<span class="SalePrice">{{item.SalePrice}}</span>
 							</view>
 						</view>
+						<view class="secondBox"  v-if="GoodsComment" :class="{noLine:index == orderData.listParts.length-1}">
+							<view class="comment" v-if="GoodsComment&&item.Comment">{{item.Comment}}</view>
+							
+						</view>
 
 
 					</view>
@@ -318,6 +324,7 @@
 				itemPrice:false,
 				iStatusBarHeight:'',
 				ShowSetting:'',
+				goodsMoney:'',
 			}
 		},
 		onLoad(opt) {
@@ -426,7 +433,9 @@
 						if (item.fieldValue == 'itemPrice') {
 							this.itemPrice = item.isChecked
 						}
-						
+						if (item.fieldValue == 'goodsMoney') {
+							this.goodsMoney = item.isChecked
+						}
                         
 
 
@@ -611,6 +620,13 @@
 </script>
 
 <style scoped>
+	.SalePrice{
+		    color: #3C3C3C;
+			font-weight: 600;
+	}
+	.GoodsName{
+		font-size: 28rpx !important;
+	}
 	.itemWorkHoursBox{
 		display: flex;
 		font-size: 24rpx;
@@ -882,8 +898,9 @@
 
 
 	.detailedName {
-		font-size: 26rpx;
+		font-size: 28rpx;
 		color: #3C3C3C;
+		font-weight: 600;
 	}
 
 	.kaColor {
@@ -946,7 +963,7 @@
 		font-weight: 500;
 		/* color: #FF0000; */
 		display: flex;
-
+        color: #3C3C3C;
 		align-items: center;
 	}
 
@@ -1357,4 +1374,7 @@
 		border-radius: 36rpx;
 		border: 2rpx solid #DDDDDD;
 	}
+	.goodscostTxt{
+		    color: #999999;
+	}
 </style>

pages/user/historySpend.vue

@@ -18,34 +18,55 @@
 				<!-- 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}" 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 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>
+						<view class="danState" v-if="item.PayState == 2">/已结算</view>
+					</view>
+					<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="{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 class="danState"  :class="{danState3:item.PayState == 2}" v-if="item.SheetState < 2 ">未审核</view>
+					<view class="danState"  :class="{danState3: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>
+						<view class="danState" v-if="item.PayState == 2">/已结算</view>
+					</view>
+					<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" :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 class="danState"  v-if="item.SheetState == 4">已作废</view>
+					<!-- 结算状态 -->
+					<view v-if="item.SheetState == 4">
+						<view class="danState" v-if="item.PayState == 0">/未结算</view>
+						<view class="danState" v-if="item.PayState == 2">/已结算</view>
+					</view>
+					<view v-else>
+						<view class="danState" v-if="item.PayState == 0">/未结算</view>
+						<view class="danState2" v-if="item.PayState == 2">/已结算</view>
+					</view>
+					
 				</view>
 				
 			</view>
@@ -453,12 +474,16 @@
 	}
 	.danState{
 		font-size: 24rpx;
+		color: #999999;
 		
-		color: #FF4F00;
 	}
 	.danState2{
-		font-size: 24rpx;
-		color: #999999;
+		font-size: 24rpx;
+		    color: #00A040;
+	}
+	.danState3{
+		font-size: 24rpx;
+		color: #FF4F00;
 	}
 	.time {
 		font-size: 24rpx;