样式修改

pages.json

@@ -3,9 +3,9 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "配件查询",
-				"enablePullDownRefresh": true
-				//"navigationStyle": "custom"
+				//"navigationBarTitleText": "配件查询",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
 			}
 		},
 		{

pages/goods/goods.vue

@@ -3,7 +3,7 @@
 		<view class="carSs">
 			<view class="carssBox" >
 				<img src="../../static/img/icon_search.png" alt="" class="carSsImg">
-				<input type="text" placeholder="请输入商品名称" class="carssInput" v-model="goodsName" @confirm="getgoodsList">
+				<input type="text" placeholder="名称、规格、出厂编码、车型、品牌" class="carssInput" v-model="goodsName" @confirm="getgoodsList">
 			</view>
 			
 		</view>

pages/index/applyCx.vue

@@ -106,7 +106,7 @@
 		color: #666666;
 		line-height: 40rpx;
 		font-size: 28rpx;
-		padding: 15rpx 24rpx;
+		padding: 5rpx 24rpx;
 	}
 	.lie{
 		padding: 15rpx 0;

pages/index/carModel.vue

@@ -6,7 +6,7 @@
 				<input type="text" placeholder="请输入车型品牌或车系名称" class="carssInput" @input="carNameInput" v-model="carName" @confirm="getcarsslist"> 
 			</view>
 		</view>
-		<view style="height: 120rpx;"></view>
+		<view style="height: 220rpx;"></view>
 		
 		<view class="tab1 ">
 			 <scroll-view  class="scroll-view" :scroll-into-view="toView" scroll-y="true" >
@@ -51,8 +51,8 @@
 			<view class="popup-content" >
 				<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 				<view style="height: 44px;"></view>
-				<view style="height: 128rpx;"></view>
-				<h3 class="carModel-nav-title cell-logo">
+				<view style="height: 122rpx;"></view>
+				<h3 class="carModel-nav-title " style="padding-top: 4rpx;">
 					<view class="carModel-nav-title—left">
 						<img :src="selectedCarBrand.logo" class="carModel-nav-title-img">
 						<span class="carModel-nav-title-msg">{{ selectedCarBrand.brand }}</span>
@@ -80,7 +80,7 @@
 			<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">{{ selectedCarBrand.brand }} {{ carSeries }}</span>
+					<span class="carModel-nav-title-msg carModel-nav-title-msg1">{{ selectedCarBrand.brand }} {{ carSeries }}</span>
 				</view>
 			    <view class="carBack" @click="carBack(1)">上一步</view>
 			  
@@ -101,7 +101,7 @@
 			<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">{{ selectedCarBrand.brand }} {{ carSeries }}{{displacement}}</span>
+					<span class="carModel-nav-title-msg carModel-nav-title-msg1">{{ selectedCarBrand.brand }} {{ carSeries }}{{displacement}}</span>
 				</view>
 				<view class="carBack" @click="carBack(2)">上一步</view>
 			</h3>
@@ -159,7 +159,7 @@
 				<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>
+						<span class="carModel-nav-title-msg " style="padding-left: 24rpx;">{{ssname2}}</span>
 					</view>
 					<view class="carBack" @click="ssdisplacementListShow=false">上一步</view>
 				</h3>
@@ -251,26 +251,52 @@
 					  type:item.type,
 					  manufactor:item.manufactor,
 				  }
-			  }else{
+				  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
 			 
-			  this.$http('matchingByOpen/queryCarModelGroupIiPackageSecond', params, 'POST').then(res => {
-			  	this.secondlist=res.data;
-				this.secondShow=true;
-			  	  uni.hideLoading();
-			  })
+			  
 		  },
 		  seconditem(item){
-			  this.ssdisplacementList=item.displacementList;
-			  this.ssdisplacementListShow=true;
-			  this.ssname2=item.title
+			  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;
 		  },
@@ -397,7 +423,8 @@
 		position: fixed;
 		z-index: 999;
 		left: 0;
