代码修改

components/homenav/nav.vue

@@ -0,0 +1,110 @@
+<template>
+	<view class="" >
+		<!-- 自定义导航 -->
+		<view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../static/img/nav_icon_back_black.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<view class="navsx"></view>
+					<image src="../../static/img/nav_icon_home_black.png" mode="" class="homeImg" @click="gohome"></image>
+				</view>
+				<view class="zdyNavTitle">{{title}}</view>
+				<view style="width: 250rpx;"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view>
+		
+		
+	</view>
+</template>
+
+<script>
+export default {
+	props:['title','iStatusBarHeight','cj'],
+	data() {
+		return {
+		}
+	},
+	onLoad(opt) {
+	  
+      //this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+	},
+	onShow() {
+		
+	},
+	methods: {
+		goback() {
+			uni.navigateBack({
+			 	delta: 1
+			})
+		},
+		gohome(){
+			
+				/* uni.switchTab({
+					url:'../../pages/index/index'
+				}) */
+			uni.navigateTo({
+				url:'/pages/index/index'
+			})
+			
+		},
+	}
+}
+</script>
+
+<style scoped>
+	.zdyNavBox{
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999999;
+	}
+	.zdyNav{
+		height: 44px;
+		display: flex;
+		justify-content: space-between;
+		
+		align-items: center;
+	}
+	
+	.backImg{
+		width: 44rpx;
+		height: 44rpx;
+		/* margin-left: 10rpx; */
+		/* margin-right: 20rpx; */
+	}
+	.navsx{
+		width: 2rpx;
+		height: 44rpx;
+		background: #e1e1e1;
+		margin: 0 26rpx 0rpx 18rpx;
+	}
+	.homeImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.zdyNavLeft{
+		display: flex;
+		align-items: center;
+        border: 1px solid #e1e1e1;
+		margin-left: 15rpx;
+		border-radius: 35rpx;
+		padding: 10rpx 23rpx 8rpx 13rpx;
+		
+	}
+	.zdyNavTitle{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
+	
+	
+</style>

components/nodata/nodata.vue

@@ -0,0 +1,47 @@
+<template>
+	<view class="" style="padding-bottom: 20rpx;">
+		
+		<view  class="nodataBox">
+			<image src="../../static/img/pic_empty_def.png" mode="widthFix" class="nodataImg"></image>
+			<view class="noTxt">暂无数据</view>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	onLoad(opt) {
+      
+	},
+	onShow() {
+		
+	},
+	methods: {
+		
+	}
+}
+</script>
+
+<style scoped>
+	
+	.nodataImg{
+	  width: 400rpx;
+	  padding-top: 100rpx;
+	}
+	.noTxt{
+		font-size: 32rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
+	.nodataBox{
+		text-align: center;
+	}
+	
+</style>

pages.json

@@ -10,61 +10,71 @@
 		{
 			"path": "pages/index/displacement",
 			"style": {
-				"navigationBarTitleText": "车型选择"
+				"navigationBarTitleText": "车型选择",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/carGroup",
 			"style": {
-				"navigationBarTitleText": "车型选择"
+				"navigationBarTitleText": "车型选择",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/history",
 			"style": {
-				"navigationBarTitleText": "历史查询"
+				//"navigationBarTitleText": "历史查询",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/search",
 			"style": {
-				"navigationBarTitleText": "搜索"
+				"navigationBarTitleText": "搜索",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/byItem",
 			"style": {
-				"navigationBarTitleText": "选择保养项目"
+				"navigationBarTitleText": "选择保养项目",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/engineOil",
 			"style": {
-				"navigationBarTitleText": "机油"
+				"navigationBarTitleText": "机油",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/gearboxOil",
 			"style": {
-				"navigationBarTitleText": "变速箱油"
+				"navigationBarTitleText": "变速箱油",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/goodsDetail",
 			"style": {
-				"navigationBarTitleText": "商品详情"
+				"navigationBarTitleText": "商品详情",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/carConfiguration",
 			"style": {
-				"navigationBarTitleText": "车辆配置"
+				"navigationBarTitleText": "车辆配置",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/index/maintenance",
 			"style": {
-				"navigationBarTitleText": "保养周期"
+				"navigationBarTitleText": "保养周期",
+				"navigationStyle": "custom"
 			}
 		}
 	],

pages/index/byItem.vue

@@ -1,10 +1,18 @@
 <template>
 	<view class="content">
+	  <homenav :iStatusBarHeight="iStatusBarHeight" :title="'选择保养项目'"></homenav>
 	  <view class="box">
 		  <view class="historyLine" >
-		  	<image :src="optdata.logo" mode="" class="historylinecarImg"></image>
-		  	<view class="historylinecar">{{optdata.value}}</view>
+			  <view class="historyLineCar">
+				  <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>
+		 
 	  </view>
 	  
 	  <view class="title">机油推荐</view>
@@ -30,9 +38,10 @@
 </template>
 
 <script>
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-			
+			homenav
 		},
 		data() {
 			return {
@@ -40,10 +49,12 @@
 				isVin:'',
 				vin:'',
 				scarid:'',
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
 		   console.log(opt);
+		   this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
            this.optdata=opt;
 		   if(opt.scarid){
 			   this.scarid=opt.scarid;
@@ -91,12 +102,12 @@
 		   },
            goEngineOil(){
 			   uni.navigateTo({
-			   	url:'/pages/index/engineOil?nLevelID='+this.optdata.nLevelID+'&logo='+this.optdata.logo+'&value='+this.optdata.value+'&id='+this.optdata.id
+			   	url:'/pages/index/engineOil?nLevelID='+this.optdata.nLevelID+'&logo='+this.optdata.logo+'&value='+this.optdata.value+'&id='+this.optdata.id+'&isVin='+this.optdata.isVin+'&vin='+this.optdata.vin
 			   })
 		   },
 		   goGearboxOil(){
 			   uni.navigateTo({
-			   	url:'/pages/index/gearboxOil?nLevelID='+this.optdata.nLevelID+'&logo='+this.optdata.logo+'&value='+this.optdata.value+'&id='+this.optdata.id
+			   	url:'/pages/index/gearboxOil?nLevelID='+this.optdata.nLevelID+'&logo='+this.optdata.logo+'&value='+this.optdata.value+'&id='+this.optdata.id+'&isVin='+this.optdata.isVin+'&vin='+this.optdata.vin
 			   })
 		   }
 		}
@@ -119,11 +130,11 @@
 .historylinecar{
 	font-weight: 400;font-size: 26rpx;
 	color: #1A1A1A;
-	line-height: 37rpx;width: 636rpx;
+	line-height: 46rpx;width: 636rpx;
 }
 .historyLine{
-	display: flex;justify-content: space-between;
-	padding: 30rpx 0;border-top: 1rpx solid #EEEEEE;
+	
+	padding: 30rpx 0;
 }
 .title{
 	font-weight: 500;font-size: 28rpx;
@@ -158,4 +169,27 @@ padding: 0 24rpx;
 .lineImg2{
 	width: 106rpx;height: 82rpx;    margin-top: 10rpx;
 }
+.historyLineVin{
+	display: flex;background: #ffffff;
+}
+.historyLineCar{
+	display: flex;justify-content: space-between;
+}
+.vinNum{
+	font-weight: 400;font-size: 22rpx;padding-left: 10rpx;
+	color: #999999;line-height: 30rpx;
+}
+.vinms{
+	width: 38rpx;
+	height: 26rpx;
+	background: linear-gradient(224deg, #FFDA28 0%, #FFBF35 100%);
+	border-radius: 4rpx;
+	text-align: center;
+	line-height: 26rpx;
+	font-weight: 600;
+	color: #FFFFFF;
+	font-size: 18rpx;
+	margin-top: 2rpx;
+}
+
 </style>

pages/index/carConfiguration.vue

@@ -1,5 +1,21 @@
 <template>
 	<view class="content">
+	 <view class="topNavBox">
+	 	<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+	 	<view class="indexnav">
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../static/img/navbackbs.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<view class="navsx"></view>
+					<image src="../../static/img/navhomebs.png" mode="" class="homeImg" @click="gohome"></image>
+				</view>
+				<view class="zdyNavTitle">车辆配置</view>
+				<view style="width: 250rpx;"></view>
+			</view>
+		</view>
+	 </view>
+	 <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+	 <view style="height: 43px;"></view>
 	  <view class="top" v-if="loading">
 	  	 <view class="carBrand">{{info.brand}}</view>
 		 <view class="carName">{{info.manufactor}}-{{info.carSeries}}-{{info.salesName}}</view>
@@ -51,18 +67,21 @@
 </template>
 
 <script>
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-			
+			homenav
 		},
 		data() {
 			return {
 				nLevelIDs:'',
 				info:'',
 				loading:false,
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
             this.nLevelIDs=opt.nLevelID;
 			this.queryCarModelBynLevelID()
 		},
@@ -79,12 +98,44 @@
 			   	  this.info=res.data;
 				  this.loading=true;
 			   })
-		   }
+		   },
+		   goback() {
+		   	uni.navigateBack({
+		   	 	delta: 1
+		   	})
+		   },
+		   gohome(){
+		   	
+		   		/* uni.switchTab({
+		   			url:'../../pages/index/index'
+		   		}) */
+		   	uni.navigateTo({
+		   		url:'/pages/index/index'
+		   	})
+		   	
+		   },
 		}
 	}
 </script>
 
 <style scoped>
+.topNavBox{
+	background: #D53533;
+	width: 750rpx;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 11;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/AFCBDA6F-03C0-46C0-9090-9A34C125D140.png') no-repeat;
+	background-size: 100%;
+}
+.indexnav{
+		height: 44px;
+		line-height: 44px;
+		text-align: center;
+		font-size: 36rpx;
+		color: #FFFFFF;
+	}
 .top{
 	background: url('http://dmsphoto.66km.com.cn/thFiles/AFCBDA6F-03C0-46C0-9090-9A34C125D140.png') no-repeat;
 	background-size: 100%;
@@ -118,4 +169,45 @@
 .lineRight{
 	color: #3C3C3C;
 }
+.zdyNav{
+		height: 44px;
+		display: flex;
+		justify-content: space-between;
+		
+		align-items: center;
+	}
+	
+	.backImg{
+		width: 44rpx;
+		height: 44rpx;
+		/* margin-left: 10rpx; */
+		/* margin-right: 20rpx; */
+	}
+	.navsx{
+		width: 2rpx;
+		height: 44rpx;
+		background: #e1e1e1;
+		margin: 0 26rpx 0rpx 18rpx;
+	}
+	.homeImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.zdyNavLeft{
+		display: flex;
+		align-items: center;
+        border: 1px solid #e1e1e1;
+		margin-left: 15rpx;
+		border-radius: 35rpx;
+		padding: 10rpx 23rpx 8rpx 13rpx;
+		
+	}
+	.zdyNavTitle{
+		width: 100vw;
+		height: 44px;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
 </style>

pages/index/carGroup.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'车型选择'"></homenav>
 		<view class="top">
 			<image :src="optdata.logo" mode="" class="logoImg"></image>
 			<view class="topname">
@@ -19,9 +20,10 @@
 </template>
 
 <script>
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-			
+			homenav
 		},
 		data() {
 			return {
@@ -31,11 +33,13 @@
 				logo:'',
 				optdata:'',
 				carGroupList:[],
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
-          this.optdata=opt;
-		  this.getmodelList();
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+            this.optdata=opt;
+		    this.getmodelList();
 		},
 		methods: {
 		   goItem(e){

pages/index/carModel.vue

@@ -2,6 +2,7 @@
 	<view class="carbox">
 		
 		<view class="tab1 ">
+			
 			<scroll-view  class="scroll-view" :scroll-into-view="toView" scroll-y="true" >
 				<view class="brand-select">
 					<template v-for="item in carModelList">
@@ -43,7 +44,7 @@
 		<!-- 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 v-for="item in carSeriesList" :key="item.manufactor" class="brandListkk">
 					  <h3 class="cell-item-title">{{ item.manufactor }}</h3>
@@ -165,6 +166,7 @@
 <script>
 
 	export default {
+		props:['iStatusBarHeight'],
 		data() {
 			return {
 				carModelList:'',
@@ -411,10 +413,10 @@
 	z-index: 11;
 }
 .brandListkk{
-	padding-top: 30rpx;
+	padding-top: 44px;
 }
 .brand-select .rmview .brand-select-title{
-	background: #fff;
+	/* background: #fff; */
 }
 .rmview{
 	border-radius: 16rpx;overflow: hidden;
@@ -471,7 +473,7 @@
 	}
 	.brand-select{
 	  .brand-select-title{
-	    height: 80rpx;
+	    height: 64rpx;
 	    background:rgba(247,247,247,1);
 	    position: relative;
 	    h5{
@@ -479,9 +481,9 @@
 	      height:40rpx;
 	      font-size:28rpx;
 	      font-weight:500;
-	      color:rgba(102,102,102,1);
+	      color:#1a1a1a;
 	      line-height:40rpx;
-	      top: 20rpx;
+	      top: 12rpx;
 	      left: 30rpx;
 	    }
 	  }
@@ -493,7 +495,7 @@
 	    .brand-select-item{
 	      display: block;
 	      width: 80rpx;
-	      height: 100rpx;
+	      min-height: 100rpx;
 	      padding: 30rpx;
 	      img{
 	        display: inline-block;
@@ -508,7 +510,7 @@
 	        width: 90rpx;
 	        font-size:22rpx;
 	        font-weight:400;
-	        color:rgba(51,51,51,1);
+	        color:#1a1a1a;
 	        line-height:33rpx;
 	      }
 	    }
@@ -548,6 +550,7 @@
 		background: #FFFFFF;
 		height: 100vh;
 		margin-left: 20vw;
+		padding-top: 20rpx;
 	}
 	.carModel-nav-title{
 	  height:100rpx;
@@ -586,7 +589,7 @@
 	}
 	.cell-item-title{
 	 line-height: 69rpx;padding-left: 24rpx;
-	  width: 504rpx;margin-left: 30rpx;
+	  width: 520rpx;margin-left: 30rpx;
 	  height: 69rpx;
 	  background: #FF4F00 linear-gradient(132deg, #FF8635 0%, #FF4828 100%);
 	  border-radius: 16rpx;
@@ -599,16 +602,16 @@
 	  display: -webkit-flex;
 	  display: flex;
 	  box-sizing: border-box;
-	  width: 100%;
-	  padding: 6rpx 30rpx;
+	  width: calc(100% - 60rpx);
+	  padding: 6rpx 24rpx;
 	  overflow: hidden;
 	  color: #323233;
-	  font-size: 3.73333vw;
+	  font-size: 26rpx;
 	  line-height: 82rpx;
 	  height: 82rpx;
 	  background-color: #fff;
 	  border-bottom: 1px solid #ebedf0;
-	
+	  margin-left: 30rpx;
 	}
 	.carModel-nav-title{
 	  height:100rpx;

pages/index/displacement.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'车型选择'"></homenav>
 		<view class="top">
 			<image :src="optdata.logo" mode="" class="logoImg"></image>
 			<view class="topname">
@@ -19,9 +20,10 @@
 </template>
 
 <script>
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-			
+			homenav
 		},
 		data() {
 			return {
@@ -31,9 +33,11 @@
 				logo:'',
 				optdata:'',
 				displacementList:[],
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
           this.optdata=opt;
 		  this.getdisplacementList()
 		},

pages/index/engineOil.vue

@@ -1,9 +1,17 @@
 <template>
 	<view class="content">
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'机油'"></homenav>
 		<view class="box">
 			<view class="historyLine">
-				<image :src="optdata.logo" mode="" class="historylinecarImg"></image>
-				<view class="historylinecar">{{optdata.value}}</view>
+				<view class="historyLineCar">
+					<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>
 		</view>
 		<view class="cont">
@@ -35,6 +43,7 @@
 						</view>
 					</view>
 				</view>
+				<nodata v-if="MaintainPartList.length==0"></nodata>
 			</view>
 
 
@@ -46,19 +55,23 @@
 </template>
 
 <script>
+	import nodata from '../../components/nodata/nodata.vue'
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-
+            nodata,homenav
 		},
 		data() {
 			return {
                optdata:'',
 			   MaintainPartList:[],
 			   oilusage:'',
+			   iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
 			  console.log(opt)
+			   this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
               this.optdata=opt;
 			  this.queryMaintainPartList()
 			  this.queryOilInfoByGroupID()
@@ -130,13 +143,12 @@
 		font-weight: 400;
 		font-size: 26rpx;
 		color: #1A1A1A;
-		line-height: 37rpx;
+		line-height: 46rpx;
 		width: 636rpx;
 	}
 
 	.historyLine {
-		display: flex;
-		justify-content: space-between;
+		
 		padding: 30rpx 0;
 		border-top: 1rpx solid #EEEEEE;
 	}
@@ -164,7 +176,7 @@ color: #FFFFFF;font-size: 28rpx;padding-left: 16rpx;
 		height: 54rpx;margin-top: 22rpx;
 	}
 	.topLine{
-		display: flex;padding-top: 32rpx;
+		display: flex;padding-top: 34rpx;
 	}
 	.jiyouTop{
 		display: flex;justify-content: space-between;
@@ -208,7 +220,26 @@ color: #FFFFFF;font-size: 28rpx;padding-left: 16rpx;
 	.jylineBox{
 		display: flex;justify-content: space-between;flex-wrap: wrap;
 	}
-	.jyNametxt{
-		
+	.historyLineVin{
+		display: flex;background: #ffffff;
+	}
+	.historyLineCar{
+		display: flex;justify-content: space-between;
+	}
+	.vinNum{
+		font-weight: 400;font-size: 22rpx;padding-left: 10rpx;
+		color: #999999;line-height: 30rpx;
+	}
+	.vinms{
+		width: 38rpx;
+		height: 26rpx;
+		background: linear-gradient(224deg, #FFDA28 0%, #FFBF35 100%);
+		border-radius: 4rpx;
+		text-align: center;
+		line-height: 26rpx;
+		font-weight: 600;
+		color: #FFFFFF;
+		font-size: 18rpx;
+		margin-top: 2rpx;
 	}
 </style>

pages/index/gearboxOil.vue

@@ -1,9 +1,17 @@
 <template>
 	<view class="content">
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'变速箱油'"></homenav>
 		<view class="box">
 			<view class="historyLine">
-				<image :src="optdata.logo" mode="" class="historylinecarImg"></image>
-				<view class="historylinecar">{{optdata.value}}</view>
+				<view class="historyLineCar">
+					<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>
 		</view>
 		<view class="cont">
@@ -24,6 +32,7 @@
 						</view>
 					</view>
 				</view>
+				<nodata v-if="MaintainPartList.length==0"></nodata>
 			</view>
 			<!-- 养护信息 -->
             <view class="jiyouBox">
@@ -33,7 +42,7 @@
 				<view class="yhxxline">
 					<view class="yhxxlineLeft">型号/厂家</view>
 					<view class="yhxxlineRight">
-						{{ detail.carmodelGroupGearbox&&detail.carmodelGroupGearbox.carmodelGroupGearbox ||'--' }} / {{ detail.carmodelGroupGearbox&&detail.carmodelGroupGearbox.manufactor||'--' }}
+						{{ detail.carmodelGroupGearbox&&detail.carmodelGroupGearbox.model ||'--' }} 
 					</view>
 				</view>
 				<view class="yhxxline">
@@ -112,18 +121,22 @@
 </template>
 
 <script>
+	import nodata from '../../components/nodata/nodata.vue'
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-
+            nodata,homenav
 		},
 		data() {
 			return {
                 optdata:'',
                 MaintainPartList:[],
 				detail:'',
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
+			  this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
               this.optdata=opt;
 			  this.queryMaintainPartList();
 			  this.queryGearbox()
@@ -192,13 +205,12 @@
 		font-weight: 400;
 		font-size: 26rpx;
 		color: #1A1A1A;
-		line-height: 37rpx;
+		line-height: 46rpx;
 		width: 636rpx;
 	}
 
 	.historyLine {
-		display: flex;
-		justify-content: space-between;
+	
 		padding: 30rpx 0;
 		border-top: 1rpx solid #EEEEEE;
 	}
@@ -324,4 +336,26 @@ line-height: 34rpx;padding-top: 16rpx;
 	.yhxxImglineBox:nth-child(4){
 		margin-right: 0rpx;
 	}
+	.historyLineVin{
+		display: flex;background: #ffffff;
+	}
+	.historyLineCar{
+		display: flex;justify-content: space-between;
+	}
+	.vinNum{
+		font-weight: 400;font-size: 22rpx;padding-left: 10rpx;
+		color: #999999;line-height: 30rpx;
+	}
+	.vinms{
+		width: 38rpx;
+		height: 26rpx;
+		background: linear-gradient(224deg, #FFDA28 0%, #FFBF35 100%);
+		border-radius: 4rpx;
+		text-align: center;
+		line-height: 26rpx;
+		font-weight: 600;
+		color: #FFFFFF;
+		font-size: 18rpx;
+		margin-top: 2rpx;
+	}
 </style>

pages/index/goodsDetail.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+	  <homenav :iStatusBarHeight="iStatusBarHeight" :title="'商品详情'"></homenav>
 	  <view class="uni-margin-wrap">
 			<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" :interval="3000"
 				:duration="duration">
@@ -15,24 +16,28 @@
 		<view style="height: 30rpx;background: #F4F5F7;"></view>
 		<view class="detail">
 			<view class="datailTitle">商品详情</view>
-			<view v-html="info.ozContent"></view>
+			<rich-text :nodes="html"></rich-text>
 		</view>
 	  
 	</view>
 </template>
 
 <script>
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-			
+			homenav
 		},
 		data() {
 			return {
 				id:'',
 				info:'',
+				iStatusBarHeight:'',
+				html:'',
 			}
 		},
 		onLoad(opt) {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
             this.id=opt.id;
 			this.queryPartDetail()
 		},
@@ -45,7 +50,9 @@
 			     
 			    },'POST').then(res => {
 					uni.hideLoading();
-					this.info=res.data
+					this.info=res.data;
+					this.html = this.info.ozContent
+					this.html = this.html.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
 			   })
 		   },
 		   showImgList(img){
@@ -94,4 +101,12 @@
 	font-size: 28rpx;
 	padding: 30rpx 24rpx;
 }
+
+.detail img{
+  width: 750rpx;
+		
+}
+.detail image{
+ width: 750rpx;
+}
 </style>

pages/index/history.vue

@@ -1,31 +1,43 @@
 <template>
 	<view class="content">
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'历史查询'"></homenav>
 	  <view class="box">
 		  <view class="historyLine" v-for="(item,index) in historyList" @click="goDetail(item)">
-		  	<image :src="item.logo" mode="" class="historylinecarImg"></image>
-		  	<view class="historylinecar">{{item.title}}</view>
+			<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>
 		  </view>
+		  <nodata v-if="historyList.length==0"></nodata>
 	  </view>
 	</view>
 </template>
 
 <script>
+	import homenav from "../../components/homenav/nav.vue"
+	import nodata from '../../components/nodata/nodata.vue'
 	export default {
 		components: {
-			
+			homenav,nodata
 		},
 		data() {
 			return {
 				historyList:[],
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
-          this.queryHistory()
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+            this.queryHistory()
 		},
 		methods: {
 			goDetail(e){
 				uni.navigateTo({
-					url:'/pages/index/byItem?nLevelID='+e.nLevelID+'&logo='+e.logo+'&value='+e.title+'&id='+e.groupID
+					url:'/pages/index/byItem?nLevelID='+e.nLevelID+'&logo='+e.logo+'&value='+e.title+'&id='+e.groupID+'&isVin='+e.ifVin+'&vin='+e.vin
 				}) 
 			},
            queryHistory(){
@@ -52,10 +64,32 @@
 .historylinecar{
 	font-weight: 400;font-size: 26rpx;
 	color: #1A1A1A;
-	line-height: 37rpx;width: 636rpx;
+	line-height: 46rpx;width: 636rpx;
 }
 .historyLine{
-	display: flex;justify-content: space-between;
+	
 	padding: 30rpx 0;border-top: 1rpx solid #EEEEEE;
 }
+.historyLineCar{
+	display: flex;justify-content: space-between;
+}
+.vinms{
+	width: 38rpx;
+	height: 26rpx;
+	background: linear-gradient(224deg, #FFDA28 0%, #FFBF35 100%);
+	border-radius: 4rpx;
+	text-align: center;
+	line-height: 26rpx;
+	font-weight: 600;
+	color: #FFFFFF;
+	font-size: 18rpx;
+	margin-top: 2rpx;
+}
+.historyLineVin{
+	display: flex;
+}
+.vinNum{
+	font-weight: 400;font-size: 22rpx;padding-left: 10rpx;
+	color: #999999;line-height: 30rpx;
+}
 </style>

pages/index/index.vue

@@ -33,7 +33,7 @@
 				</view>
 			</view>
 		</view>
-		<carModel ref="carModelView" ></carModel>
+		<carModel ref="carModelView" :iStatusBarHeight="iStatusBarHeight"></carModel>
 		
 		<!-- 选择车型 -->
 		<view class="ckcarBox" v-if="ckCarShow" >
@@ -118,13 +118,13 @@
 			 },
 			 gocarDetail(e){
 				 uni.navigateTo({
-				 	url:'/pages/index/byItem?nLevelID='+e.nLevelID+'&logo='+e.logo+'&value='+e.title+'&id='+e.groupID
+				 	url:'/pages/index/byItem?nLevelID='+e.nLevelID+'&logo='+e.logo+'&value='+e.title+'&id='+e.groupID+'&isVin='+e.ifVin+'&vin='+e.vin
 				 })
 			 },
 			 gobyItem(e){
 				 var nLevelID=e.nLevelIDs.split(',')[0]
 				 uni.navigateTo({
-				 	url:'/pages/index/byItem?nLevelID='+nLevelID+'&logo='+e.carModelInfo.logo+'&value='+e.title+'&id='+e.ids
+				 	url:'/pages/index/byItem?nLevelID='+nLevelID+'&logo='+e.carModelInfo.logo+'&value='+e.title+'&id='+e.ids+'&isVin=1&vin='+this.vinNum
 				 })
 			 },
              gohistory(){
@@ -265,7 +265,7 @@
 	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 11;
+	z-index: 111;
 	background: url('http://dmsphoto.66km.com.cn/thFiles/DE1573A0-1C08-4243-8313-C0BA094406D0.png') no-repeat;
 	background-size: 100%;
 }
@@ -325,7 +325,7 @@
 .historylinecar{
 	font-weight: 400;font-size: 26rpx;
 	color: #1A1A1A;
-	line-height: 37rpx;width: 576rpx;
+	line-height: 46rpx;width: 576rpx;
 }
 .historyLine{
 	display: flex;justify-content: space-between;

pages/index/maintenance.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+		 <homenav :iStatusBarHeight="iStatusBarHeight" :title="'保养周期'"></homenav>
 	  <view class="tabbox">
 		  <view class="tabline" @click="tabindex=1">
 			  <view class="tabName" :class="{'tabActive':tabindex==1}">保养计划</view> 
@@ -52,9 +53,10 @@
 </template>
 
 <script>
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-			
+			homenav
 		},
 		data() {
 			return {
@@ -69,10 +71,12 @@
 					scrollTop: 0
 				},
 				leftData:[],
-				pjList:[]
+				pjList:[],
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			 this.optdata=opt;
              this.queryPlan();
 			  this.queryOilInfoByGroupID()

pages/index/search.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+	  <homenav :iStatusBarHeight="iStatusBarHeight" :title="'搜索'"></homenav>
 	  <view class="sTopBox">
 		  <view class="searchInputBox" >
 		  	<image src="../../static/img/icon_search.png" mode="" class="simg"></image>
@@ -25,8 +26,8 @@
 	  			<view class="ckcarTitle">请选择车型</view>
 	  			<image src="../../static/img/icon_quxiao.png" mode="" class="ckcarClose" @click="ckcarClose"></image>
 	  		</view>
-	  		<view class="ckcarlineBox">
-	  			<view class="ckcarline flex" v-for="(item,index) in vinList" @click="goDetal(item)">
+	  		<view class="ckcarlineBox" v-for="(item,index) in vinList" @click="goDetal(item)">
+	  			<view class="ckcarline flex" >
 	  				<view class="ckcarLeft">{{item.title}}</view>
 	  				<image src="../../static/img/icon_arrow.png" mode="" class="ckcarJtimg"></image>
 	  			</view>
@@ -67,9 +68,10 @@
 </template>
 
 <script>
+	import homenav from "../../components/homenav/nav.vue"
 	export default {
 		components: {
-			
+			homenav
 		},
 		data() {
 			return {
@@ -89,10 +91,11 @@
 				carSeries:'',
 				isVin:'',
 				vin:'',
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
-         
+         this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 		},
 		methods: {
 		   goDetal(e){
@@ -115,7 +118,7 @@
 				   this.brand=e.brand
 				   this.carSeries=e.carSeries
 				   this.manufactor=e.manufactor
-				   this.getpopuponeList()
+				   this.getpopuponeList(e)
 			   }
 		   },
 		   popuponeBtn(item){
@@ -130,40 +133,69 @@
 		   popupcTwo(){
 			   this.popupTwoShow=false;
 		   },
-		   getpopuponeList(){
+		   getpopuponeList(e){
 			   uni.showLoading({ title: '加载中'});
 			   if(this.type==1){
 				  var params={
 				  		manufactor: this.manufactor,type:this.type
 				  } 
-			   }else{
+				  this.$http('matchingByOpen/queryCarModelGroupIiPackageSecond', params,'POST').then(res => {
+				    	uni.hideLoading();
+				       this.popuponeList=res.data;
+				  		this.popuponeShow=true;
+				  })
+			   }else if(this.type==2){
 				 var params={
 				 		manufactor: this.manufactor,type:this.type,carSeries:this.carSeries,brand:this.brand
 				 }   
+				 this.$http('matchingByOpen/queryCarModelGroupIiPackageSecond', params,'POST').then(res => {
+				   	uni.hideLoading();
+				      this.popuponeList=res.data;
+				 	  this.popuponeShow=true;
+				 })
+			   }else{
+				   uni.hideLoading();
+				   console.log(e)
+				   this.displacementList=e.displacementList;
+				   this.popupTwoShow=true;
 			   }
 			   
-			   this.$http('matchingByOpen/queryCarModelGroupIiPackageSecond', params,'POST').then(res => {
-			     	uni.hideLoading();
-			        this.popuponeList=res.data;
-			   		this.popuponeShow=true;
-			   })
+			   
 		   },
 		   popupc(){
 			   this.popuponeShow=false;
 		   },
            searchFn(){
 			   console.log(this.value.length)
+			   if(!this.value){
+				   uni.showToast({
+				       title: '请输入车辆品牌、车系或VIN码',
+				   	   icon:'none',
+				       duration: 3000,
+				   });
+				   return false
+			   }
 			   if(this.value.length==17){
 				   uni.showLoading({ title: '加载中'});
 				   this.isVin=1;
-				   this.vin=this.value
+				   this.vin=this.value;
+				   this.vinList=[];
 				   this.$http('matchingByOpen/queryCarModelGroupByVinAggregation', {
 				     vin: this.value,type:2
 				    },'POST').then(res => {
 				     	uni.hideLoading();
-				        this.vinList=res.data;
-				   		this.ckCarShow=true;
-						this.carMshow=false;
+						if(res.code==0){
+							
+							this.vinList=res.data;
+							if(this.vinList.length==1){
+								this.goDetal(this.vinList[0])
+							}else{
+								this.ckCarShow=true;
+								this.carMshow=false;
+							}
+							
+						}
+				       
 				   })
 			   }else{
 				   uni.showLoading({ title: '加载中'});
@@ -288,7 +320,7 @@
 	width: 600rpx;
 }
 .simg{
-	width: 34rpx;height: 34rpx;margin-top: 23rpx;margin-left:30rpx;
+	width: 36rpx;height: 34rpx;margin-top: 23rpx;margin-left:30rpx;
 }
 .historylinecarImg{
 	width: 46rpx;