bug修改

pages/index/byItem.vue

@@ -3,14 +3,17 @@
 	  <homenav :iStatusBarHeight="iStatusBarHeight" :title="'选择保养项目'"></homenav>
 	  <view class="box">
 		  <view class="historyLine" >
-			  <view class="historyLineCar">
-				  <image :src="optdata.logo" mode="" class="historylinecarImg"></image>
-				  <view class="historylinecar">{{optdata.value}}</view>
+			  <view class="historyLogoBox">
+			  	<image :src="optdata.logo" mode="" class="historylinecarImg"></image>
 			  </view>
-		  	<view class="historyLineVin" v-if="optdata.isVin==1">
-		  		<view class="vinms">vin</view>
-		  		<view class="vinNum">{{optdata.vin}}</view>
-		  	</view>
+			  <view>
+			  	<view class="historylinecar">{{optdata.value}}</view>
+			  	<view class="historyLineVin" v-if="optdata.isVin==1">
+			  		<view class="vinms">VIN</view>
+			  		<view class="vinNum">{{optdata.vin}}</view>
+			  	</view>
+			  </view>
+			
 		  </view>
 		 
 	  </view>
@@ -124,16 +127,20 @@
 	background: #ffffff;
 }
 .historylinecarImg{
-	width: 46rpx;
-	height: 46rpx;
+	width: 54rpx;
+	height: 54rpx;
 }
