guo преди 2 години
родител
ревизия
82a3d3e501
променени са 10 файла, в които са добавени 656 реда и са изтрити 517 реда
  1. 124 147
      pages.json
  2. 5 3
      pages/mobile/CarDetail.vue
  3. 8 0
      pages/mobile/CarModelList.vue
  4. 28 17
      pages/mobile/OemDetail.vue
  5. 14 3
      pages/mobile/OemSearch.vue
  6. 8 0
      pages/mobile/SonGroup.vue
  7. 361 337
      pages/mobile/group.vue
  8. 8 0
      pages/mobile/modelThree.vue
  9. 92 10
      pages/mobile/modelTwo.vue
  10. 8 0
      pages/mobile/vinDetail.vue

+ 124 - 147
pages.json

@@ -1,148 +1,125 @@
-{
-	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-		{
-		    "path" : "pages/mobile/homePage",
-		    "style" :                                                                                    
-		    {
-		        
-		       "navigationStyle": "custom"
-		    }
-		    
-		},
-		
-		{
-			"path": "pages/mobile/index",
-			"style": {
-				"navigationBarTitleText": "VIN查询"
-			}
-		},
-		{
-			"path": "pages/mobile/group",
-			"style": {
-				
-				 "navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/mobile/modelTwo",
-			"style": {
-				"navigationBarTitleText": "车型件"
-			}
-		},{
-			"path": "pages/mobile/modelThree",
-			"style": {
-				"navigationBarTitleText": "车型件",
-				"enablePullDownRefresh": true
-			}
-		}
-	    ,{
-            "path" : "pages/mobile/OemDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "OEM零件详情",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/OemSearch",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "OEM搜索",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/CarModelList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "适用车型",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/SonGroup",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择子组",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/CarDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "车型详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/SelectCarModel",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择品牌",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/SelectCarTwo",
-            "style" :                                                                                    
-            {
-            
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/SelectCarThree",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/SelectCarFour",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/SelectCarFive",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mobile/SelectCarSix",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        },{
-			"path": "pages/mobile/vinDetail",
-			"style": {
-				"navigationBarTitleText": "车型件",
-				"enablePullDownRefresh": true
-			}
-		}
-        
-    ],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "VIN查询",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#FFFFFF"
-	},
-	"uniIdRouter": {}
+{
+	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/mobile/homePage",
+			"style": {
+
+				"navigationStyle": "custom"
+			}
+
+		},
+
+		{
+			"path": "pages/mobile/index",
+			"style": {
+				"navigationBarTitleText": "VIN查询"
+			}
+		},
+		{
+			"path": "pages/mobile/group",
+			"style": {
+
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/mobile/modelTwo",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/mobile/modelThree",
+			"style": {
+				"navigationBarTitleText": "车型件",
+				"enablePullDownRefresh": true
+			}
+		}, {
+			"path": "pages/mobile/OemDetail",
+			"style": {
+				"navigationBarTitleText": "OEM零件详情",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/mobile/OemSearch",
+			"style": {
+				"navigationBarTitleText": "OEM搜索",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/mobile/CarModelList",
+			"style": {
+				"navigationBarTitleText": "适用车型",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/mobile/SonGroup",
+			"style": {
+				"navigationBarTitleText": "选择子组",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/mobile/CarDetail",
+			"style": {
+				"navigationBarTitleText": "车型详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/mobile/SelectCarModel",
+			"style": {
+				"navigationBarTitleText": "选择品牌",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/mobile/SelectCarTwo",
+			"style": {
+
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mobile/SelectCarThree",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mobile/SelectCarFour",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mobile/SelectCarFive",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mobile/SelectCarSix",
+			"style": {
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/mobile/vinDetail",
+			"style": {
+				"navigationBarTitleText": "车型件",
+				"enablePullDownRefresh": true
+			}
+		}
+
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "VIN查询",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#FFFFFF"
+	},
+	"uniIdRouter": {}
 }

+ 5 - 3
pages/mobile/CarDetail.vue

@@ -43,6 +43,7 @@
 				partsnum: '',
 				weizhi: '',
 				yongliang: '',
+				model_id:'',
 				mesData:{}
 			}
 		},
@@ -52,6 +53,7 @@
 			this.partsnum = opt.partsnum;
 			this.weizhi = opt.weizhi;
 			this.yongliang = opt.yongliang;
+			this.model_id = opt.model_id;
 			this.getItemData();
 		},
 		methods: {
@@ -61,9 +63,9 @@
 				uni.showLoading({
 					title: '加载中'
 				});
-				this.$http('advancedEpc/generalEpc/info', {
-					epc_id: this.epc_id,
-					partsnum: this.partsnum,
+				this.$http('advancedEpc/findApplicableModels', {
+					model_id: this.model_id,
+					
 			
 				}, 'GET').then(res => {
 					uni.hideLoading();

+ 8 - 0
pages/mobile/CarModelList.vue

@@ -111,6 +111,14 @@
 						'&access_time=' + this.itemData.access_time
 				})
 			},
+		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			// this.page = 1
+			// this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		onReachBottom() {
 			console.log('page--total_page', this.page, this.total_page);

+ 28 - 17
pages/mobile/OemDetail.vue

@@ -34,18 +34,18 @@
 					<view class="left">备注</view>
 					<view class="right">{{mesData.remark}}</view>
 				</view>
-				<view class="comtent">
+				<!-- <view class="comtent">
 					<view class="left">英文名称</view>
 					<view class="right">{{mesData.remark}}</view>
-				</view>
-				<view class="comtent">
+				</view> -->
+				<!-- <view class="comtent">
 					<view class="left">适用车型代码</view>
 					<view class="right"></view>
-				</view>
-				<view class="comtent">
+				</view> -->
+				<!-- <view class="comtent">
 					<view class="left">是否颜色配件</view>
 					<view class="right">否</view>
-				</view>
+				</view> -->
 				<view class="comtent">
 					<view class="left">4S价格</view>
 					<view class="right" style="color: #FF4F00; font-weight: bold;">¥{{mesData.price}}</view>
@@ -63,7 +63,7 @@
 							<view class="right">1201D0</view>
 						</view>
 						<view class="comtent2">
-							<view class="left">工时:</view>z
+							<view class="left">工时:</view>
 							<view class="right">12</view>
 						</view>
 					</view>
@@ -89,7 +89,7 @@
  -->
 
 		<!-- 通用件 -->
-		<view class="mainBox" v-if="tabIndex==1">
+		<!-- <view class="mainBox" v-if="tabIndex==1">
 			<view class="tong">
 				<view class="topTitle"><span style="color: #FF3B30;">*</span>通用件数据仅供参考,采购前请谨慎核对是否为相同配件</view>
 				
@@ -100,7 +100,7 @@
 							<view class="right2">{{item.brand}}</view>
 						</view>
 						<view class="comtent2">
-							<view class="left2" style="width: 26%;">零件号:</view>z
+							<view class="left2" style="width: 26%;">零件号:</view>
 							<view class="right2">{{item.partsnum}}</view>
 						</view>
 					</view>
@@ -120,9 +120,9 @@
 				</view>
 			</view>
 		</view>
-
+ -->
 		<!-- EPC车型 -->
-		<view class="mainBox" v-if="tabIndex==2">
+		<view class="mainBox" v-if="tabIndex==1">
 			<view class="epc">
 				<view class="topTitle">共<span style="color: #FF3B30;">{{epc_Count}}</span>条</view>
 				
@@ -204,7 +204,7 @@
 				partsnum: '',
 				tabIndex: 0,
 				// tabList: ['配件信息', '维修工时', '通用件', 'EPC车型', '4S销售车型'],
-				tabList: ['配件信息', '通用件', 'EPC车型'],
+				tabList: ['配件信息', 'EPC车型'],
 				mesData: {},
 				weizhi: '',
 				yongliang: '',
@@ -245,7 +245,9 @@
 				});
 			},
 			// 通用件
-			getTongData() {
+			getTongData() {
+				this.partsnum = '7E0498104K';
+				this.epc_id = '1051';
 				uni.showLoading({
 					title: '加载中'
 				});
@@ -295,10 +297,11 @@
 				// 	// 维修工时
 				// 	// this.getItemData();
 				// }
-				else if (this.tabIndex == 1) {
-					// 通用件
-					this.getTongData();
-				} else if (this.tabIndex == 2) {
+				// else if (this.tabIndex == 1) {
+				// 	// 通用件
+				// 	this.getTongData();
+				// }
+				 else if (this.tabIndex == 1) {
 					// EPC车型
 					this.getCarModelData();
 				}
@@ -307,6 +310,14 @@
 				// 	// this.getItemData();
 				// }
 			},
+		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			// this.page = 1
+			// this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		onReachBottom() {
 

+ 14 - 3
pages/mobile/OemSearch.vue

@@ -47,12 +47,12 @@
 			return {
 				tabIndex: 0,
 				searchValue: '',
-				historyList: [1, 2, 3, 4, 5],
+				historyList: [],
 				itemData: {},
 				itemList: [],
 				brandList: [],
 				brand: '',
-				epc_id: '1014',
+				epc_id: '',
 				page: 1,
 				total_page: 1
 			}
@@ -97,7 +97,10 @@
 					var list = res.data.result.list;
 
 					this.total_page = res.data.result.total_page;
-					if (list.length != 0) {
+					if (this.page == 1) {
+						this.itemList = list;
+					}
+					else if (list.length != 0) {
 						this.itemList = this.itemList.concat(list)
 					}
 					
@@ -106,6 +109,14 @@
 				});
 			},
 
+		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			// this.page = 1
+			// this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		onReachBottom() {
 			if (this.page <= this.total_page) {

+ 8 - 0
pages/mobile/SonGroup.vue

@@ -68,6 +68,14 @@
 
 				})
 			}
+		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			// this.page = 1
+			// this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		onReachBottom() {
 			if (this.page <= this.total_page) {

+ 361 - 337
pages/mobile/group.vue

@@ -1,338 +1,362 @@
-<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="carPeizhi.length != 0" class="zdyNavRight" @click="goOemSearch()">OEM搜索</view>
-				<view v-else style="width: 50rpx;"></view>
-			</view>
-		</view>
-		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view>
-		
-		
-		<view class="top">
-			<view class="topCont">
-				<view class="carBox">
-					<image src="../../static/img/nocar.png" mode="" class="carLogo"></image>
-					<view class="carTxt">{{brand_name}}</view>
-					<!-- <image src="../../static/img/jt.png" mode="" class="carJt"></image> -->
-				</view>
-				<view class="vinBox">
-					<view class="vinBox2">
-						<view class="vinB">VIN</view>
-						<view class="vinNum">{{vin}}</view>
-					</view>
-					<!-- <view  v-if="carPeizhi.length != 0" class="vinBox2">
-						<view class="detail" @click="goCarDetail()">车型详情</view>
-						<image src="../../static/img/icon_arrow_blue_r@2x.png" mode="" style="width: 24rpx; height: 24rpx"></image>
-					</view> -->
-				</view>
-			</view>
-		</view>
-		<!--车辆配置  -->
-		<view class="mainBox" v-if="restrainShow">
-			<view class="maintitle">{{caption}}</view>
-			<view class="mainLine" v-for="(item,index) in restrains" @click="restrainsClick(item)">
-				<view class="lineName">{{item.combine_cp}}</view>
-				<image src="../../static/img/jt.png" mode="" class="mainLineJt"></image>
-			</view>
-		</view>
-		<!-- 总组 -->
-		<view class="mainBox" v-if="groupShow">
-			<view class="maintitle">{{caption}}</view>
-			<view class="mainLine" v-for="(item,index) in zlist" @click="goTwo(item)">
-				<view class="lineName">{{item.caption}}</view>
-				<image src="../../static/img/jt.png" mode="" class="mainLineJt"></image>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				vin: '',
-				iStatusBarHeight: '',
-				restrains:'',
-				zlist:'',
-				brand_name:'',
-				access_time:'',
-				zzTime:'',
-				caption:'',
-				restrainShow:false,
-				groupShow:false,
-				param:'',
-				token:'',
-				epc_id:'',
-				carPeizhi:''
-			}
-		},
-		onLoad(opt) {
-			this.vin=opt.vin
-            this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-            this.getData()
-		},
-		methods: {
-			getData(){
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http('advancedEpc/getVinGroup', {
-					vin:this.vin,
-					
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					//console.log(res.data.number);
-					if(res.data.number==200||res.data.number==5212){
-					     this.brand_name=res.data.result.brand_name;
-					     this.access_time=res.data.result.access_time;
-						 this.caption=res.data.result.caption
-						 this.epc_id = res.data.result.epc_id;
-					     if(res.data.result.restrains.length>0){
-					       this.restrains=res.data.result.restrains;
-					       this.restrainShow=true;
-					     }else{
-					       this.zzTime=res.data.result.access_time;
-					       this.zlist=res.data.result.list;
-					       this.restrainShow=false;
-						   this.groupShow=true;
-					     }
-					}else{
-					 
-					   uni.showToast({
-					   	title: res.data.message,
-					   	icon: 'none',
-					   	duration: 3000
-					   });
-					}
-							
-				});
-			},
-			restrainsClick(item){
-				this.param=item.param;
-				this.token=item.token;
-				this.carPeizhi = item.combine_cp;
-				this.getcarVinGroup()
-			},
-			getcarVinGroup(){
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http('advancedEpc/getVinGroup', {
-					vin:this.vin,
-					access_time:this.access_time,
-					param:this.param,
-					token:this.token
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					//console.log(res.data.number);
-					if(res.data.number==200||res.data.number==5212){
-					     this.brand_name=res.data.result.brand_name;
-					     this.access_time=res.data.result.access_time;
-						 this.caption=res.data.result.caption
-					     if(res.data.result.restrains.length>0){
-					       this.restrains=res.data.result.restrains;
-					       this.restrainShow=true;
-					     }else{
-					       this.zzTime=res.data.result.access_time;
-					       this.zlist=res.data.result.list;
-					       this.restrainShow=false;
-						   this.groupShow=true;
-					     }
-					}else{
-					   uni.showToast({
-					   	title: res.data.message,
-					   	icon: 'none',
-					   	duration: 3000
-					   });
-					}
-							
-				});
-			},
-			goCarDetail(){
-				uni.navigateTo({
-					url:'CarDetail'
-				})
-			},
-			goOemSearch(){
-				uni.navigateTo({
-					url:'OemSearch?brand='+ this.brand_name + '&epc_id=' + this.epc_id
-				})
-			},
-			goback(){
-				console.log('返回');
-				uni.navigateBack({})
-			},
-            goTwo(item){
-				uni.navigateTo({
-					url:'modelTwo?vin='+this.vin+'&zzTime='+this.zzTime+'&param='+item.param+'&token='+item.token
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.content{
-		background: #F4F5F7;
-		min-height: 100vh;
-		padding-bottom: constant(safe-area-inset-bottom);
-		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;
-	
-	}
-	
-	.backImg {
-		width: 44rpx;
-		height: 44rpx;
-		margin-left: 10rpx;
-		margin-right: 20rpx;
-	}
-	
-	.homeImg {
-		width: 44rpx;
-		height: 44rpx;
-	
-	}
-	
-	.zdyNavLeft {
-		display: flex;
-		align-items: center;
-	}
-	
-	.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;
-		margin-right: 24rpx;
-	}
-	
-	
-	
-	
-	.top{
-		padding: 20rpx 0;
-	}
-	.topCont{
-		width: 750rpx;
-		height: 185rpx;
-		background: #FFFFFF;
-	}
-	.carLogo{
-		width: 72rpx;height: 72rpx;
-	}
-	.carTxt{
-		font-size: 28rpx;
-		font-family: PingFangSC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #333333;
-		line-height: 36rpx;
-		width: 606rpx;
-	}
-	.carJt{
-		width: 25rpx;
-		height: 24rpx;
-		margin-top: 6rpx;
-	}
-	.carBox{
-		display: flex;
-		justify-content: space-between;
-		padding: 30rpx 24rpx 24rpx 24rpx;
-	}
-	.vinBox{
-		display: flex;
-		justify-content: space-between;
-		padding-left: 120rpx;
-		padding-right: 24rpx;
-	}
-	.vinBox2{
-		display: flex;	
-		align-items: center;
-	}
-	.detail{
-		color: #3F90F7;
-		font-size: 24rpx;
-		margin-right: 10rpx;
-	}
-	.vinB{
-		background: #F19D01;
-		width: 60rpx;
-		height: 30rpx;
-		text-align: center;
-		line-height: 30rpx;
-		color: #FFFFFF;
-		font-size: 22rpx;
-		border-radius: 5rpx;
-	}
-	.vinNum{
-		color: #999999;font-size: 24rpx;line-height: 30rpx;padding-left: 10rpx;
-	}
-	.mainBox{
-		background: #FFFFFF;
-	}
-	.maintitle{
-		font-size: 28rpx;
-		font-family: PingFangSC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #333333;
-		text-align: center;
-		line-height: 88rpx;
-		border-bottom: 1px solid #EEEEEE;
-	}
-	.mainLineJt{
-		width: 25rpx;
-		height: 24rpx;
-		margin-top: 8rpx;
-	}
-	.mainLine{
-		display: flex;
-		justify-content: space-between;
-		border-bottom: 1px solid #EEEEEE;
-		padding:24rpx;
-	}
-	.lineName{
-		font-size: 28rpx;
-		font-family: PingFangSC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #333333;
-		line-height: 40rpx;
-	}
+<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="carPeizhi.length != 0" class="zdyNavRight" @click="goOemSearch()">OEM搜索</view>
+				<view v-else style="width: 50rpx;"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view>
+
+
+		<view class="top">
+			<view class="topCont">
+				<view class="carBox">
+					<image src="../../static/img/nocar.png" mode="" class="carLogo"></image>
+					<view class="carTxt">{{brand_name}}</view>
+					<!-- <image src="../../static/img/jt.png" mode="" class="carJt"></image> -->
+				</view>
+				<view class="vinBox">
+					<view class="vinBox2">
+						<view class="vinB">VIN</view>
+						<view class="vinNum">{{vin}}</view>
+					</view>
+					<!-- <view  v-if="carPeizhi.length != 0" class="vinBox2">
+						<view class="detail" @click="goCarDetail()">车型详情</view>
+						<image src="../../static/img/icon_arrow_blue_r@2x.png" mode="" style="width: 24rpx; height: 24rpx"></image>
+					</view> -->
+				</view>
+			</view>
+		</view>
+		<!--车辆配置  -->
+		<view class="mainBox" v-if="restrainShow">
+			<view class="maintitle">{{caption}}</view>
+			<view class="mainLine" v-for="(item,index) in restrains" @click="restrainsClick(item)">
+				<view class="lineName">{{item.combine_cp}}</view>
+				<image src="../../static/img/jt.png" mode="" class="mainLineJt"></image>
+			</view>
+		</view>
+		<!-- 总组 -->
+		<view class="mainBox" v-if="groupShow">
+			<view class="maintitle">{{caption}}</view>
+			<view class="mainLine" v-for="(item,index) in zlist" @click="goTwo(item)">
+				<view class="lineName">{{item.caption}}</view>
+				<image src="../../static/img/jt.png" mode="" class="mainLineJt"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				vin: '',
+				iStatusBarHeight: '',
+				restrains: '',
+				zlist: '',
+				brand_name: '',
+				brand_id: '',
+				access_time: '',
+				zzTime: '',
+				caption: '',
+				restrainShow: false,
+				groupShow: false,
+				param: '',
+				token: '',
+				epc_id: '',
+				carPeizhi: ''
+			}
+		},
+		onLoad(opt) {
+			this.vin = opt.vin
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			this.getData()
+		},
+		methods: {
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('advancedEpc/getVinGroup', {
+					vin: this.vin,
+
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					//console.log(res.data.number);
+					if (res.data.number == 200 || res.data.number == 5212) {
+						this.brand_name = res.data.result.brand_name;
+						this.brand_id = res.data.result.brand_id;
+						this.access_time = res.data.result.access_time;
+						this.caption = res.data.result.caption
+						this.epc_id = res.data.result.epc_id;
+						if (res.data.result.restrains.length > 0) {
+							this.restrains = res.data.result.restrains;
+							this.restrainShow = true;
+						} else {
+							this.zzTime = res.data.result.access_time;
+							this.zlist = res.data.result.list;
+							this.restrainShow = false;
+							this.groupShow = true;
+						}
+					} else {
+
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+
+				});
+			},
+			restrainsClick(item) {
+				this.param = item.param;
+				this.token = item.token;
+				this.carPeizhi = item.combine_cp;
+				this.getcarVinGroup()
+			},
+			getcarVinGroup() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('advancedEpc/getVinGroup', {
+					vin: this.vin,
+					access_time: this.access_time,
+					param: this.param,
+					token: this.token
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					//console.log(res.data.number);
+					if (res.data.number == 200 || res.data.number == 5212) {
+						this.brand_name = res.data.result.brand_name;
+						this.access_time = res.data.result.access_time;
+						this.caption = res.data.result.caption
+						if (res.data.result.restrains.length > 0) {
+							this.restrains = res.data.result.restrains;
+							this.restrainShow = true;
+						} else {
+							this.zzTime = res.data.result.access_time;
+							this.zlist = res.data.result.list;
+							this.restrainShow = false;
+							this.groupShow = true;
+						}
+					} else {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+
+				});
+			},
+			goCarDetail() {
+				uni.navigateTo({
+					url: 'CarDetail?model_id=' + this.brand_id
+				})
+			},
+			goOemSearch() {
+				uni.navigateTo({
+					url: 'OemSearch?brand=' + this.brand_name + '&epc_id=' + this.epc_id
+				})
+			},
+			goback() {
+				console.log('返回');
+				uni.navigateBack({})
+			},
+			goTwo(item) {
+				uni.navigateTo({
+					url: 'modelTwo?vin=' + this.vin + '&zzTime=' + this.zzTime + '&param=' + item.param +
+						'&token=' + item.token + '&epc_id=' + this.epc_id
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+		padding-bottom: constant(safe-area-inset-bottom);
+		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;
+
+	}
+
+	.backImg {
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
+	}
+
+	.homeImg {
+		width: 44rpx;
+		height: 44rpx;
+
+	}
+
+	.zdyNavLeft {
+		display: flex;
+		align-items: center;
+	}
+
+	.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;
+		margin-right: 24rpx;
+	}
+
+
+
+
+	.top {
+		padding: 20rpx 0;
+	}
+
+	.topCont {
+		width: 750rpx;
+		height: 185rpx;
+		background: #FFFFFF;
+	}
+
+	.carLogo {
+		width: 72rpx;
+		height: 72rpx;
+	}
+
+	.carTxt {
+		font-size: 28rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		line-height: 36rpx;
+		width: 606rpx;
+	}
+
+	.carJt {
+		width: 25rpx;
+		height: 24rpx;
+		margin-top: 6rpx;
+	}
+
+	.carBox {
+		display: flex;
+		justify-content: space-between;
+		padding: 30rpx 24rpx 24rpx 24rpx;
+	}
+
+	.vinBox {
+		display: flex;
+		justify-content: space-between;
+		padding-left: 120rpx;
+		padding-right: 24rpx;
+	}
+
+	.vinBox2 {
+		display: flex;
+		align-items: center;
+	}
+
+	.detail {
+		color: #3F90F7;
+		font-size: 24rpx;
+		margin-right: 10rpx;
+	}
+
+	.vinB {
+		background: #F19D01;
+		width: 60rpx;
+		height: 30rpx;
+		text-align: center;
+		line-height: 30rpx;
+		color: #FFFFFF;
+		font-size: 22rpx;
+		border-radius: 5rpx;
+	}
+
+	.vinNum {
+		color: #999999;
+		font-size: 24rpx;
+		line-height: 30rpx;
+		padding-left: 10rpx;
+	}
+
+	.mainBox {
+		background: #FFFFFF;
+	}
+
+	.maintitle {
+		font-size: 28rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		text-align: center;
+		line-height: 88rpx;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.mainLineJt {
+		width: 25rpx;
+		height: 24rpx;
+		margin-top: 8rpx;
+	}
+
+	.mainLine {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #EEEEEE;
+		padding: 24rpx;
+	}
+
+	.lineName {
+		font-size: 28rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #333333;
+		line-height: 40rpx;
+	}
 </style>

+ 8 - 0
pages/mobile/modelThree.vue

@@ -222,6 +222,14 @@
 					}
 				});
 			}
+		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			// this.page = 1
+			// this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		onReachBottom() {
 			if (this.page <= this.total_page) {

+ 92 - 10
pages/mobile/modelTwo.vue

@@ -1,5 +1,23 @@
 <template>
-	<view class="content">
+	<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 class="zdyNavRight" @click="goOemSearch()">OEM搜索</view>
+				<!-- <view style="width: 50rpx;"></view> -->
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view>
+		
+		
 		<view class="top">
 			<view class="topCont">
 				<view class="carBox">
@@ -22,7 +40,7 @@
 		<view class="mainBox">
 			<view class="maintitle">{{caption}}
 				<view @click="goback" class="backBox">
-					<image src="../../static/img/icon_arrow_blue_l@2x.png" mode="" class="backImg"></image>
+					<image src="../../static/img/icon_arrow_blue_l@2x.png" mode="" class="backZongImg"></image>
 					<view class="backTxt">返回总组</view>
 				</view>
 			</view>
@@ -36,8 +54,8 @@
 
 			<view class="mainLine" v-for="(item,index) in childrenList" @click="goThree(item,index)" v-if="lastShow">
 				<view class="lineLeft">
-					<image class="lineIMg" :src="item.image_url" v-if="item.image_url" mode=""></image>
-					<image class="lineIMg" src="../../static/img/noimg.png" v-else mode=""></image>
+					<image class="lineIMg" :src="item.image_url" v-if="item.image_url" mode="aspectFit"></image>
+					<image class="lineIMg" src="../../static/img/noimg.png" v-else mode="aspectFit"></image>
 				</view>
 				<view class="lineRIght">
 					<view class="lineName">{{item.caption}}</view>
@@ -83,17 +101,26 @@
 				lastShow: false,
 				childrenList: '',
 				oldList: '',
-				childrenss: '',
+				childrenss: '',
+				iStatusBarHeight: '',
+				epc_id:'',
 			}
 		},
 		onLoad(opt) {
 			this.vin = opt.vin;
 			this.zzTime = opt.zzTime;
 			this.param = opt.param;
-			this.token = opt.token;
+			this.token = opt.token;
+			this.epc_id = opt.epc_id;
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.getData()
 		},
