浏览代码

新版修改

twt 3 周之前
父节点
当前提交
3822b2c15e
共有 17 个文件被更改,包括 1108 次插入25 次删除
  1. 35 0
      pages.json
  2. 12 3
      pages/index/carGroup.vue
  3. 739 0
      pages/index/carModel2.vue
  4. 3 1
      pages/index/displacement.vue
  5. 218 21
      pages/index/index.vue
  6. 101 0
      pages/index/user.vue
  7. 二进制
      static/img/bsxglq.png
  8. 二进制
      static/img/bsxy.png
  9. 二进制
      static/img/index1.png
  10. 二进制
      static/img/index2.png
  11. 二进制
      static/img/jiyou.png
  12. 二进制
      static/img/lanjt.png
  13. 二进制
      static/img/lscx.png
  14. 二进制
      static/img/touxiang.png
  15. 二进制
      static/img/user2.png
  16. 二进制
      static/img/vin.png
  17. 二进制
      static/img/yusha.png

+ 35 - 0
pages.json

@@ -81,8 +81,43 @@
 				"navigationBarTitleText": "保养周期",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/index/user",
+			"style": {
+				"navigationBarTitleText": "我的",
+				 "navigationBarBackgroundColor":"#FF4F00"
+			}
+		},
+		{
+			"path": "pages/index/carModel2",
+			"style": {
+				"navigationBarTitleText": "选择车型"
+				
+			}
 		}
 	],
+	"tabBar": {
+		"color": "#8a8a8a",
+		"selectedColor": "#FF4F00",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/img/index2.png",
+				"selectedIconPath": "static/img/index1.png",
+				"text": "首页"
+			},
+			
+			{
+				"pagePath": "pages/index/user",
+				"iconPath": "static/img/user2.png",
+				"selectedIconPath": "static/img/user2.png",
+				"text": "我的"
+			}
+		]
+		
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "用油查询",

+ 12 - 3
pages/index/carGroup.vue

@@ -34,18 +34,27 @@
 				optdata:'',
 				carGroupList:[],
 				iStatusBarHeight:'',
+				type:'',
 			}
 		},
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
             this.optdata=opt;