-		top: calc(44px + 96rpx);
+		top:90rpx;
+		/* top: calc(44px + 96rpx); */
 	}
 	.carssBox{
 		width: 702rpx;
@@ -475,12 +502,13 @@
 	  right: 16rpx;
 	  top: 360rpx;
 	  width: 23rpx;
-	  font-size:30rpx;
+	  font-size:26rpx;
 	  font-weight:500;
 	  line-height:35rpx;
 	  color: rgb(153, 153, 153);
 	  a{
 	    display: block;
+		padding-top: 5rpx;
 	  }
 	  .select{
 	    color: #FF4F00;
@@ -489,12 +517,15 @@
 	.scroll-view{
 		height: calc(100vh - 120rpx);
 	}
+	.brand-select{
+		padding-bottom: 100rpx;
+	}
 	.popup-height {
 	
 		width: 200px;
 	}
 	.popup-content{
-		width: 590rpx;
+		width: 80vw;
 		background: #FFFFFF;
 		height: 100vh;
 	}
@@ -524,6 +555,13 @@
 	    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{
@@ -616,7 +654,7 @@
 		background:#F4F5F7 ;
 		z-index: 11111;
 		/*  #ifdef H5 */
-		top:calc(44px + 220rpx);
+		top:calc(210rpx);
 		/*  #endif  */
 	}
 	.carGroupListBox{
@@ -627,8 +665,9 @@
 		height: 100vh;
 		background:#F4F5F7 ;
 		z-index: 11111;
+		top: 210rpx;
 		/*  #ifdef H5 */
-		top:calc(44px + 220rpx);
+	/* 	top:calc(44px + 220rpx); */
 		/*  #endif  */
 	}
 	.carssListBox{
@@ -640,7 +679,7 @@
 		background: rgba(0,0,0,0.5) ;
 		z-index: 11111;
 		/*  #ifdef H5 */
-		top:calc(44px + 210rpx);
+		top:calc( 210rpx);
 		/*  #endif  */
 	}
 	.carssListBoxCont{
@@ -652,9 +691,9 @@
 		left: 0;
 		width: 100vw;
 		height: 100vh;
-		background: rgba(0,0,0,0.5) ;
+		background: rgba(0,0,0,0) ;
 		z-index: 11112;
-		top:calc(44px + 210rpx);
+		top:calc(210rpx);
 		
 	}
 	.brand-select-titleselect{

pages/index/index.vue

@@ -5,16 +5,17 @@
 			<view class="indexTabline" :class="{active:tabIndex==2}" @click="tabClick(2)">VIN查询</view>
 			<view class="indexTabline" :class="{active:tabIndex==3}" @click="tabClick(3)">商品</view>
 		</view>
-		<view class="kogjian"></view>
+	<!-- 	<view class="kogjian"></view> -->
 		<carModel ref="carModelView" v-if="tabIndex==1"></carModel>
 		<vinquery ref="vinView" v-if="tabIndex==2"></vinquery>
 		<!-- <goods ref="goodsView" v-if="tabIndex==3"></goods> -->
 		<view class="goodsBox" v-if="tabIndex==3">
+			<view style="height: 90rpx;"></view>
 			<view class="goodscontent">
-				<view class="carSs">
+				<view class="carSs goodsSs">
 					<view class="carssBox" >
 						<img src="../../static/img/icon_search.png" alt="" class="carSsImg">
-						<input type="text" placeholder="请输入商品名称" class="carssInput" v-model="goodsName" @confirm="getgoodsList">
+						<input type="text" placeholder="名称、规格、出厂编码、OE、品牌" class="carssInput" v-model="goodsName" @confirm="getgoodsList">
 					</view>
 					
 				</view>
@@ -81,6 +82,11 @@
 		  }) */
 		},
 		methods: {
+			godetail(item){
+				  uni.navigateTo({
+					url:'datail?id='+item.id
+				  })
+		  },
           tabClick(index){
 			  
 			  this.tabIndex=index;
@@ -112,20 +118,30 @@
 		},
 		onReachBottom(){
 			console.log("上拉");
-			uni.showLoading({ title: '加载中'});
-			this.loading=true;
-			this.page++
-			this.$http('partsByOpen/queryPartsList', {
-				name:this.goodsName,
-				page:this.page,
-				limit:10,
-			}, 'POST').then(res => {
-				var list=res.data
-				this.list=this.list.concat(list);
-				this.loading=false;
-				uni.hideLoading();
-			}) 
-		}
+			if(this.goodsName){
+				uni.showLoading({ title: '加载中'});
+				this.loading=true;
+				this.page++
+				this.$http('partsByOpen/queryPartsList', {
+					name:this.goodsName,
+					page:this.page,
+					limit:10,
+				}, 'POST').then(res => {
+					var list=res.data
+					this.list=this.list.concat(list);
+					this.loading=false;
+					uni.hideLoading();
+				}) 
+			}
+			
+		},
+		onPullDownRefresh() {
+			this.page = 1;
+			this.getgoodsList()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 500);
+		},
 		
 	}
 </script>
@@ -135,6 +151,7 @@
 		min-height: 100vh;
 		background: #F4F5F7;
 	}
+	
 	.indexTab{
 		display: flex;
 		justify-content: space-around;
@@ -145,12 +162,18 @@
 		font-size: 30rpx;
 		width: 100%;
 		position: fixed;
-		top: 44px;
+		top: 0px;
 		left: 0;
 		z-index: 9999;
 	}