-		methods: {
+		methods: {
+			goOemSearch(){
+				uni.navigateTo({
+					url:'OemSearch?brand='+ this.brand_name + '&epc_id=' + this.epc_id
+				})
+			},
 			goback() {
 				console.log('返回');
 				uni.navigateBack({})
@@ -308,6 +335,61 @@
 		min-height: 100vh;
 		padding-bottom: constant(safe-area-inset-bottom);
 		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;
+	
+	}
+	
+	.backImg {
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
+	}
+	
+	.homeImg {
+		width: 44rpx;
+		height: 44rpx;
+	
+	}
+	
+	.zdyNavLeft {
+		display: flex;
+		align-items: center;
+	}
+	
+	.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;
+		margin-right: 24rpx;
 	}
 
 	.top {
@@ -397,7 +479,7 @@
 		position: relative;
 	}
 
-	.backImg {
+	.backZongImg {
 		width: 25rpx;
 		height: 24rpx;
 		margin-top: 4rpx;
@@ -462,8 +544,8 @@
 	}
 
 	.lineIMg {
-		width: 100rpx;
-		height: 85rpx;
+		width: 160rpx;
+		height: 160rpx;
 	}
 
 	.lineRIght {

+ 8 - 0
pages/mobile/vinDetail.vue

@@ -225,6 +225,14 @@
 				});
 			}
 		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			// this.page = 1
+			// this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		onReachBottom() {
 			if (this.page <= this.total_page) {
 				this.page++;