+.historyLogoBox{
+		display: flex;align-items: center;
+		padding-right: 14rpx;
+	}
 .historylinecar{
 	font-weight: 500;font-size: 26rpx;
 	color: #1A1A1A;
 	line-height: 46rpx;width: 636rpx;
 }
 .historyLine{
-	
+	display: flex;
 	padding: 30rpx 0;
 }
 .title{

pages/index/carConfiguration.vue

@@ -126,7 +126,7 @@
 	top: 0;
 	left: 0;
 	z-index: 11;
-	background: url('http://dmsphoto.66km.com.cn/thFiles/AFCBDA6F-03C0-46C0-9090-9A34C125D140.png') no-repeat;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/F421B62E-7B51-4AD9-AB01-A28A2FB21FCF.png') no-repeat;
 	background-size: 100%;
 }
 .indexnav{

pages/index/carModel.vue

@@ -3,7 +3,7 @@
 		
 		<view class="tab1 ">
 			
-			<scroll-view  class="scroll-view" :scroll-into-view="toView" scroll-y="true" >
+			<scroll-view  class="scroll-view" :style="{height:svHeight}" :scroll-into-view="toView" scroll-y="true" >
 				<view class="brand-select">
 					<template v-for="item in carModelList">
 					  <view :id="item['首字母']" v-if="item['首字母']!='热'">
@@ -44,8 +44,8 @@
 		<!-- uni-popup -->
 		<view class="popupone"  @click="popupc" v-if="popuponeShow">
 			<view class="popup-content" >
-				<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 				<scroll-view class="brandList" scroll-y="true">
+					<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 					<view v-for="item in carSeriesList" :key="item.manufactor" class="brandListkk">
 					  <h3 class="cell-item-title">{{ item.manufactor }}</h3>
 					  <span v-for="item2 in item.carSeries" :key="item2" :title="item2" class="span-cell" @click="selectCarFactory(item.manufactor,item2)" >{{item2}}</span>
@@ -166,7 +166,7 @@
 <script>
 
 	export default {
-		props:['iStatusBarHeight'],
+		props:['iStatusBarHeight','svHeight'],
 		data() {
 			return {
 				carModelList:'',
@@ -203,6 +203,9 @@
 		   
 		},
 		methods: {
+		  aaa(){
+			 return {height: `calc(100vh - 44px)`}; 
+		  },
 		  popupc(e){
 			 /* console.log(e)
 			  if(!e.show){
@@ -521,7 +524,7 @@
 	  position: absolute;
 	  text-align: center;
 	  right: 16rpx;
-	  top: 30rpx;
+	  top: 0rpx;
 	  width: 23rpx;
 	  font-size:26rpx;
 	  font-weight:500;
@@ -529,14 +532,14 @@
 	  color: rgb(153, 153, 153);
 	  a{
 	    display: block;
-		padding-top: 10rpx;
+		padding-top: 3rpx;
 	  }
 	  .select{
 	    color: #FF4F00;
 	  }
 	}
 	.scroll-view{
-		height: calc(100vh - 120rpx);
+		/* height: calc(100vh - 120rpx); */
 	}
 	.brand-select{
 		padding-bottom: 100rpx;
@@ -642,12 +645,12 @@
 	  }
 	}
 	.carbox{
-		height: calc(100vh - 120rpx);
+		/* height: calc(100vh - 120rpx); */
 		padding: 0 24rpx;
-		padding-top: 30rpx;
+		padding-top: 20rpx;
 	}
 	.brandList{
-		height: calc(100vh - 150rpx);
+		height: calc(100vh - 45px);
 		/* padding-bottom:var(--status-bar-height); */
 	}
 	.displacementListLine{

pages/index/engineOil.vue

@@ -3,14 +3,15 @@
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'机油'"></homenav>
 		<view class="box">
 			<view class="historyLine">
-				<view class="historyLineCar">
+				<view class="historyLogoBox">
 					<image :src="optdata.logo" mode="" class="historylinecarImg"></image>
-					<view class="historylinecar">{{optdata.value}}</view>
 				</view>
-				
-				<view class="historyLineVin" v-if="optdata.isVin==1">
-					<view class="vinms">vin</view>
-					<view class="vinNum">{{optdata.vin}}</view>
+				<view>
+					<view class="historylinecar">{{optdata.value}}</view>
+					<view class="historyLineVin" v-if="optdata.isVin==1">
+						<view class="vinms">VIN</view>
+						<view class="vinNum">{{optdata.vin}}</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -132,17 +133,21 @@
 		background: #F4F5F7;
 	}
     .jyimgBox{
-		border: 1px solid #EEEEEE;    width: 302rpx;
+		border: 1px solid #EEEEEE;    width: 302rpx;border-radius: 10rpx;
 	}
 	.box {
 		padding: 0 24rpx;
 		background: #ffffff;
 	}
 
-	.historylinecarImg {
-		width: 46rpx;
-		height: 46rpx;
+	.historylinecarImg{
+		width: 54rpx;
+		height: 54rpx;
 	}
+	.historyLogoBox{
+			display: flex;align-items: center;
+			padding-right: 14rpx;
+		}
 
 	.historylinecar {
 		font-weight: 500;
@@ -153,7 +158,7 @@
 	}
 
 	.historyLine {
-		
+		 display: flex;
 		padding: 30rpx 0;
 		/* border-top: 1rpx solid #EEEEEE; */
 	}

pages/index/gearboxOil.vue

@@ -3,14 +3,15 @@
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'变速箱油'"></homenav>
 		<view class="box">
 			<view class="historyLine">
-				<view class="historyLineCar">
+				<view class="historyLogoBox">
 					<image :src="optdata.logo" mode="" class="historylinecarImg"></image>
-					<view class="historylinecar">{{optdata.value}}</view>
 				</view>
-				
-				<view class="historyLineVin" v-if="optdata.isVin==1">
-					<view class="vinms">vin</view>
-					<view class="vinNum">{{optdata.vin}}</view>
+				<view>
+					<view class="historylinecar">{{optdata.value}}</view>
+					<view class="historyLineVin" v-if="optdata.isVin==1">
+						<view class="vinms">VIN</view>
+						<view class="vinNum">{{optdata.vin}}</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -194,17 +195,21 @@
 		background: #F4F5F7;
 	}
     .jyimgBox{
-    	border: 1px solid #EEEEEE;    width: 302rpx;
+    	border: 1px solid #EEEEEE;    width: 302rpx;border-radius: 10rpx;
     }
 	.box {
 		padding: 0 24rpx;
 		background: #ffffff;
 	}
 
-	.historylinecarImg {
-		width: 46rpx;
-		height: 46rpx;
+	.historylinecarImg{
+		width: 54rpx;
+		height: 54rpx;
 	}
+	.historyLogoBox{
+			display: flex;align-items: center;
+			padding-right: 14rpx;
+		}
 
 	.historylinecar {
 		font-weight: 500;
@@ -215,6 +220,7 @@
 	}
 
 	.historyLine {
+		display: flex;
 		padding: 30rpx 0;
 		/* border-top: 1rpx solid #EEEEEE; */
 	}

pages/index/history.vue

@@ -4,13 +4,19 @@
 	  <view class="box">
 		  <view class="historyLine" v-for="(item,index) in historyList" @click="goDetail(item)">
 			<view class="historyLineCar">
-				<image :src="item.logo" mode="" class="historylinecarImg"></image>
-				<view class="historylinecar">{{item.title}}</view>
-			</view>
-		  	<view class="historyLineVin" v-if="item.ifVin">
-				<view class="vinms">vin</view>
-				<view class="vinNum">{{item.vin}}</view>
+				<view class="historyLogoBox">
+					<image :src="item.logo" mode="" class="historylinecarImg"></image>
+				</view>
+				<view>
+					<view class="historylinecar">{{item.title}}</view>
+					<view class="historyLineVin" v-if="item.ifVin">
+						<view class="vinms">VIN</view>
+						<view class="vinNum">{{item.vin}}</view>
+					</view>
+				</view>
+				
 			</view>
+		  	
 		  </view>
 		  <nodata v-if="historyList.length==0&&loading"></nodata>
 	  </view>
@@ -60,8 +66,8 @@
 	padding: 0 24rpx;
 }
 .historylinecarImg{
-	width: 46rpx;
-	height: 46rpx;
+	width: 54rpx;
+	height: 54rpx;
 }
 .historylinecar{
 	font-weight: 400;font-size: 26rpx;
@@ -94,4 +100,7 @@
 	font-weight: 400;font-size: 22rpx;padding-left: 10rpx;
 	color: #999999;line-height: 30rpx;
 }
+.historyLogoBox{
+		display: flex;align-items: center;
+	}
 </style>

pages/index/index.vue

@@ -28,12 +28,16 @@
 					<image src="../../static/img/icon_arrow.png" mode="" class="jiantouimg"></image>
 				</view>
 				<view class="historyLine" v-for="(item,index) in historyList" v-if="index<3" @click="gocarDetail(item)">
-					<image :src="item.logo" mode="" class="historylinecarImg"></image>
+					<view class="historyLogoBox">
+						<image :src="item.logo" mode="" class="historylinecarImg"></image>
+					</view>
+					
 					<view class="historylinecar">{{item.title}}</view>
 				</view>
 			</view>
 		</view>
-		<carModel ref="carModelView" :iStatusBarHeight="iStatusBarHeight"></carModel>
+		<!-- <view :style="{height: aaa}" class="aaaaa"></view> -->
+		<carModel ref="carModelView" :iStatusBarHeight="iStatusBarHeight" :svHeight="aaa"></carModel>
 		
 		<!-- 选择车型 -->
 		<view class="ckcarBox" v-if="ckCarShow" >
@@ -70,6 +74,7 @@
 				historyList:[],
 				iStatusBarHeight:'',
 				openId:'',
+				aaa:'',
 			}
 		},
 		onLoad() {
@@ -79,6 +84,10 @@
            setTimeout(function(){
            		that.$refs.carModelView.getdata();
            },500)
+		   var bb= this.iStatusBarHeight + 44 + 'px';
+		  
+		   var cc= '520rpx'
+		   this.aaa= `calc(100vh - ${bb} - ${cc})`
 		},
 		onShow() {
 				
@@ -121,7 +130,20 @@
 				  
 				  },'POST').then(res => {
 				 				
-				 		this.historyList=res.data
+				 	this.historyList=res.data
+					var bb= this.iStatusBarHeight + 44 + 'px';
+					var cc='520rpx'
+					if(this.historyList.length==0){
+						cc= '240rpx'	   
+					}else
+					if(this.historyList.length==1){
+						cc= '352rpx'	   
+					}else
+					if(this.historyList.length==2){
+						cc= '418rpx'	   
+					}
+				
+					this.aaa= `calc(100vh - ${bb} - ${cc})`
 				 })
 			 },
 			 gocarDetail(e){
@@ -223,6 +245,10 @@
 </script>
 
 <style scoped>
+.aaaaa{
+	width: 500rpx;
+	background-color: #1A1A1A;
+}
 .ckcarJtimg{
 	width: 26rpx;height: 26rpx;margin-top: 4rpx;
 }
@@ -263,9 +289,9 @@
 	min-height: 100vh;background: #F4F5F7;
 }
 .top{
-	width: 100%;height: 400rpx;
+	width: 100%;height: 385rpx;
 	background: url('http://dmsphoto.66km.com.cn/thFiles/DE1573A0-1C08-4243-8313-C0BA094406D0.png') no-repeat;
-	background-size: 100%;
+	background-size: 100% 100%;
 }
 .topNavBox{
 	background: #D53533;
@@ -290,7 +316,7 @@
 	width: 44rpx;height: 44rpx;
 }
 .searchBox{
-	display: flex;padding: 30rpx 24rpx;
+	display: flex;padding: 20rpx 24rpx;
 	justify-content: space-between;
 }
 .ssinput{
@@ -308,12 +334,12 @@
 	text-align: center;
 }
 .historybox{
-	padding: 0 24rpx;    margin-top: -85rpx;
+	padding: 0 24rpx;    margin-top: -88rpx;
 }
 .history{
 	background: #FFFFFF;
 	border-radius: 16rpx;
-	padding: 30rpx;padding-bottom: 0;
+	padding: 20rpx;padding-bottom: 0;
 }
 .jiantouimg{
 	width: 26rpx;height: 26rpx;margin-top: 7rpx;
@@ -327,8 +353,8 @@
 	color: #1A1A1A;line-height: 40rpx;
 }
 .historylinecarImg{
-	width: 46rpx;
-	height: 46rpx;
+	width: 54rpx;
+	height: 54rpx;
 }
 .historylinecar{
 	font-weight: 400;font-size: 26rpx;
@@ -337,7 +363,7 @@
 }
 .historyLine{
 	display: flex;justify-content: space-between;
-	padding: 30rpx 0;border-top: 1rpx solid #EEEEEE;
+	padding: 15rpx 0;border-top: 1rpx solid #EEEEEE;
 }
 .indexnav{
 		height: 44px;
@@ -346,4 +372,7 @@
 		font-size: 36rpx;
 		color: #FFFFFF;
 	}