+			this.type=opt.type
 		    this.getmodelList();
 		},
 		methods: {
 		   goItem(e){
-			  uni.navigateTo({
-			  	url:'/pages/index/byItem?nLevelID='+e.carModelInfo.nLevelID+'&logo='+this.optdata.logo+'&manufactor='+this.optdata.manufactor+'&carSeries='+this.optdata.carSeries+'&brand='+this.optdata.brand+'&value='+e.value+'&id='+e.id
-			  }) 
+			  if(this.type==2){
+				  uni.navigateTo({
+				  	url:'/pages/index/gearboxOil?nLevelID='+this.optdata.nLevelID+'&logo='+this.optdata.logo+'&value='+e.value+'&id='+e.id+'&isVin='+this.optdata.isVin+'&vin='+this.optdata.vin
+				  })
+			  }else{
+				 uni.navigateTo({
+				 	url:'/pages/index/byItem?nLevelID='+e.carModelInfo.nLevelID+'&logo='+this.optdata.logo+'&manufactor='+this.optdata.manufactor+'&carSeries='+this.optdata.carSeries+'&brand='+this.optdata.brand+'&value='+e.value+'&id='+e.id
+				 })  
+			  }
+			  
 		   },
            getmodelList(){
            	uni.showLoading({ title: '加载中'});

+ 739 - 0
pages/index/carModel2.vue

@@ -0,0 +1,739 @@
+<template>
+	<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">
+					  <view :id="item['首字母']" v-if="item['首字母']!='热'">
+						<view class="brand-select-title" :id="item['首字母']+'-model'">
+						  <h5 :class="{'brand-select-titleselect':item['首字母']==toView}">{{item['首字母']}}</h5>
+						</view>
+					   
+							<view class="brand-select-wrapper">
+								<a class="brand-select-item" v-for="item2 in item['品牌列表']" @click="selectBrand(item2)" :id="item2.brand">
+								  <img :src="item2.logo" class="brand-select-item-icon">
+								  <span>{{item2.brand||item2.name}}</span>
+								</a>
+							</view>
+					   
+					  </view>
+					  <view :id="'rm'" v-if="item['首字母']=='热'" class="rmview">
+						<view class="brand-select-title" :id="item['首字母']+'-model'">
+						  <h5 :class="{'brand-select-titleselect':toView=='rm'}">{{item['首字母']}}</h5>
+						</view>
+		   
+							<view class="brand-select-wrapper">
+								<a class="brand-select-item" v-for="item2 in item['品牌列表']" @click="selectBrand(item2)" :id="item2.brand">
+								  <img :src="item2.logo" class="brand-select-item-icon">
+								  <span>{{item2.brand||item2.name}}</span>
+								</a>
+							</view>
+					   
+					  </view>
+					</template>
+				 </view>
+		    </scroll-view > 
+			<view class="fast-navigation">
+				<a class="fast-navigation-sel" v-if="item['首字母']=='热'" :class="{'select':toView=='rm'}" v-for="item in carModelList" @tap="bindToView(item)">热</a>
+			   <a class="fast-navigation-sel" v-if="item['首字母']!=='热'" :class="{'select':item['首字母']==toView}" v-for="item in carModelList" @tap="bindToView(item)">{{item['首字母']}}</a>
+			</view>
+			
+		</view>
+		<!-- uni-popup -->
+		<view class="popupone"  @click="popupc" v-if="popuponeShow">
+			<view class="popup-content" >
+				<scroll-view class="brandList" scroll-y="true">
+					
+					<view style="height: 10px;"></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>
+					</view>
+					<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+					<view class="status_bar" style="height: 50px;"></view>
+				</scroll-view>
+				
+			</view>
+		</view> 
+		
+		<!-- 排量 -->
+		
+		<!-- 
+		<view class="displacementListBox" v-show="displacementListShow">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		
+			<h3 class="carModel-nav-title">
+				<view class="carModel-nav-title—left">
+					<img :src="selectedCarBrand.logo" class="carModel-nav-title-img" @click="$emit('changeStep', 1)">
+					<span class="carModel-nav-title-msg carModel-nav-title-msg1">{{ selectedCarBrand.brand }} {{ carSeries }}</span>
+				</view>
+			    <view class="carBack" @click="carBack(1)">上一步</view>
+			  
+			</h3>
+			<scroll-view scroll-y="true" class="brandList">
+			  <view @click="selectDisplacement(item)" v-for="item in displacementList" class="displacementListLine" >
+			    {{item}}
+			  </view>
+			  <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			  <view class="status_bar" style="height: 50px;"></view>
+			</scroll-view>
+		</view> -->
+		<!-- 排量 -->
+		<!-- 离合器 -->
+		<!-- <view class="carGroupListBox" v-show="carGroupListShow">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			
+			<h3 class="carModel-nav-title">
+				<view class="carModel-nav-title—left">
+					<img :src="selectedCarBrand.logo" class="carModel-nav-title-img" @click="$emit('changeStep', 1)">
+					<span class="carModel-nav-title-msg carModel-nav-title-msg1">{{ selectedCarBrand.brand }} {{ carSeries }}{{displacement}}</span>
+				</view>
+				<view class="carBack" @click="carBack(2)">上一步</view>
+			</h3>
+			<scroll-view scroll-y="true" class="brandList">
+			  <view @click="goList(item)" v-for="item in carGroupList" class="displacementListLine" >
+			    {{item.title}}
+			  </view>
+			  <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			  <view class="status_bar" style="height: 50px;"></view>
+			</scroll-view>
+		</view> -->
+		<!-- 离合器 -->
+		
+		<!-- 搜索的 -->
+	<!-- 	<view class="carssListBox" v-show="carssListShow" @click="carssListShow=false">
+			<view class="carssListBoxCont" >
+				<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+				<h3 class="carModel-nav-title">
+					<view class="carModel-nav-title—left">
+						<span class="carModel-nav-title-msg" style="padding-left: 24rpx;">{{carName}}</span>
+					</view>
+					
+				</h3>
+				<scroll-view scroll-y="true" class="brandList">
+				  <view @click.stop="ssitem(item)" v-for="item in carsslist" class="carsslineTxt" >
+				    {{item.title}}
+				  </view>
+				  <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+				  <view class="status_bar" style="height: 50px;"></view>
+				</scroll-view>
+			</view>
+		</view> -->
+		
+		<!-- <view class="carssListBox2" v-show="secondShow" @click.stop="secondShow=false">
+			<view class="carssListBoxCont">
+				<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+				<h3 class="carModel-nav-title">
+					<view class="carModel-nav-title—left">
+						<span class="carModel-nav-title-msg" style="padding-left: 24rpx;">{{ssname1}}</span>
+					</view>
+					<view class="carBack" @click="secondShow=false">上一步</view>
+				</h3>
+				<scroll-view scroll-y="true" class="brandList">
+				  <view @click.stop="seconditem(item)" v-for="item in secondlist" class="carsslineTxt" >
+				    {{item.title}}
+				  </view>
+				  <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+				  <view class="status_bar" style="height: 50px;"></view>
+				</scroll-view>
+			</view>
+			
+		</view>
+		<view class="carssListBox2" v-show="ssdisplacementListShow" @click.stop="ssdisplacementListShow=false">
+			<view class="carssListBoxCont">
+				<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+				<h3 class="carModel-nav-title">
+					<view class="carModel-nav-title—left">
+						<span class="carModel-nav-title-msg " style="padding-left: 24rpx;">{{ssname2}}</span>
+					</view>
+					<view class="carBack" @click="ssdisplacementListShow=false">上一步</view>
+				</h3>
+				<scroll-view scroll-y="true" class="brandList">
+				  <view @click="golistnew(item)" v-for="item in ssdisplacementList" class="carsslineTxt" >
+				    {{item.displacement}}
+				  </view>
+				  <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+				  <view class="status_bar" style="height: 50px;"></view>
+				</scroll-view>
+			</view>
+			
+		</view> -->
+		<!-- 搜索的 -->
+	</view>
+</template>
+
+<script>
+
+	export default {
+		//props:['iStatusBarHeight','svHeight'],
+		data() {
+			return {
+				carModelList:'',
+				toView:'',
+				type:'right',
+				iStatusBarHeight:0,
+				selectedCarBrand:'',
+				brand:'',
+				carSeriesList:'',
+				manufactor:'',
+				carSeries:'',
+				displacementList:'',
+				displacementListShow:false,
+				selectedCarSeries:'',
+				displacement:'',
+				carGroupList:'',
+				carGroupListShow:false,
+				carsslist:[],
+				carName:'',
+				carssListShow:false,
+				secondShow:false,
+				secondlist:'',
+				carItem:'',
+				ssdisplacementListShow:false,
+				ssdisplacementList:'',
+				ssname1:'',
+				ssname2:'',
+				popuponeShow:false,
+				type:'',
+			}
+		},
+		onLoad(opt) {
+          this.type=opt.type
+		  this.getdata()
+		   
+		},
+		methods: {
+		  aaa(){
+			 return {height: `calc(100vh - 44px)`}; 
+		  },
+		  popupc(e){
+			 /* console.log(e)
+			  if(!e.show){
+				  this.displacementListShow=false;
+				  this.carGroupListShow=false;
+			  } */
+			  this.popuponeShow=false
+		  },
+		  carBack(num){
+				if(num==2){
+					this.carGroupListShow=false;
+				}
+				if(num==1){
+					this.displacementListShow=false;
+				}
+		  },
+		  getcarsslist(){
+			  this.secondShow=false;
+			  this.ssdisplacementListShow=false;
+			   uni.showLoading({ title: '加载中'});
+			  this.$http('matchingByOpen/queryCarModelGroupIiPackage', {
+			  		name:this.carName	
+			  }, 'POST').then(res => {
+				  uni.hideLoading();
+				  this.carssListShow=true;
+				  this.carsslist=res.data
+			  //	this.carModelList=res.data.brands
+			  	
+			  })
+		  },
+		  ssitem(item){
+			  this.carItem=item;
+			  uni.showLoading({ title: '加载中'});
+			  if(item.type==1){
+				  var params={
+					  type:item.type,
+					  manufactor:item.manufactor,
+				  }
+				  this.$http('matchingByOpen/queryCarModelGroupIiPackageSecond', params, 'POST').then(res => {
+				  	this.secondlist=res.data;
+				  				this.secondShow=true;
+				  	  uni.hideLoading();
+				  })
+			  }else if(item.type==2){
+				  var params={
+					  type:item.type,
+					  manufactor:item.manufactor,
+					  brand:item.brand,
+					  carSeries:item.carSeries
+				  }
+				  this.$http('matchingByOpen/queryCarModelGroupIiPackageSecond', params, 'POST').then(res => {
+				  	this.secondlist=res.data;
+				  			this.secondShow=true;
+				  	  uni.hideLoading();
+				  })
+			  }else{
+				  if(item.displacementList.length==1){
+					  uni.navigateTo({
+					  	url:'list?type=2&id='+item.displacementList[0].id
+					  })
+				  }else{
+					  this.ssdisplacementList=item.displacementList;
+					  this.ssdisplacementListShow=true;
+					  this.ssname2=item.title;
+				  }
+				 
+				  
+			  }
+			   this.ssname1=item.title
+			 
+			  
+		  },
+		  seconditem(item){
+			  if(item.displacementList.length==1){
+			  					  uni.navigateTo({
+			  					  	url:'list?type=2&id='+item.displacementList[0].id
+			  					  })
+			  }
+			  else{
+				 this.ssdisplacementList=item.displacementList;
+				 this.ssdisplacementListShow=true;
+				 this.ssname2=item.title 
+			  }
+			  
+			 // this.$refs.popup.open("right2")
+			  //this.popupShow=true;
+		  },
+		  carNameInput(){
+			//console.log(this.carName)  
+			if(this.carName==''){
+				this.carssListShow=false;
+				this.secondShow=false;
+				this.ssdisplacementListShow=false;
+			}
+		  },
+          getdata(){
+			 
+			  uni.showLoading({ title: '加载中'});
+			 
+			  this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			  this.$http('matchingByOpen/queryCarModelGroupPackage', {
+			
+			  }, 'POST').then(res => {
+				   console.log("matchingByOpen/queryCarModelGroupPackage")
+				  console.log(res)
+			  	  this.carModelList=res.data.brands;
+				   
+			  	  uni.hideLoading();
+				 
+			  }).catch((err) => {
+				  console.log(err)
+			  })
+		  },
+		  selectBrand(item){
+		  	console.log(item)
+		  	this.selectedCarBrand=item;
+		  	//this.$refs.popup.open("right")
+		  	this.popuponeShow=true;
+		  	this.brand=item.brand
+		  	this.getbrand()
+		  },
+		  getbrand(){
+		  	uni.showLoading({ title: '加载中'});
+		  	this.$http('matchingByOpen/queryCarModelGroupPackage', {
+		  	  brand:this.brand
+		  	 },'POST').then(res => {
+		  		uni.hideLoading();
+		  		this.carSeriesList=res.data.carSeriesList
+		  	})
+		  },
+		  selectCarFactory(manufactor,item){
+		  	this.manufactor=manufactor;
+		  	this.carSeries=item;
+			console.log(manufactor)
+			console.log(item)
+			console.log(this.selectedCarBrand)
+		  	//this.selectedCarSeries=item
+		  	//this.displacementListShow=true;
+		  	//this.getdisplacementList()
+			uni.navigateTo({
+				url:'/pages/index/displacement?logo='+this.selectedCarBrand.logo+'&manufactor='+manufactor+'&carSeries='+item+'&brand='+this.selectedCarBrand.brand+"&type="+this.type
+			})
+		  },
+		  getdisplacementList(){
+		  	uni.showLoading({ title: '加载中'});
+		  	this.$http('matchingByOpen/queryCarModelGroupPackage', {
+		  	  brand:this.brand,
+		  	  manufactor:this.manufactor,
+		  	  carSeries:this.carSeries
+		  	 },'POST').then(res => {
+		  		uni.hideLoading();
+		  		this.displacementList=res.data.displacementList
+		  	})
+		  },
+		  selectDisplacement(item){
+		  	this.displacement=item;
+		  	this.carGroupListShow=true;
+		  	this.getmodelList();
+		  },
+		  getmodelList(){
+		  	uni.showLoading({ title: '加载中'});
+		  	this.$http('matchingByOpen/queryCarModelGroupPackage', {
+		  	  brand:this.brand,
+		  	  manufactor:this.manufactor,
+		  	  carSeries:this.carSeries,
+		  	  displacement:this.displacement
+		  	 },'post').then(res => {
+		  		uni.hideLoading();
+		  		this.carGroupList=res.data.carGroupList
+		  	})
+		  },
+		  goList(item){
+			  console.log(item)
+			   this.$store.commit('mutationslistId', item.id)
+			  uni.navigateTo({
+			  	url:'list?name='+item.value+'&nLevelID='+item.carModelInfo.nLevelID+'&id='+item.id
+			  })
+		  },
+		  golistnew(item){
+			  uni.navigateTo({
+			  	url:'list?type=2&id='+item.id
+			  })
+		  },
+		  bindToView(item){
+		  	console.log(item)
+		  	if(item['首字母']=='热'){
+		  			this.toView ='rm'
+		  	}else{
+		  			this.toView = item['首字母']
+		  	}
+		  	console.log(this.toView)
+		  	
+		  },
+		  close(){
+		  	//this.$refs.popup.close()
+		  },
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.popupone{
+	width: 100vw;height: 100vh;
+	background:rgba(0, 0, 0, 0.4) ;
+	position: fixed;top: 0;left: 0;
+	z-index: 11;
+}
+.brandListkk{
+	/* padding-top: 44px; */
+}
+.brand-select .rmview .brand-select-title{
+	/* background: #fff; */
+}
+.rmview{
+	border-radius: 16rpx;overflow: hidden;
+}
+.carModel-nav-title-left{
+		display: flex;
+	}
+	.carModel-nav-title{
+		display: flex;
+		justify-content: space-between;
+	}
+	.carBack{
+		line-height: 100rpx;
+		font-size: 30rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		padding-right: 24rpx;
+	}
+	.carSs{
+		width: 750rpx;
+		height: 96rpx;
+		background: #FFFFFF;
+		padding-top: 24rpx;
+		position: fixed;
+		z-index: 999;
+		left: 0;
+		top:90rpx;
+		/* top: calc(44px + 96rpx); */
+	}
+	.carssBox{
+		width: 702rpx;
+		height: 72rpx;
+		background: #F4F5F7;
+		border-radius: 36rpx;
+		margin: 0 auto;
+		
+	}
+	.carSsImg{
+		width: 40rpx;
+		height: 40rpx;
+		margin-top: 16rpx;
+		margin-left: 20rpx;
+	}
+	.carssInput{
+		line-height:72rpx;
+		font-size: 28rpx;
+		height:72rpx;
+		padding-left: 16rpx;
+		width: 600rpx;
+	}
+	.carssBox{
+		display: flex;
+	}
+	.brand-select{
+	  .brand-select-title{
+	    height: 64rpx;
+	   
+	    position: relative;
+	    h5{
+	      position: absolute;
+	      height:40rpx;
+	      font-size:28rpx;
+	      font-weight:500;
+	      color:#1a1a1a;
+	      line-height:40rpx;
+	      top: 12rpx;
+	      left: 30rpx;
+	    }
+	  }
+	  .brand-select-wrapper{
+	    display: flex;
+	    flex-wrap: wrap;
+	    background:rgba(255,255,255,1);
+		width: 714rpx;border-radius: 16rpx;
+	    .brand-select-item{
+	      display: block;
+	      width: 80rpx;
+	      min-height: 100rpx;
+	      padding: 30rpx;
+	      img{
+	        display: inline-block;
+	        margin-left: 10rpx;
+	        width: 60rpx;
+	        height: 60rpx;
+	      }
+	      span{
+	        display: inline-block;
+	        text-align: center;
+	        height:33rpx;
+	        width: 90rpx;
+	        font-size:22rpx;
+	        font-weight:400;
+	        color:#1a1a1a;
+	        line-height:33rpx;
+	      }
+	    }
+	
+	  }
+	}
+	.fast-navigation{
+	  position: absolute;
+	  text-align: center;
+	  right: 10rpx;
+	  top: 0rpx;
+	  width: 34rpx;
+	  font-size:24rpx;
+	  font-weight:500;
+	  line-height:35rpx;
+	  color: rgb(153, 153, 153);
+	  a{
+	    display: block;
+		padding-top: 6rpx;
+		padding-left: 10rpx;
+	  }
+	  .select{
+	    color: #FF4F00;
+	  }
+	}
+	.scroll-view{
+		/* height: calc(100vh - 120rpx); */
+		height: 100vh;
+	}
+	.brand-select{
+		padding-bottom: 100rpx;
+	}
+	.popup-height {
+	
+		width: 200px;
+	}
+	.popup-content{
+		width: 80vw;
+		background: #FFFFFF;
+		height: 100vh;
+		margin-left: 20vw;
+		/* padding-top: 20rpx; */
+	}
+	.carModel-nav-title{
+	  height:100rpx;
+	  background: linear-gradient(110deg, #48B9F9 0%, #3F90F7 100%);
+	  line-height: 100rpx;
+	  display: flex;
+	  z-index: 500;
+	  &.cell-logo{
+	    position: sticky;
+	    top: 0;
+	   background: linear-gradient(110deg, #48B9F9 0%, #3F90F7 100%);
+	  }
+	  .carModel-nav-title-box{
+	    width: 100%;
+	    display: flex;
+	  }
+	  .carModel-nav-title-img{
+	    margin: 20rpx;
+	    width: 60rpx;
+	    height: 60rpx;
+	  }
+	  .carModel-nav-title-msg{
+	    font-size:30rpx;
+	    font-weight:400;
+	    color:rgba(255,255,255,1);
+	    display: block;
+	    padding-right: 20rpx;
+		width: 400rpx;
+		overflow: hidden;
+		text-overflow: ellipsis; 
+				white-space: nowrap; 
+	  }
+	  .carModel-nav-title-msg1{
+		  width: 300rpx;
+	  }
+	}
+	.cell-item-title{
+	 line-height: 69rpx;padding-left: 24rpx;
+	  width: 520rpx;margin-left: 30rpx;
+	  height: 69rpx;
+	  background: #FF4F00 linear-gradient(132deg, #FF8635 0%, #FF4828 100%);
+	  border-radius: 16rpx;
+	  font-weight: 500;
+	  color: #FFFFFF;font-size: 28rpx;
+	}
+	.span-cell{
+	  position: relative;
+	  display: -webkit-box;
+	  display: -webkit-flex;
+	  display: flex;
+	  box-sizing: border-box;
+	  width: calc(100% - 60rpx);
+	  padding: 6rpx 24rpx;
+	  overflow: hidden;
+	  color: #323233;
+	  font-size: 26rpx;
+	  line-height: 82rpx;
+	  height: 82rpx;
+	  background-color: #fff;
+	  border-bottom: 1px solid #ebedf0;
+	  margin-left: 30rpx;
+	}
+	.span-cell:nth-last-child(1){
+		border-bottom: none;
+	}
+	.carModel-nav-title{
+	  height:100rpx;
+	 background: linear-gradient(110deg, #48B9F9 0%, #3F90F7 100%);
+	 line-height: 100rpx;
+	  display: flex;
+	  z-index: 500;
+	  &.cell-logo{
+	    position: sticky;
+	    top: 0;
+	   background: linear-gradient(110deg, #48B9F9 0%, #3F90F7 100%);
+	  }
+	  .carModel-nav-title-box{
+	    width: 100%;
+	    display: flex;
+	  }
+	  .carModel-nav-title-img{
+	    margin: 20rpx;
+	    width: 60rpx;
+	    height: 60rpx;
+	  }
+	  .carModel-nav-title-msg{
+	    font-size:30rpx;
+	    font-weight:400;
+	    color:rgba(255,255,255,1);
+	    display: block;
+	    padding-right: 20px;
+	  }
+	}
+	.carbox{
+		/* height: calc(100vh - 120rpx); */
+		padding: 0 18rpx;
+		padding-top: 20rpx;
+	}
+	.brandList{
+		/* height: calc(100vh - 45px); */
+		/* padding-bottom:var(--status-bar-height); */
+		height: 100vh;
+	}
+	.displacementListLine{
+		min-height: 50rpx;
+		padding: 20rpx 20rpx 20rpx 30rpx;
+		font-size:28rpx;
+		font-weight:600;
+		color:rgba(51,51,51,1);
+		line-height:50rpx;
+		border-top: 2rpx solid rgb(238, 238, 238);
+		background-color: rgb(255, 255, 255);
+	}
+	.carsslineTxt{
+		// height: 98rpx;
+		background: #FFFFFF;
+		line-height:50rpx;
+		color: #333333;
+		font-size: 28rpx;
+		padding: 0 24rpx;
+		border-bottom: 1px solid #EEEEEE;
+		padding: 20rpx 20rpx 20rpx 30rpx;
+	}
+	.displacementListBox{
+		position: fixed;
+		top: 97rpx;
+		left: 20vw;
+		width: 80vw;
+		height: 100vh;
+		background:#F4F5F7 ;
+		z-index: 11111;
+		/*  #ifdef H5 */
+		top:calc(210rpx);
+		/*  #endif  */
+	}
+	.carGroupListBox{
+		position: fixed;
+		top: 0;
+		left: 20vw;
+		width: 80vw;
+		height: 100vh;
+		background:#F4F5F7 ;
+		z-index: 11111;
+		top: 210rpx;
+		/*  #ifdef H5 */
+	/* 	top:calc(44px + 220rpx); */
+		/*  #endif  */
+	}
+	.carssListBox{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 200vw;
+		height: 100vh;
+		background: rgba(0,0,0,0.5) ;
+		z-index: 11111;
+		/*  #ifdef H5 */
+		top:calc( 210rpx);
+		/*  #endif  */
+	}
+	.carssListBoxCont{
+		background: #FFFFFF;width: 80vw;margin-left: 20vw;height: 100vh;
+	}
+	.carssListBox2{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		background: rgba(0,0,0,0) ;
+		z-index: 11112;
+		top:calc(210rpx);
+		
+	}
+	.brand-select-titleselect{
+		    color: #FF4F00 !important;
+	}
+	.tab1{
+		position: relative;
+	}
+</style>

+ 3 - 1
pages/index/displacement.vue

@@ -34,11 +34,13 @@
 				optdata:'',
 				displacementList:[],
 				iStatusBarHeight:'',
+				type:'',
 			}
 		},
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
           this.optdata=opt;
+		  this.type=opt.type
 		  this.getdisplacementList()
 		},
 		methods: {
@@ -55,7 +57,7 @@
            },
 		   gocarGroup(item){
 			   uni.navigateTo({
-			   	url:'/pages/index/carGroup?logo='+this.optdata.logo+'&manufactor='+this.optdata.manufactor+'&carSeries='+this.optdata.carSeries+'&brand='+this.optdata.brand+'&displacement='+item
+			   	url:'/pages/index/carGroup?logo='+this.optdata.logo+'&manufactor='+this.optdata.manufactor+'&carSeries='+this.optdata.carSeries+'&brand='+this.optdata.brand+'&displacement='+item+"&type="+this.type
 			   })
 		   }
 		}

+ 218 - 21
pages/index/index.vue

@@ -1,10 +1,7 @@
 <template>
 	<view class="content">
-		<view class="top">
-			<view class="topNavBox">
-				<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-				<view class="indexnav">用油查询</view>
-			</view>
+		<!-- <view class="top">
+			
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view style="height: 43px;"></view>
 			<view class="searchBox">
@@ -18,10 +15,10 @@
 				</view>
 				
 			</view>
-		</view>
+		</view> -->
 		
 		<!-- 历史查询 -->
-		<view class="historybox ">
+	<!-- 	<view class="historybox ">
 			<view class="history">
 				<view class="historyTop" @click="gohistory">
 					<view class="historyTitle">历史查询</view>
@@ -35,13 +32,13 @@
 					<view class="historylinecar">{{item.title}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- <view :style="{height: aaa}" class="aaaaa"></view> -->
 		<!-- <view @click="wy">asdfasdfasdfas</view> -->
-		<carModel ref="carModelView" :iStatusBarHeight="iStatusBarHeight" :svHeight="aaa"></carModel>
+		<!-- <carModel ref="carModelView" :iStatusBarHeight="iStatusBarHeight" :svHeight="aaa"></carModel> -->
 		
 		<!-- 选择车型 -->
-		<view class="ckcarBox" v-if="ckCarShow" >
+	<!-- 	<view class="ckcarBox" v-if="ckCarShow" >
 			<view class="ckcar" @click.stop="">
 				<view class="ckcarTop flex">
 					<view class="ckcarTitle">请选择车型</view>
@@ -55,7 +52,82 @@
 				</view>
 			</view>
 		</view>
+		 -->
+		 <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		 <view style="height: 43px;"></view>
+		 <view class="topNavBox">
+		 	<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		 	<view class="indexnav">精准用油</view>
+		 </view>
+		 <!-- 轮播-->
+		 <view class="swpBox">
+			 <swiper class="swiperTk" circular  :autoplay="true" :interval="interval"
+			 				:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
+			 	<swiper-item >
+			 		<view class="swiper-itemTk" >
+			 			<image class="tkHdImg" src="http://dmsphoto.66km.com.cn/thFiles/084CAE69-DFFC-48FC-9F82-04E94696AE56.png" mode="widthFix"></image>
+			 		</view>	
+			 	</swiper-item>
+				<swiper-item >
+					<view class="swiper-itemTk" >
+						<image class="tkHdImg" src="http://dmsphoto.66km.com.cn/thFiles/37B94D9D-5D8A-4754-9BBF-5715C1B5F665.jpg" mode="widthFix"></image>
+					</view>	
+				</swiper-item>
+			 </swiper>
+		 </view>
+		 
+		 <view class="contBox">
+			 <view class="vincar">
+				 <view class="vincarTab">
+					  <view class="vincarTabLine anVin">按VIN</view>
+					  <view class="vincarTabLine" @click="goCarModel">按车型</view>
+				 </view>
+				 <view class="inputsBox">
+					 <view class="searchInputBox" @click="goSearch">
+					 	<image src="../../static/img/icon_search.png" mode="" class="simg"></image>
+					 	<input type="text" placeholder="输入17位VIN查询" placeholder-class="ip" class="ssinput">
+					 </view>
+					 <view class="inputsBtn">查询</view>
+				 </view>
+				 <view class="historyBox">
+					 <view class="historyLeft">
+						 <view class="historyLeftTxt">历史查询:</view>
+						 <view class="historyLeftNum" v-if="historyvin">{{historyvin}}	</view>
+						 <view class="historyLeftNum" v-else>暂无</view>
+					 </view>
+					 <view class="historyMore" @click="gohistory">更多
+					   <image src="../../static/img/lanjt.png" mode="" class="lanjt"></image>
+					 </view>
+				 </view>
+			 </view>
+			 
+			 <view class="productBox">
+			 		<view class="productTitle">产品列表</view>
+					<view class="productLinBox">
+						<view class="productLine">
+							<image class="productImg" src="/static/img/jiyou.png" mode=""></image>
+							<view class="productTxt" >机油</view>
+						</view>
+						<view class="productLine" @click="goCarModelType(2)">
+							<image class="productImg" src="/static/img/bsxy.png" mode=""></image>
+							<view class="productTxt" >变速箱油</view>
+						</view>
+						<view class="productLine">
+							<image class="productImg" src="/static/img/bsxglq.png" mode=""></image>
+							<view class="productTxt" >变速箱滤清器</view>
+						</view>
+						<view class="productLine">
+							<image class="productImg" src="/static/img/yusha.png" mode=""></image>
+							<view class="productTxt" >雨刮</view>
+						</view>
+					</view>
+			 </view>
+			 
+			 
+		 </view>
+		 
 		
+		 
 	</view>
 </template>
 
@@ -76,15 +148,18 @@
 				iStatusBarHeight:'',
 				openId:'',
 				aaa:'',
+				duration:500,
+				interval:3000,
+				historyvin:'',
 			}
 		},
 		onLoad() {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
            var that=this;
 		   this.uniLogin()
-           setTimeout(function(){
+          /* setTimeout(function(){
            		that.$refs.carModelView.getdata();
-           },500)
+           },500) */
 		   var bb= this.iStatusBarHeight + 44 + 'px';
 		  
 		   var cc= '520rpx'
@@ -97,6 +172,16 @@
 			}
 		},
 		methods: {
+			goCarModel(){
+			   uni.navigateTo({
+			   	  url:'carModel2'
+			   })	
+			},
+			goCarModelType(type){
+				uni.navigateTo({
+					  url:'carModel2?type='+type
+				})
+			},
 			wy(){
 				
 				uni.chooseImage({
@@ -143,6 +228,15 @@
 				  },'POST').then(res => {
 				 				
 				 	this.historyList=res.data
+					this.historyList.forEach(item=>{
+						if(item.vin){
+							if(!this.historyvin){
+								this.historyvin=item.vin
+							}
+							
+						}
+					})
+					
 					var bb= this.iStatusBarHeight + 44 + 'px';
 					var cc='520rpx'
 					if(this.historyList.length==0){
@@ -314,6 +408,110 @@
 </script>
 
 <style scoped>
+.contBox{
+	padding: 0 24rpx;
+}
+.productBox{
+height: 520rpx;
+background: #FFFFFF;
+border-radius: 16rpx;
+padding: 30rpx;
+margin-top: 20rpx;
+}
+.productTitle{
+	font-weight: 500;
+	font-size: 28rpx;
+	color: #1A1A1A;
+	line-height: 40rpx;
+}
+.productLinBox{
+	display: flex;justify-content: space-between;
+}
+.productImg{
+	width: 90rpx;height: 90rpx;
+}
+.productLine{
+	text-align: center;
+	padding-top: 24rpx;
+}
+.productTxt{
+	text-align: center;
+	font-size: 26rpx;
+	color: #1A1A1A;
+}
+.vincar{
+	background: #FFFFFF;
+	border-radius: 16rpx;
+	padding: 24rpx 30rpx;
+}
+.vincarTab{
+	display: flex;
+}
+.vincarTabLine{
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 37rpx;
+}
+.anVin{
+	font-weight: 500;
+	font-size: 28rpx;
+	color: #FF4F00;
+	margin-right: 50rpx;
+	border-bottom: 4rpx solid  #FF4F00;
+}
+.inputsBox{
+	border-radius: 10rpx;
+	border: 2rpx solid #FF4F00;
+	padding: 8rpx;
+	display: flex;justify-content: space-between;
+	margin-top: 27rpx;
+}
+.inputsBtn{
+	width: 108rpx;
+	height: 58rpx;
+	background: #FF4F00;
+	border-radius: 6rpx;
+	text-align: center;
+	line-height: 58rpx;
+	font-size: 26rpx;
+	color: #FFFFFF;
+}
+.lanjt{
+	width: 8rpx;height: 15rpx;
+	margin-top: 20rpx;margin-left: 6rpx;
+}
+.historyLeft{
+	display: flex;
+	font-size: 24rpx;
+	color: #999999;
+}
+.historyLeftNum{
+	height: 50rpx;
+	background: #FAFAFA;
+	padding: 0 10rpx;line-height: 50rpx;
+}
+.historyLeftTxt{
+	line-height: 50rpx;
+}
+.historyMore{
+	line-height: 50rpx;color: #3E86F0;font-size: 24rpx;display: flex;
+}
+.historyBox{
+	display: flex;justify-content: space-between;padding-top: 24rpx;
+}
+.swpBox{
+	height: 400rpx;
+}
+.swiperTk{
+	height: 400rpx;
+}
+.swiper-itemTk{
+	padding-top: 20rpx;text-align: center;
+	overflow: hidden;height: 360rpx;
+}
+.tkHdImg{
+	width: 702rpx;height: 360rpx;
+}
 .aaaaa{
 	width: 500rpx;
 	background-color: #1A1A1A;
@@ -363,23 +561,22 @@
 	background-size: 100% 100%;
 }
 .topNavBox{
-	background: #D53533;
+	background: #FFFFFF;
 	width: 750rpx;
 	position: fixed;
 	top: 0;
 	left: 0;
 	z-index: 111;
-	background: url('http://dmsphoto.66km.com.cn/thFiles/DE1573A0-1C08-4243-8313-C0BA094406D0.png') no-repeat;
-	background-size: 100%;
+    color: #333333;
 }
 .searchInputBox{
-	width: 634rpx;display: flex;
-	height: 80rpx;
+	width: 550rpx;display: flex;
+	height: 58rpx;
 	background: #FFFFFF;
 	border-radius: 16rpx;
 }
 .simg{
-	width: 34rpx;height: 34rpx;margin-top: 23rpx;margin-left:30rpx;
+	width: 34rpx;height: 34rpx;margin-top: 13rpx;margin-left:30rpx;
 }
 .stimg{
 	width: 44rpx;height: 44rpx;
@@ -393,8 +590,8 @@
 	text-align: center;padding-left: 20rpx;padding-right: 24rpx;
 }
 .ssinput{
-	font-size: 28rpx;font-weight: 400;padding-left: 24rpx;line-height: 80rpx;height: 80rpx;
-	width: 500rpx;
+	font-size: 28rpx;font-weight: 400;padding-left: 24rpx;line-height: 58rpx;height: 58rpx;
+	width: 450rpx;
 }
 .ip{
 	color: #999999;
@@ -441,7 +638,7 @@
 		line-height: 44px;
 		text-align: center;
 		font-size: 36rpx;
-		color: #FFFFFF;
+	/* 	color: #FFFFFF; */
 	}
 	.historyLogoBox{
 		display: flex;align-items: center;

+ 101 - 0
pages/index/user.vue

@@ -0,0 +1,101 @@
+<template>
+	<view class="content">
+		<view class="top1">
+			<view class="touxiang">
+				<image class="touxiangImg" src="/static/img/touxiang.png" mode=""></image>
+				<view class="nickName">微信用户</view>
+			</view>
+		</view>
+		<view class="fuwu">
+			<view class="fuwuTitle">我的服务</view>
+			<view class="lineBox">
+				<view class="line">
+					<image src="/static/img/lscx.png" mode="" class="lineImg"></image>
+					<view class="lineTxt">历史查询</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		components: {
+		
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+		
+		},
+		onShow() {
+		
+		},
+		methods: {
+		
+			
+		},
+		onShareAppMessage(){
+				   
+		}
+	}
+</script>
+
+<style scoped>
+.content{
+	height: 100vh;
+	background: #F4F5F7;
+}
+.top1{
+	height: 300rpx;
+	background: #FF4F00;
+	border-radius: 0 0 5% 5%;
+}
+.touxiangImg{
+	width: 90rpx;height: 90rpx;
+}
+.nickName{
+	line-height: 90rpx;
+	font-size: 32rpx;
+	color: #FFFFFF;
+	padding-left: 20rpx;
+}
+.touxiang{
+	display: flex;
+	padding-left: 40rpx;
+	padding-top: 40rpx;
+}
+.fuwu{
+	width: 702rpx;
+	margin-left: 24rpx;
+	background: #FFFFFF;
+	border-radius: 16rpx;
+	margin-top: -100rpx;
+}
+.fuwuTitle{
+	font-weight: 500;
+	font-size: 28rpx;
+	color: #1A1A1A;
+	padding-top: 30rpx;padding-left: 30rpx;
+}
+.line{
+	text-align: center;
+}
+.lineImg{
+	width: 90rpx;height: 90rpx;
+}
+.lineTxt{
+	font-size: 26rpx;
+	color: #1A1A1A;
+}
+.lineBox{
+	display: flex;
+	padding-left: 55rpx;
+	padding-bottom: 30rpx;
+}
+</style>

二进制
static/img/bsxglq.png


二进制
static/img/bsxy.png


二进制
static/img/index1.png


二进制
static/img/index2.png


二进制
static/img/jiyou.png


二进制
static/img/lanjt.png


二进制
static/img/lscx.png


二进制
static/img/touxiang.png


二进制
static/img/user2.png


二进制
static/img/vin.png


二进制
static/img/yusha.png