guo vor 2 Jahren
Ursprung
Commit
3eae7885c4

+ 92 - 98
pages/mobile/OemSearch.vue

@@ -7,13 +7,12 @@
 			<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">车型下搜索</view>
 
 		</view> -->
-		<!-- 搜索 -->
-		<view class="searchBox">
-			<image src="../../static/img/icon_search.png" class="searchImg"></image>
-			<input type="text" class="searchInput" placeholder='配件名称/原厂OEM' v-model="inputValue"
-				@confirm="search" />
-			<image src="../../static/img/icon_close.png" class="searchClose" v-if="inputValue!=''"
-				@click="clear"></image>
+		<!-- 搜索 -->
+		<view class="searchBox">
+			<image src="../../static/img/icon_search.png" class="searchImg"></image>
+			<input type="text" class="searchInput" placeholder='配件名称/原厂OEM' v-model="inputValue" @confirm="search" />
+			<image src="../../static/img/icon_close.png" class="searchClose" v-if="inputValue!=''" @click="clear">
+			</image>
 		</view>
 
 
@@ -43,48 +42,49 @@
 <script>
 	export default {
 		components: {
-			
+
 		},
 
 		data() {
-			return {
+			return {
 				inputValue: '',
 				tabIndex: 0,
-				
+
 				historyList: [],
 				itemData: {},
 				itemList: [],
 				brandList: [],
 				brand: '',
-				epc_id: '',
-				vin:'',
-				token:'',
-				param:'',
-				access_time:'',
+				epc_id: '',
+				vin: '',
+				token: '',
+				param: '',
+				access_time: '',
 				page: 1,
 				total_page: 1
 			}
 		},
-		onLoad(opt) {
-			console.log('opt+',opt);
-			this.brand = opt.brand;
+		onLoad(opt) {
+			console.log('opt+', opt);
+			this.brand = opt.brand;
 			this.epc_id = opt.epc_id;
-			this.vin = opt.vin;
-			this.token = opt.token;
-			this.param = opt.param;
+			this.vin = opt.vin;
+			this.token = opt.token;
+			this.param = opt.param;
 			this.access_time = opt.access_time;
-			
+
 		},
-		methods: {
-			search(){
-				if (!this.inputValue) return;
-				 //console.log(this.inputValue);
-				this.$emit('search',this.inputValue);
-				
-			},
-			clear(){
-				this.inputValue = ''
-				this.$emit('search','');
+		methods: {
+			search() {
+				if (!this.inputValue) return;
+				//console.log(this.inputValue);
+				this.$emit('search', this.inputValue);
+				this.page = 1;
+				this.getItemData();
+			},
+			clear() {
+				this.inputValue = ''
+				this.$emit('search', '');
 			},
 			goCarModelList(partnum) {
 				uni.navigateTo({
@@ -94,17 +94,12 @@
 			tabClick(num) {
 				this.tabIndex = num;
 			},
-			search(val) {
-				// console.log(val);
-				this.inputValue = val
+			
+			goSearch(str) {
+				this.inputValue = str
 				this.page = 1;
 				this.getItemData();
 			},
-			goSearch(str){
-				this.inputValue = str
-				this.page = 1;
-				this.getItemData();
-			},
 			// 配件查询
 			getItemData() {
 				uni.showLoading({
@@ -112,11 +107,11 @@
 				});
 				this.$http('advancedEpc/findParts', {
 					epc_id: this.epc_id,
-					keyword: this.inputValue,
-					vin:this.vin,
-					token: this.token,
-					param: this.param,
-					access_time:this.access_time,
+					keyword: this.inputValue,
+					vin: this.vin,
+					token: this.token,
+					param: this.param,
+					access_time: this.access_time,
 					page: this.page,
 				}, 'GET').then(res => {
 					uni.hideLoading();
@@ -125,33 +120,32 @@
 
 					var list = res.data.result.list;
 
-					this.total_page = res.data.result.total_page;
-					if (this.page == 1) {
-						this.itemList = list;
-					}
-					else if (list.length != 0) {
-						this.itemList = this.itemList.concat(list)
+					this.total_page = res.data.result.total_page;
+					if (this.page == 1) {
+						this.itemList = list;
+					} else if (list.length != 0) {
+						this.itemList = this.itemList.concat(list)
 					}
-					if (this.itemList.length == 0) {
-						uni.showToast({
-							title: '暂无符合要求的配件',
-							icon: 'none',
-							duration: 2000
-						});
+					if (this.itemList.length == 0) {
+						uni.showToast({
+							title: '暂无符合要求的配件',
+							icon: 'none',
+							duration: 2000
+						});
 					}
-					
+
 
 				});
 			},
 
-		},
-		// 下拉刷新 上拉加载更多
-		onPullDownRefresh() {
-			// this.page = 1
-			// this.getItemData()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
+		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			// this.page = 1
+			// this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		onReachBottom() {
 			if (this.page <= this.total_page) {
@@ -166,8 +160,8 @@
 <style>
 	.box {
 		min-height: 100vh;
-		background: #FFFFFF;
-		padding-bottom: constant(safe-area-inset-bottom);
+		background: #FFFFFF;
+		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 	}
 
@@ -214,36 +208,36 @@
 		border-bottom: 1rpx solid #EEEEEE;
 	}
 
-	.searchBox {
-		height: 72rpx;
-		margin: 24rpx;
-		background-color: #F4F5F7;
-		border-radius: 36rpx;
-		display: flex;
-		position: relative;
-	}
-	
-	.searchImg {
-		margin-top: 20rpx;
-		margin-left: 20rpx;
-		width: 32rpx;
-		height: 32rpx;
-	}
-	
-	.searchInput {
-		height: 72rpx;
-		font-size: 28rpx;
-		padding-left: 16rpx;
-		width: 78%;
-	}
-	
-	.searchClose {
-		position: absolute;
-		width: 36rpx;
-		height: 36rpx;
-		right: 36rpx;
-		top: 20rpx;
-	
+	.searchBox {
+		height: 72rpx;
+		margin: 24rpx;
+		background-color: #F4F5F7;
+		border-radius: 36rpx;
+		display: flex;
+		position: relative;
+	}
+
+	.searchImg {
+		margin-top: 20rpx;
+		margin-left: 20rpx;
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.searchInput {
+		height: 72rpx;
+		font-size: 28rpx;
+		padding-left: 16rpx;
+		width: 78%;
+	}
+
+	.searchClose {
+		position: absolute;
+		width: 36rpx;
+		height: 36rpx;
+		right: 36rpx;
+		top: 20rpx;
+
 	}
 
 	.history {

+ 428 - 447
pages/mobile/SelectCarModel.vue

@@ -1,448 +1,429 @@
-<template>
-	<view class="box">
-		
-		
-			 <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['首字母']=='热门'">
-						<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>
-					</template>
-				 </view>
-	        </scroll-view >
-			
-		
-		
-	</view>
-</template>
-
-	
-<script>
-
-export default {
-	 components: {  
-	       
-	 },
-	data() {
-		return {
-			carList:'',
-			carModelList:'',
-			toView:'',
-			type:'right',
-			brand:'',
-			carSeriesList:'',
-			selectedCarBrand:'',
-			manufactor:'',
-			carSeries:'',
-			displacementList:'',
-			displacementListShow:false,
-			selectedCarSeries:'',
-			displacement:'',
-			carGroupList:'',
-			carGroupListShow:false,
-			type:'',
-			delId:'',
-			
-		}
-	},
-	onLoad(opt) {
-	  this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-	  if(opt.type==2){
-		  this.type=2
-	  }
-	  if(opt.add){
-		  this.addNum=opt.add
-	  }
-	  this.delId=opt.delId;
-      // this.queryCarModelGroupPackage();
-	},
-	methods: {
-		
-		
-		selectBrand(item){
-			console.log(item)
-			this.selectedCarBrand=item;
-			this.$refs.popup.open("right")
-			this.popupShow=true;
-			this.brand=item.brand
-			this.getbrand()
-		},
-		selectCarFactory(manufactor,item){
-			this.manufactor=manufactor;
-			this.carSeries=item;
-			//this.selectedCarSeries=item
-			this.displacementListShow=true;
-			this.getdisplacementList()
-		},
-		selectDisplacement(item){
-			this.displacement=item;
-			this.carGroupListShow=true;
-			this.getmodelList();
-		},
-		getmodelList(){
-			uni.showLoading({
-				title: '加载中'
-			})
-			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
-			  brand:this.brand,
-			  manufactor:this.manufactor,
-			  carSeries:this.carSeries,
-			  displacement:this.displacement
-			 },'GET').then(res => {
-				uni.hideLoading();
-				this.carGroupList=res.data.carGroupList
-			})
-		},
-		getdisplacementList(){
-			uni.showLoading({
-				title: '加载中'
-			})
-			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
-			  brand:this.brand,
-			  manufactor:this.manufactor,
-			  carSeries:this.carSeries
-			 },'GET').then(res => {
-				uni.hideLoading();
-				this.displacementList=res.data.displacementList
-			})
-		},
-		queryCarModelGroupPackage(){
-			uni.showLoading({
-				title: '加载中'
-			})
-			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
-			  
-			 },'GET').then(res => {
-				uni.hideLoading();
-				this.carModelList=res.data.brands
-			})
-		},
-		bindToView(item){
-			console.log(item)
-			if(item['首字母']=='热门'){
-					this.toView ='rm'
-			}else{
-					this.toView = item['首字母']
-			}
-		
-			console.log(this.toView)
-			//this.scrollTop = 0
-		
-		},
-       /* login(){
-			uni.navigateTo({
-				url:'../login/login'
-			})
-		} */
-		close(){
-			this.$refs.popup.close()
-		},
-		getbrand(){
-			uni.showLoading({
-				title: '加载中'
-			})
-			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
-			  brand:this.brand
-			 },'GET').then(res => {
-				uni.hideLoading();
-				this.carSeriesList=res.data.carSeriesList
-			})
-		}
-	}
-}
-</script>
-
-<style scoped lang="scss">
-	.box{
-		min-height: 100vh;
-		background:#F4F5F7;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-	}
-	
-	.baiheibackImg{
-		width: 70rpx;
-		height: 44rpx;
-	}
-	.gaunbiIMg{
-		width: 20px;
-		height: 20px;
-		padding: 12px;
-	}
-	
-	.sltpImg{
-		width: 704rpx;
-		height: 353rpx;
-	}
-	
-	.sltp{
-		padding-top: 20rpx;
-	}
-	
-	.nodataImg{
-	  width: 400rpx;
-	  padding-top: 100rpx;
-	}
-	.noTxt{
-		font-size: 36rpx;
-		color: #999999;
-		padding-top: 50rpx;
-	}
-	.nodataBox{
-		text-align: center;
-	}
-	.addBtn{
-		width: 690rpx;
-		height: 74rpx;
-		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
-		border-radius: 37rpx;
-		line-height: 74rpx;
-		text-align: center;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		position: fixed;
-		bottom: 23rpx;
-		left: 30rpx;
-	}
-	.carlistBox{
-		padding-bottom: 120rpx;
-	}
-	.tab{
-		background: #FFFFFF;
-		display: flex;
-		justify-content: space-around;
-		line-height: 93rpx;
-		color: #3C3C3C;
-		font-size: 30rpx;
-		border-bottom: 1px solid #F4F5F7;
-	}
-	.activeTab{
-		color: #FF4F00;text-decoration: underline
-	}
-	/* .brand-select-title{
-		height: 80px;
-		background:rgba(247,247,247,1);
-		position: relative;
-	} */
-	.brand-select{
-	  .brand-select-title{
-	    height: 80rpx;
-	    background:rgba(247,247,247,1);
-	    position: relative;
-	    h5{
-	      position: absolute;
-	      height:40rpx;
-	      font-size:28rpx;
-	      font-weight:500;
-	      color:rgba(102,102,102,1);
-	      line-height:40rpx;
-	      top: 20rpx;
-	      left: 30rpx;
-	    }
-	  }
-	  .brand-select-wrapper{
-	    display: flex;
-	    flex-wrap: wrap;
-	    background:rgba(255,255,255,1);
-		width: 100vw;
-	    .brand-select-item{
-	      display: block;
-	      width: 80rpx;
-	      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:24rpx;
-	        font-weight:400;
-	        color:rgba(51,51,51,1);
-	        line-height:33rpx;
-	      }
-	    }
-	
-	  }
-	}
-	.fast-navigation{
-	  position: fixed;
-	  text-align: center;
-	  right: 16rpx;
-	  top: 360rpx;
-	  width: 23rpx;
-	  font-size:24rpx;
-	  font-weight:500;
-	  line-height:35rpx;
-	  color: rgb(153, 153, 153);
-	  a{
-	    display: block;
-	  }
-	  .select{
-	    color: #FF4F00;
-	  }
-	}
-	.scroll-view{
-		height: calc(100vh - 93rpx);
-	}
-	.popup-height {
-	
-		width: 200px;
-	}
-	.popup-content{
-		width: 590rpx;
-		background: #FFFFFF;
-		height: 100vh;
-	}
-	.carModel-nav-title{
-	  height:100rpx;
-	  background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
-	  line-height: 100rpx;
-	  display: flex;
-	  z-index: 500;
-	  &.cell-logo{
-	    position: sticky;
-	    top: 0;
-	   background: linear-gradient(134deg, #FF8635 0%, #FF4828 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;
-	  }
-	}
-	.cell-item-title{
-	  height:60rpx;
-	  background:rgba(250,250,250,1);
-	  font-size:28rpx;
-	  font-weight:400;
-	  color:rgba(102,102,102,1);
-	  line-height:60rpx;
-	  padding-left: 26rpx;
-	}
-	.span-cell{
-	  position: relative;
-	  display: -webkit-box;
-	  display: -webkit-flex;
-	  display: flex;
-	  box-sizing: border-box;
-	  width: 100%;
-	  padding: 6rpx 30rpx;
-	  overflow: hidden;
-	  color: #323233;
-	  font-size: 3.73333vw;
-	  line-height: 82rpx;
-	  height: 82rpx;
-	  background-color: #fff;
-	  border-bottom: 1px solid #ebedf0;
-	
-	}
-	.carModel-nav-title{
-	  height:100rpx;
-	 background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
-	 line-height: 100rpx;
-	  display: flex;
-	  z-index: 500;
-	  &.cell-logo{
-	    position: sticky;
-	    top: 0;
-	    background: linear-gradient(134deg, #FF8635 0%, #FF4828 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;
-	  }
-	}
-	.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);
-	}
-	.displacementListBox{
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100vw;
-		height: 100vh;
-		background:#F4F5F7 ;
-		z-index: 11111;
-		/*  #ifdef H5 */
-		top:44px;
-		/*  #endif  */
-	}
-	.carGroupListBox{
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100vw;
-		height: 100vh;
-		background:#F4F5F7 ;
-		z-index: 11111;
-		/*  #ifdef H5 */
-		top:44px;
-		/*  #endif  */
-	}
-	.brandList{
-		height: calc(100vh - 250rpx);
-	}
-	.brand-select-titleselect{
-		    color: #FF4F00 !important;
-	}
+<template>
+	<view class="box">
+
+
+		<scroll-view class="scroll-view" :scroll-into-view="toView" scroll-y="true">
+			<view class="brand-select">
+				<template v-for="item in brandList">
+					<view :id="item.titleStr">
+						<view class="brand-select-title" :id="item.titleStr">
+							<h5 :class="{'brand-select-titleselect':item.titleStr==toView}">{{item.titleStr}}</h5>
+						</view>
+
+						<view class="brand-select-wrapper">
+							<a class="brand-select-item" v-for="item2 in item.list" @click="selectBrand(item2)"
+								:id="item2.brand">
+								<img :src="item2.icon" class="brand-select-item-icon">
+								<span>{{item2.brand||item2.name}}</span>
+							</a>
+						</view>
+
+					</view>
+					
+				</template>
+			</view>
+		</scroll-view>
+		<div class="fast-navigation">
+		  <a class="fast-navigation-sel" :class="{'select':item.titleStr==toView}" v-for="item in brandList" @tap="bindToView(item)">{{item.titleStr}}</a>
+		</div>
+
+
+	</view>
+</template>
+
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				brandList: [],
+				toView: '',
+				
+				
+
+			}
+		},
+		onLoad(opt) {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			this.getItemData();
+		},
+		methods: {
+			//获取品牌
+			getItemData() {
+				let that = this
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('advancedEpc/getBrands', {
+					// epc_id: this.epc_id,
+					// token: this.token,
+					// param: this.param,
+					// access_time: this.access_time,
+					// page: this.page
+				}, 'GET').then(res => {
+					uni.hideLoading();
+
+					var list = res.data.result.list;
+					var sectionTitle = [];
+					var brandList = [];
+					list.forEach(item => {
+						if (item) {
+							sectionTitle.push(item.first_letter);
+						}
+					})
+					sectionTitle.sort();
+					sectionTitle = Array.from(new Set(sectionTitle))
+					
+					sectionTitle.forEach(title => {
+						var arr = [];
+						list.forEach(item => {
+							if (item.first_letter == title) {
+								arr.push(item);
+							}
+						})
+						var dic = {
+							titleStr: title,
+							list: arr
+						};
+						brandList.push(dic);
+					})
+
+					that.brandList = brandList;
+					console.log('list==', brandList);
+
+				});
+			},
+			selectBrand(item) {
+				console.log(item)
+				
+				uni.navigateTo({
+					url:'SelectCarTwo?epc_id=' + item.epc_id + '&title=' + item.brand
+				})
+				
+			},
+
+			bindToView(item) {
+				console.log(item)
+				
+				this.toView = item.titleStr
+				
+				console.log(this.toView)
+				//this.scrollTop = 0
+
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.baiheibackImg {
+		width: 70rpx;
+		height: 44rpx;
+	}
+
+	.gaunbiIMg {
+		width: 20px;
+		height: 20px;
+		padding: 12px;
+	}
+
+	.sltpImg {
+		width: 704rpx;
+		height: 353rpx;
+	}
+
+	.sltp {
+		padding-top: 20rpx;
+	}
+
+	.nodataImg {
+		width: 400rpx;
+		padding-top: 100rpx;
+	}
+
+	.noTxt {
+		font-size: 36rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
+
+	.nodataBox {
+		text-align: center;
+	}
+
+	.addBtn {
+		width: 690rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		line-height: 74rpx;
+		text-align: center;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		position: fixed;
+		bottom: 23rpx;
+		left: 30rpx;
+	}
+
+	.carlistBox {
+		padding-bottom: 120rpx;
+	}
+
+	.tab {
+		background: #FFFFFF;
+		display: flex;
+		justify-content: space-around;
+		line-height: 93rpx;
+		color: #3C3C3C;
+		font-size: 30rpx;
+		border-bottom: 1px solid #F4F5F7;
+	}
+
+	.activeTab {
+		color: #FF4F00;
+		text-decoration: underline
+	}
+
+	/* .brand-select-title{
+		height: 80px;
+		background:rgba(247,247,247,1);
+		position: relative;
+	} */
+	.brand-select {
+		.brand-select-title {
+			height: 80rpx;
+			background: rgba(247, 247, 247, 1);
+			position: relative;
+
+			h5 {
+				position: absolute;
+				height: 40rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: rgba(102, 102, 102, 1);
+				line-height: 40rpx;
+				top: 20rpx;
+				left: 30rpx;
+			}
+		}
+
+		.brand-select-wrapper {
+			display: flex;
+			flex-wrap: wrap;
+			background: rgba(255, 255, 255, 1);
+			width: 100vw;
+
+			.brand-select-item {
+				display: block;
+				width: 80rpx;
+				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: 24rpx;
+					font-weight: 400;
+					color: rgba(51, 51, 51, 1);
+					line-height: 33rpx;
+				}
+			}
+
+		}
+	}
+
+	.fast-navigation {
+		position: fixed;
+		text-align: center;
+		right: 16rpx;
+		top: 360rpx;
+		width: 23rpx;
+		font-size: 24rpx;
+		font-weight: 500;
+		line-height: 35rpx;
+		color: rgb(153, 153, 153);
+
+		a {
+			display: block;
+		}
+
+		.select {
+			color: #FF4F00;
+		}
+	}
+
+	.scroll-view {
+		height: calc(100vh - 93rpx);
+	}
+
+	.popup-height {
+
+		width: 200px;
+	}
+
+	.popup-content {
+		width: 590rpx;
+		background: #FFFFFF;
+		height: 100vh;
+	}
+
+	.carModel-nav-title {
+		height: 100rpx;
+		background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
+		line-height: 100rpx;
+		display: flex;
+		z-index: 500;
+
+		&.cell-logo {
+			position: sticky;
+			top: 0;
+			background: linear-gradient(134deg, #FF8635 0%, #FF4828 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;
+		}
+	}
+
+	.cell-item-title {
+		height: 60rpx;
+		background: rgba(250, 250, 250, 1);
+		font-size: 28rpx;
+		font-weight: 400;
+		color: rgba(102, 102, 102, 1);
+		line-height: 60rpx;
+		padding-left: 26rpx;
+	}
+
+	.span-cell {
+		position: relative;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		box-sizing: border-box;
+		width: 100%;
+		padding: 6rpx 30rpx;
+		overflow: hidden;
+		color: #323233;
+		font-size: 3.73333vw;
+		line-height: 82rpx;
+		height: 82rpx;
+		background-color: #fff;
+		border-bottom: 1px solid #ebedf0;
+
+	}
+
+	.carModel-nav-title {
+		height: 100rpx;
+		background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
+		line-height: 100rpx;
+		display: flex;
+		z-index: 500;
+
+		&.cell-logo {
+			position: sticky;
+			top: 0;
+			background: linear-gradient(134deg, #FF8635 0%, #FF4828 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;
+		}
+	}
+
+	.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);
+	}
+
+	.displacementListBox {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		background: #F4F5F7;
+		z-index: 11111;
+		/*  #ifdef H5 */
+		top: 44px;
+		/*  #endif  */
+	}
+
+	.carGroupListBox {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		background: #F4F5F7;
+		z-index: 11111;
+		/*  #ifdef H5 */
+		top: 44px;
+		/*  #endif  */
+	}
+
+	.brandList {
+		height: calc(100vh - 250rpx);
+	}
+
+	.brand-select-titleselect {
+		color: #FF4F00 !important;
+	}
 </style>

+ 20 - 19
pages/mobile/SelectCarTwo.vue

@@ -1,26 +1,24 @@
 <template>
 	<view class="box">
-		<!-- 自定义导航 -->
-		<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.png" mode="aspectFit" class="backImg" @click="goback">
-					</image>
-
-				</view>
-				<view class="zdyNavTitle">{{title}}</view>
-				<view class="zdyNavRight" @click="goOemSearch">OEM搜索</view>
-				
-			</view>
+		<!-- 自定义导航 -->
+		<view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<div @click="goback" class="uni-page-head-btn"><i class="uni-btn-icon" style="color: rgb(0, 0, 0); font-size: 27px;"></i></div>
+				
+				<view class="zdyNavTitle">{{title}}</view>
+				<view class="zdyNavRight" @click="goOemSearch">OEM搜索</view>
+				
+			</view>
 		</view>
+		
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 44px;"></view>
 
 		<!-- 搜索 -->
-		<view class="searchBoxBg">
+		<!-- <view class="searchBoxBg">
 			<searchBox placeholder="搜索车型" @search='search($event)'></searchBox>
-		</view>
+		</view> -->
 		
 		<view class="cangBox" v-for="(item,index) in cangList" :key="index">
 			<view class="cangTitle">一汽大众</view>
@@ -41,17 +39,20 @@
 			searchBox
 		},
 		data() {
-			return {
-				title: '大众',
+			return {
+				epc_id: '',
+				title: '',
 				iStatusBarHeight: '',
 				searchValue: '',
 				cangList: [1, 2],
 				xingList: [1, 2, 3, 4, 5],
 			}
 		},
-		onLoad() {
+		onLoad(opt) {
+			console.log('opt',opt);
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-
+			this.epc_id = opt.epc_id;
+			this.title = opt.title;
 		},
 		methods: {
 			search(val) {

+ 43 - 68
pages/mobile/group.vue

@@ -1,19 +1,17 @@
 <template>
 	<view class="content">
 
-		<!-- 自定义导航 -->
-		<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.png" mode="aspectFit" class="backImg" @click="goback">
-					</image>
-
-				</view>
-				<view class="zdyNavTitle">车型件</view>
-				<view v-if="param.length != 0" class="zdyNavRight" @click="goOemSearch()">OEM搜索</view>
-				<view v-else style="width: 120rpx;"></view>
-			</view>
+		<!-- 自定义导航 -->
+		<view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<div @click="goback" class="uni-page-head-btn"><i class="uni-btn-icon" style="color: rgb(0, 0, 0); font-size: 27px; width: 120rpx;"></i></div>
+				
+				<view class="zdyNavTitle">车型件</view>
+				<view v-if="param.length != 0" class="zdyNavRight" @click="goOemSearch()">OEM搜索</view>
+				<view v-else style="width: 120rpx;"></view>
+				
+			</view>
 		</view>
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 44px;"></view>
@@ -252,62 +250,39 @@
 		padding-bottom: env(safe-area-inset-bottom);
 	}
 
-	.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;
-		padding: 0 24rpx;
-	}
-
-	.backImg {
-		width: 22rpx;
-		height: 40rpx;
-	
-	}
-
-	.homeImg {
-		width: 44rpx;
-		height: 44rpx;
-
-	}
-
-	.zdyNavLeft {
-		display: flex;
+	.zdyNavBox {
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999999;
+	
+	}
+	
+	.zdyNav {
+		display: flex;
+		justify-content: space-between;
 		align-items: center;
-		width: 120rpx;
-	}
-
-	.zdyNavTitle {
-
-		height: 44px;
-		background: #FFFFFF;
-		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
-	}
-
-	.zdyNavRight {
-		height: 44px;
-		background: #FFFFFF;
-		text-align: center;
-		font-size: 28rpx;
-		line-height: 44px;
-		color: #3F90F7;
-		width: 120rpx;
-	}
+		padding: 14rpx 6rpx;
+	}
+	
+	
+	.zdyNavTitle {
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+	
+	.zdyNavRight {
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 28rpx;
+		color: #3F90F7;
+		width: 120rpx;
+	}
+	
 
 
 

+ 36 - 37
pages/mobile/homePage.vue

@@ -3,12 +3,9 @@
 		<!-- 自定义导航 -->
 		<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.png" mode="aspectFit" class="backImg" @click="goback">
-					</image>
-
-				</view>
+			<view class="zdyNav">
+				<div @click="goback" class="uni-page-head-btn"><i class="uni-btn-icon" style="color: rgb(0, 0, 0); font-size: 27px;"></i></div>
+				
 				<view class="zdyNavTitle">车型件</view>
 				<view class="zdyNavRight"></view>
 				
@@ -31,7 +28,10 @@
 				
 			</swiper>
 			
-			<image @click="goIndex()" class="searchBtn" src="../../static/img/button_search.png" mode=""></image>
+			<view class="btnBox">
+				<image @click="goIndex()" class="searchBtn" src="../../static/img/button_search.png" mode=""></image>
+				<!-- <view @click="goSelectCarModel()" class="brand">选择品牌</view> -->
+			</view>
 			
 			<image class="title" src="../../static/img/text_zhongjian.png" mode=""></image>
 			
@@ -73,6 +73,11 @@
 				uni.navigateTo({
 					url: 'index'
 				})
+			},
+			goSelectCarModel(){
+				uni.navigateTo({
+					url: 'SelectCarModel'
+				})
 			},
 			
 			goback() {
@@ -113,53 +118,29 @@
 		left: 0;
 		z-index: 9999999;
 
-
 	}
 
 	.zdyNav {
-		height: 44px;
 		display: flex;
 		justify-content: space-between;
-
 		align-items: center;
-		padding: 0 24rpx;
-	}
-
-	.backImg {
-		width: 22rpx;
-		height: 40rpx;
-		
-	}
-
-	.homeImg {
-		width: 44rpx;
-		height: 44rpx;
-
-	}
-
-	.zdyNavLeft {
-		display: flex;
-		align-items: center;
-		width: 44rpx;
+		padding: 14rpx 6rpx;
 	}
 
+	
 	.zdyNavTitle {
-
-		height: 44px;
 		background: #FFFFFF;
 		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
+		font-size: 32rpx;
+		font-weight: bold;
 	}
 
 	.zdyNavRight {
-		height: 44px;
 		background: #FFFFFF;
 		text-align: center;
 		font-size: 28rpx;
-		line-height: 44px;
 		color: #3F90F7;
-		width: 44rpx;
+		width: 54rpx;
 	}
 
 	
@@ -177,11 +158,29 @@
 		height: 390rpx;
 		
 	}
+	.btnBox{
+		padding: 30rpx 24rpx;
+		width: 100%;
+		height: 92rpx;
+		position: relative;
+	}
 	.searchBtn{
-		padding: 30rpx 24rpx 0;
 		width: calc(100vw - 48rpx);
 		height: 92rpx;
 	}
+	.brand{
+		color: #FFFFFF;
+		font-size: 28rpx;
+		width: 160rpx;
+		height: 76rpx;
+		line-height: 76rpx;
+		background: #F4F5F7 linear-gradient(110deg, #48B9F9 0%, #3F90F7 100%);
+		border-radius: 51rpx;
+		text-align: center;
+		position: absolute;
+		top: 38rpx;
+		right: 80rpx;
+	}
 	.centerBox{
 		margin-top: 140rpx;
 		margin-bottom: 100rpx;

+ 10 - 34
pages/mobile/modelTwo.vue

@@ -4,13 +4,12 @@
 		<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.png" mode="aspectFit" class="backImg" @click="goback">
-					</image>
-		
-				</view>
+				<div @click="goback" class="uni-page-head-btn"><i class="uni-btn-icon" style="color: rgb(0, 0, 0); font-size: 27px; width: 120rpx;"></i></div>
+				
 				<view class="zdyNavTitle">车型件</view>
-				<view class="zdyNavRight" @click="goOemSearch()">OEM搜索</view>
+				<view v-if="param.length != 0" class="zdyNavRight" @click="goOemSearch()">OEM搜索</view>
+				<view v-else style="width: 120rpx;"></view>
+				
 			</view>
 		</view>
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
@@ -353,50 +352,27 @@
 		left: 0;
 		z-index: 9999999;
 	
-	
 	}
 	
 	.zdyNav {
-		height: 44px;
 		display: flex;
 		justify-content: space-between;
-	
 		align-items: center;
-		padding: 0 24rpx;
-	}
-	
-	.backImg {
-		width: 22rpx;
-		height: 40rpx;
-		
+		padding: 14rpx 6rpx;
 	}
 	
-	.homeImg {
-		width: 44rpx;
-		height: 44rpx;
-	
-	}
-	
-	.zdyNavLeft {
-		display: flex;
-		align-items: center;
-		width: 120rpx;
-	}
 	
 	.zdyNavTitle {
-	
-		height: 44px;
 		background: #FFFFFF;
 		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
+		font-size: 32rpx;
+		font-weight: bold;
 	}
-	.zdyNavRight{
-		height: 44px;
+	
+	.zdyNavRight {
 		background: #FFFFFF;
 		text-align: center;
 		font-size: 28rpx;
-		line-height: 44px;
 		color: #3F90F7;
 		width: 120rpx;
 	}