+	.historyLogoBox{
+		display: flex;align-items: center;
+	}
 </style>

pages/index/maintenance.vue

@@ -19,6 +19,10 @@
 	  		<view class="teamContent" :style="{width:HN_width}">
 	  			<view v-for="(itemRow,indexRow) in itemData" :key="indexRow">
 	  				<view class="row" :class="{grayColor:indexRow==0}">
+						<!-- <view  class="colBg grayColorOne"  >
+							<view class="col" >{{itemRow[0]}}</view>
+							
+						</view> -->
 	  					<view v-for="(itemCol,indexCol) in itemRow" :key="indexCol" class="colBg"  :class="{grayColor:indexCol==0}">
 	  						<view class="col" v-if="indexCol==0">{{itemCol}}</view>
 	  						<view class="col" v-else-if="indexRow==0">{{itemCol}}</view>
@@ -241,4 +245,9 @@ color: #1A1A1A;font-size: 26rpx;
 		width: 33.3%;text-align: center;font-weight: 400;
 		color: #1A1A1A;font-size: 26rpx;
 	}
+	.grayColorOne{
+		position: fixed;
+		left: 0;
+		background-color: #F7F7F7;
+	}
 </style>

pages/index/search.vue

@@ -6,6 +6,7 @@
 		  	<image src="../../static/img/icon_search.png" mode="" class="simg"></image>
 		  	<input v-model="value" type="text"  placeholder="请输入车辆品牌、车系或VIN码" 
 			placeholder-class="ip" class="ssinput" @confirm="searchFn" focus>