+	.indexTabline{
+		font-size: 32rpx;
+		width: 130rpx;
+		text-align: center;
+	}
 	.active{
 		border-bottom: 4rpx solid #3F90F7;
+		color: #3F90F7;
 	}
 	.kogjian{
 		height: 96rpx;
@@ -193,6 +216,8 @@
 	.listBox{
 		padding: 0 24rpx;
 		background: #FFFFFF;
+		padding-top: 120rpx;
+		width: 702rpx;
 	}
 	.lineIMg{
 		width: 110rpx;
@@ -215,6 +240,10 @@
 	}
 	.linemodelRemark{
 		color: #999999;font-size: 24rpx;padding-top: 10rpx;
+		overflow: hidden; 
+	   text-overflow: ellipsis; 
+		white-space: nowrap; 
+		width: 550rpx;
 	}
 	
 	.nodataImg{
@@ -230,4 +259,10 @@
 		font-size: 28rpx;
 		padding-top: 12rpx;
 	}
+	.goodsSs{
+		position: fixed !important;
+		width: 100vw;
+		top: 90rpx;
+		left: 0;
+	}
 </style>

pages/index/list.vue

@@ -116,7 +116,7 @@
 		background: #F4F5F7;
 	}
 	.carContTop{
-		width: 750rpx;
+		width: 690rpx;
 		padding: 30rpx 24rpx;
 		background: #FFFFFF;
 		display: flex;
@@ -141,6 +141,9 @@
 		-webkit-box-orient: vertical;	
 		height: 72rpx;
 		padding-left: 24rpx;
+		display: flex;
+		 justify-content: center;
+		        flex-direction: column;
 	}
 	.listtab{
 		background: #FFFFFF;
@@ -183,6 +186,10 @@
 	}
 	.linemodelRemark{
 		color: #999999;font-size: 24rpx;padding-top: 10rpx;
+		overflow: hidden;
+		text-overflow: ellipsis; 
+		white-space: nowrap; 
+		width: 550rpx;
 	}
 	.nodataImg{
 		width: 452rpx;
@@ -205,6 +212,7 @@
 		font-size: 20rpx;
 		line-height: 30rpx;
 		text-align: center;
+		border-radius: 5rpx;
 	
 	}
 	.vin{

pages/vin/vinquery.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="vinbox">
+		<view style="height: 90rpx;"></view>
 		<view class="carSs">
 			<view class="carssBox" @click="vinLog">
 				<img src="../../static/img/icon_search.png" alt="" class="carSsImg">
@@ -27,8 +28,8 @@
 		<view class="moreVinBox" v-if="moreVinShow" @click.stop="moreVinShow=false">
 			<view class="moreVin">
 				<view class="moreVinTop">选择车型</view>
-				<view class="moreVinline" v-for="(item,index) in moreVinList">
-					<view class="moreVinlineTxt" @click="golist(item)">{{item.title}}</view> 
+				<view class="moreVinline" v-for="(item,index) in moreVinList"  @click.stop="golist(item)">
+					<view class="moreVinlineTxt">{{item.title}}</view> 
 					<img src="../../static/img/icon_jiantou@2x.png" alt="" class="moreVinJt">
 				</view>
 			</view>
@@ -145,7 +146,7 @@
 					   this.vinLogShow = false;
 					   var item=res.data[0]
 					   uni.navigateTo({
-					   	url:'list?name='+item.value+'&nLevelID='+item.carModelInfo.nLevelID+'&id='+item.ids
+					   	url:'list?name='+item.value+'&nLevelID='+item.carModelInfo.nLevelID+'&id='+item.ids+'&vin='+this.vinNum
 					   })
 					}else{
 						this.moreVinList=res.data;
@@ -303,7 +304,8 @@
 		width: 600rpx;
 		margin-left: 75rpx;
 		margin-top: 40vh;
-		border-radius: 20rpx 20rpx 0 0;
+		border-radius: 20rpx;
+		overflow: hidden;
 	}
 	.moreVinline{
 		display: flex;

uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -126,7 +126,7 @@
 			showPopup(show) {
 				// #ifdef H5
 				// fix by mehaotian 处理 h5 滚动穿透的问题
-				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				//document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
 				// #endif
 			}
 		},
@@ -243,7 +243,7 @@
 			setH5Visible() {
 				// #ifdef H5
 				// fix by mehaotian 处理 h5 滚动穿透的问题
-				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				//document.getElementsByTagName('body')[0].style.overflow = 'visible'
 				// #endif
 			},
 			/**