+			<image src="../../static/img/icon_search_del.png" mode="" class="search_del" @click="searchDel"></image>
 		  </view>
 		  <view class="searchBtn" @click="searchFn">
 		  	搜索
@@ -17,6 +18,7 @@
 		  <!-- 	<image src="http://img.db.66km.cn/carbrandlogo/B - 宝马.png" mode="" class="historylinecarImg"></image> -->
 		  	<view class="historylinecar" @click="carMbtn(item)">{{item.title}}</view>
 		  </view>
+		  <nodata v-if="loading&&carMlist.length==0"></nodata>
 	  </view>
 	  
 	  <!-- 选择车型 -->
@@ -37,6 +39,8 @@
 	  
 	  <view class="popupone"  @click="popupc" v-if="popuponeShow">
 	  	<view class="popup-content" @click.stop="">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view style="height: 44px;"></view>
 			<view style="padding: 24rpx 0;">
 				<view class="manufactorP">{{manufactor}}</view>
 			</view>
@@ -71,9 +75,10 @@
 
 <script>
 	import homenav from "../../components/homenav/nav.vue"
+	import nodata from '../../components/nodata/nodata.vue'
 	export default {
 		components: {
-			homenav
+			homenav,nodata
 		},
 		data() {
 			return {
@@ -95,6 +100,7 @@
 				vin:'',
 				iStatusBarHeight:'',
 				focusKuwei:false,
+				loading:false,
 			}
 		},
 		onLoad(opt) {
@@ -105,6 +111,10 @@
 		
 		},
 		methods: {
+		   searchDel(){
+			   console.log("清除")
+			   this.value=''
+		   },
 		   goDetal(e){
 			   uni.navigateTo({
 			   	url:'/pages/index/byItem?nLevelID='+e.carModelInfo.nLevelID+'&logo='+e.carModelInfo.logo+'&isVin='+this.isVin+'&value='+e.value+'&id='+e.ids+'&vin='+this.vin
@@ -188,10 +198,12 @@
 				   this.isVin=1;
 				   this.vin=this.value;
 				   this.vinList=[];
+				   this.loading=false;
 				   this.$http('matchingByOpen/queryCarModelGroupByVinAggregation', {
 				     vin: this.value,type:2
 				    },'POST').then(res => {
 				     	uni.hideLoading();
+						this.loading=true;
 						if(res.code==0){
 							
 							this.vinList=res.data;
@@ -209,10 +221,12 @@
 				   uni.showLoading({ title: '加载中'});
 				   this.isVin=0;
 				   this.vin='';
+				   this.loading=false;
 				   this.$http('matchingByOpen/queryCarModelGroupIiPackage', {
 				     name: this.value,
 				    },'POST').then(res => {
 				     	uni.hideLoading();
+						this.loading=true;
 				        this.carMlist=res.data;
 				   		this.carMshow=true;
 						this.ckCarShow=false;
@@ -319,13 +333,18 @@
 }
 .searchInputBox{
 	width: 622rpx;display: flex;
-	height: 80rpx;
+	height: 80rpx;position: relative;
 	background: #F9F9F9;
 	border-radius: 16rpx;
 }
 .ssinput{
 	font-size: 28rpx;font-weight: 400;padding-left: 24rpx;line-height: 80rpx;height: 80rpx;
-	width: 600rpx;
+	width: 480rpx;
+}
+.search_del{
+	width: 36rpx;height: 36rpx;padding-top: 23rpx;padding-bottom: 10px;padding-right: 10rpx;
+	position: absolute;
+	    right: 0;
 }
 .simg{
 	width: 36rpx;height: 34rpx;margin-top: 23rpx;margin-left:30rpx;