guo 2 lat temu
rodzic
commit
0d2c6d1f4b

+ 1 - 1
pages.json

@@ -51,7 +51,7 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "OEM搜索",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": true
             }
             
         }

+ 181 - 171
pages/mobile/CarModelList.vue

@@ -1,172 +1,182 @@
-<template>
-	<view class="box">
-		<view class="mainBox">
-			
-			<view @click="goSonGroup(item)" class="workBox2" v-for="(item,index) in itemList" :key="index">
-				<view class="leftBox">
-					<view class="oneBox">
-						<view class="comtent2">
-							<view class="left2">名称:</view>
-							<view class="right2">{{item.caption}}</view>
-						</view>
-						<view class="comtent2">
-							<view class="left2">车型:</view>
-							<view class="right2">{{item.vin_11}}</view>
-						</view>
-					</view>
-					
-					<view class="oneBox">
-						<view class="comtent2">
-							<view class="left2">年份:</view>
-							<view class="right2">{{item.year}}</view>
-						</view>
-						<view class="comtent2">
-							<view class="left2" style="width: 28%;">发动机:</view>
-							<view class="right2">{{item.engine_prefix}}</view>
-						</view>
-					</view>
-					
-					<view class="oneBox">
-						<view class="comtent2">
-							<view class="left2" style="width: 28%;">变数箱:</view>
-							<view class="right2">{{item.trans}}</view>
-						</view>
-						<view class="comtent2">
-							<view class="left2">地区:</view>
-							<view class="right2">{{item.area}}</view>
-						</view>
-					</view>
-					
-					<view class="oneBox">
-						<view class="comtent2">
-							<view class="left2">配置:</view>
-							<view class="right2">{{item.equips}}</view>
-						</view>
-						<view class="comtent2">
-							<view class="left2">级别:</view>
-							<view class="right2">{{item.grade}}</view>
-						</view>
-					</view>
-					
-					<view class="oneBox">
-						<view class="comtent2">
-							<view class="left2" style="width: 35%;">模型代码:</view>
-							<view class="right2">{{item.model_code}}</view>
-						</view>
-						
-					</view>
-								
-				</view>
-				<image src="../../static/img/rightArrow.png" mode="" style="width: 12rpx; height: 20rpx"></image>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				epc_id:'',
-				partnum:'',
-				itemData:{},
-				itemList:[],
-				page:1,
-				total_page:1
-				
-			}
-		},
-		onLoad(opt) {
-			this.epc_id = opt.epc_id;
-			this.partnum = opt.partnum;
-			this.getItemData();
-		},
-		methods: {
-			// 配件车型
-			getItemData() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http('advancedEpc/findApplicableModelsPc', {
-					epc_id:this.epc_id,
-					partnum:this.partnum,
-					page:this.page
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					
-					this.itemData = res.data.result;
-					var list = res.data.result.list;
-					
-					this.total_page = res.data.result.total_page;
-					this.itemList = this.itemList.concat(list)
-			
-				});
-			},
-			goSonGroup(item) {
-				uni.navigateTo({
-					
-					url: 'SonGroup?epc_id=' + this.epc_id + '&token=' + item.token + '&param=' + item.param+ '&access_time=' + this.itemData.access_time
-				})
-			},
-		},
-		onReachBottom() {
-			console.log('page--total_page',this.page,this.total_page);
-			if (this.page <= this.total_page) {
-				this.page++;
-				
-				this.getItemData()
-			}
-		}
-	}
-</script>
-
-<style>
-	.box {
-		min-height: 100vh;
-		background: #F4F5F7;
-		padding-top: 20rpx;
-	}
-	.mainBox {
-		background: #FFFFFF;
-		
-	}
-	.oneBox{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		font-size: 26rpx;
-		padding-bottom: 20rpx;
-	}
-	.comtent2 {
-		display: flex;
-		align-items: baseline;
-		font-size: 26rpx;
-		width: 50%;
-	}
-	.workBox2{
-		
-		background: #FFFFFF;
-		border-bottom: 1rpx solid #EEEEEE;
-		padding: 20rpx 24rpx 0rpx;
-		
-		display: flex;
-		align-items: center;
-	}
-	.leftBox{
-		width: calc(100vw - 20rpx);
-	}
-	.rightBox{
-		width: 20rpx;
-	}
-	.left2 {
-		width: 20%;
-		color: #999999;
-		white-space: nowrap;
-	}
-	
-	.right2 {
-		width: 80%;
-		color: #333333;
-		
-	}
+<template>
+	<view class="box">
+		<view class="mainBox">
+
+			<view @click="goSonGroup(item)" class="workBox2" v-for="(item,index) in itemList" :key="index">
+				<view class="leftBox">
+					<view class="oneBox">
+						<view class="comtent2">
+							<view class="left2">名称:</view>
+							<view class="right2">{{item.caption}}</view>
+						</view>
+						<view class="comtent2">
+							<view class="left2">车型:</view>
+							<view class="right2">{{item.vin_11}}</view>
+						</view>
+					</view>
+
+					<view class="oneBox">
+						<view class="comtent2">
+							<view class="left2">年份:</view>
+							<view class="right2">{{item.year}}</view>
+						</view>
+						<view class="comtent2">
+							<view class="left2" style="width: 28%;">发动机:</view>
+							<view class="right2">{{item.engine_prefix}}</view>
+						</view>
+					</view>
+
+					<view class="oneBox">
+						<view class="comtent2">
+							<view class="left2" style="width: 28%;">变数箱:</view>
+							<view class="right2">{{item.trans}}</view>
+						</view>
+						<view class="comtent2">
+							<view class="left2">地区:</view>
+							<view class="right2">{{item.area}}</view>
+						</view>
+					</view>
+
+					<view class="oneBox">
+						<view class="comtent2">
+							<view class="left2">配置:</view>
+							<view class="right2">{{item.equips}}</view>
+						</view>
+						<view class="comtent2">
+							<view class="left2">级别:</view>
+							<view class="right2">{{item.grade}}</view>
+						</view>
+					</view>
+
+					<view class="oneBox">
+						<view class="comtent2">
+							<view class="left2" style="width: 35%;">模型代码:</view>
+							<view class="right2">{{item.model_code}}</view>
+						</view>
+
+					</view>
+
+				</view>
+				<image src="../../static/img/rightArrow.png" mode="" style="width: 12rpx; height: 20rpx"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				epc_id: '',
+				partnum: '',
+				itemData: {},
+				itemList: [],
+				page: 1,
+				total_page: 1
+
+			}
+		},
+		onLoad(opt) {
+			this.epc_id = opt.epc_id;
+			this.partnum = opt.partnum;
+			this.getItemData();
+		},
+		methods: {
+			// 配件车型
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('advancedEpc/findApplicableModelsPc', {
+					epc_id: this.epc_id,
+					partnum: this.partnum,
+					page: this.page
+				}, 'GET').then(res => {
+					uni.hideLoading();
+
+					this.itemData = res.data.result;
+					var list = res.data.result.list;
+
+					this.total_page = res.data.result.total_page;
+					if (list.length != 0) {
+						this.itemList = this.itemList.concat(list)
+					}
+
+				});
+			},
+			goSonGroup(item) {
+				uni.navigateTo({
+
+					url: 'SonGroup?epc_id=' + this.epc_id + '&token=' + item.token + '&param=' + item.param +
+						'&access_time=' + this.itemData.access_time
+				})
+			},
+		},
+		onReachBottom() {
+			console.log('page--total_page', this.page, this.total_page);
+			if (this.page <= this.total_page) {
+				this.page++;
+
+				this.getItemData()
+			}
+		}
+	}
+</script>
+
+<style>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+		padding-top: 20rpx;
+	}
+
+	.mainBox {
+		background: #FFFFFF;
+
+	}
+
+	.oneBox {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 26rpx;
+		padding-bottom: 20rpx;
+	}
+
+	.comtent2 {
+		display: flex;
+		align-items: baseline;
+		font-size: 26rpx;
+		width: 50%;
+	}
+
+	.workBox2 {
+
+		background: #FFFFFF;
+		border-bottom: 1rpx solid #EEEEEE;
+		padding: 20rpx 24rpx 0rpx;
+
+		display: flex;
+		align-items: center;
+	}
+
+	.leftBox {
+		width: calc(100vw - 20rpx);
+	}
+
+	.rightBox {
+		width: 20rpx;
+	}
+
+	.left2 {
+		width: 20%;
+		color: #999999;
+		white-space: nowrap;
+	}
+
+	.right2 {
+		width: 80%;
+		color: #333333;
+
+	}
 </style>

+ 316 - 308
pages/mobile/OemDetail.vue

@@ -54,135 +54,135 @@
 
 		<!-- 维修工时 -->
 		<!-- <view class="mainBox" v-if="tabIndex==1">
-				<view class="workBox" v-for="(item,index) in workHourseList" :key="index">
-					<view class="oneBox">
-						<view class="comtent2">
-							<view class="left">工时代号:</view>
-							<view class="right">1201D0</view>
-						</view>
-						<view class="comtent2">
-							<view class="left">工时:</view>z
-							<view class="right">12</view>
-						</view>
-					</view>
-					
-					<view class="oneBox">
-						<view class="comtent2">
-							<view class="left">相关参考号:</view>
-							<view class="right">1201D0</view>
-						</view>
-						<view class="comtent2">
-							<view class="left">工时包含:</view>
-							<view class="right">12</view>
-						</view>
-					</view>
-					
-					<view class="comtent2" style="width: 100%;">
-						<view class="left" style="width: 10%;" >说明:</view>
-						<view class="right" style="width: 90%;" >净化控制电磁阀 - 更换净化控制电磁阀 - 更换净化控制电磁阀 - 更换</view>
-					</view>
-					
+				<view class="workBox" v-for="(item,index) in workHourseList" :key="index">
+					<view class="oneBox">
+						<view class="comtent2">
+							<view class="left">工时代号:</view>
+							<view class="right">1201D0</view>
+						</view>
+						<view class="comtent2">
+							<view class="left">工时:</view>z
+							<view class="right">12</view>
+						</view>
+					</view>
+					
+					<view class="oneBox">
+						<view class="comtent2">
+							<view class="left">相关参考号:</view>
+							<view class="right">1201D0</view>
+						</view>
+						<view class="comtent2">
+							<view class="left">工时包含:</view>
+							<view class="right">12</view>
+						</view>
+					</view>
+					
+					<view class="comtent2" style="width: 100%;">
+						<view class="left" style="width: 10%;" >说明:</view>
+						<view class="right" style="width: 90%;" >净化控制电磁阀 - 更换净化控制电磁阀 - 更换净化控制电磁阀 - 更换</view>
+					</view>
+					
 				</view>
 		</view>
  -->
-		
+
 		<!-- 通用件 -->
 		<view class="mainBox" v-if="tabIndex==1" style="margin-top: 0rpx; padding: 0rpx">
 			<view class="topTitle"><span style="color: #FF3B30;">*</span>通用件数据仅供参考,采购前请谨慎核对是否为相同配件</view>
-			
-			<view class="workBox2" v-for="(item,index) in tongyongList" :key="index">
-				<view class="oneBox">
-					<view class="comtent2">
-						<view class="left2">品牌:</view>
-						<view class="right2">{{item.brand}}</view>
-					</view>
-					<view class="comtent2">
-						<view class="left2" style="width: 26%;">零件号:</view>z
-						<view class="right2">{{item.partsnum}}</view>
-					</view>
-				</view>
-				
-				<view class="oneBox">
-					<view class="comtent2">
-						<view class="left2">名称:</view>
-						<view class="right2">{{item.description}}</view>
-					</view>
-					<view class="comtent2">
-						<view class="left2">价格:</view>
-						<view class="right2">{{item.price}}</view>
-					</view>
-				</view>
-				
-				
-			</view>
+
+			<view class="workBox2" v-for="(item,index) in tongyongList" :key="index">
+				<view class="oneBox">
+					<view class="comtent2">
+						<view class="left2">品牌:</view>
+						<view class="right2">{{item.brand}}</view>
+					</view>
+					<view class="comtent2">
+						<view class="left2" style="width: 26%;">零件号:</view>z
+						<view class="right2">{{item.partsnum}}</view>
+					</view>
+				</view>
+
+				<view class="oneBox">
+					<view class="comtent2">
+						<view class="left2">名称:</view>
+						<view class="right2">{{item.description}}</view>
+					</view>
+					<view class="comtent2">
+						<view class="left2">价格:</view>
+						<view class="right2">{{item.price}}</view>
+					</view>
+				</view>
+
+
+			</view>
 		</view>
 
 		<!-- EPC车型 -->
-		<view class="mainBox" v-if="tabIndex==2" style="margin-top: 0rpx; padding: 0rpx">
-			<view class="topTitle">共<span style="color: #FF3B30;">{{epc_Count}}</span>条</view>
-			
-			<view class="workBox2" v-for="(item,index) in epcList" :key="index">
-				<view class="oneBox">
-					<view class="comtent2">
-						<view class="left2">名称:</view>
-						<view class="right2">{{item.caption}}</view>
-					</view>
-					<view class="comtent2">
-						<view class="left2">车型:</view>z
-						<view class="right2">{{item.vin_11}}</view>
-					</view>
-				</view>
-				
-				<view class="oneBox">
-					<view class="comtent2">
-						<view class="left2">年份:</view>
-						<view class="right2">{{item.year}}</view>
-					</view>
-					<view class="comtent2">
-						<view class="left2" style="width: 28%;">发动机:</view>
-						<view class="right2">{{item.engine_prefix}}</view>
-					</view>
-				</view>
-				
-				<view class="oneBox">
-					<view class="comtent2">
-						<view class="left2" style="width: 28%;">变数箱:</view>
-						<view class="right2">{{item.trans}}</view>
-					</view>
-					<view class="comtent2">
-						<view class="left2">地区:</view>
-						<view class="right2">{{item.area}}</view>
-					</view>
-				</view>
-				
-				<view class="oneBox">
-					<view class="comtent2">
-						<view class="left2">配置:</view>
-						<view class="right2">{{item.equips}}</view>
-					</view>
-					<view class="comtent2">
-						<view class="left2">级别:</view>
-						<view class="right2">{{item.grade}}</view>
-					</view>
-				</view>
-				
-				<view class="oneBox">
-					<view class="comtent2">
-						<view class="left2" style="width: 35%;">模型代码:</view>
-						<view class="right2">{{item.model_code}}</view>
-					</view>
-					
-				</view>
-			</view>
+		<view class="mainBox" v-if="tabIndex==2" style="margin-top: 0rpx; padding: 0rpx">
+			<view class="topTitle">共<span style="color: #FF3B30;">{{epc_Count}}</span>条</view>
+
+			<view class="workBox2" v-for="(item,index) in epcList" :key="index">
+				<view class="oneBox">
+					<view class="comtent2">
+						<view class="left2">名称:</view>
+						<view class="right2">{{item.caption}}</view>
+					</view>
+					<view class="comtent2">
+						<view class="left2">车型:</view>z
+						<view class="right2">{{item.vin_11}}</view>
+					</view>
+				</view>
+
+				<view class="oneBox">
+					<view class="comtent2">
+						<view class="left2">年份:</view>
+						<view class="right2">{{item.year}}</view>
+					</view>
+					<view class="comtent2">
+						<view class="left2" style="width: 28%;">发动机:</view>
+						<view class="right2">{{item.engine_prefix}}</view>
+					</view>
+				</view>
+
+				<view class="oneBox">
+					<view class="comtent2">
+						<view class="left2" style="width: 28%;">变数箱:</view>
+						<view class="right2">{{item.trans}}</view>
+					</view>
+					<view class="comtent2">
+						<view class="left2">地区:</view>
+						<view class="right2">{{item.area}}</view>
+					</view>
+				</view>
+
+				<view class="oneBox">
+					<view class="comtent2">
+						<view class="left2">配置:</view>
+						<view class="right2">{{item.equips}}</view>
+					</view>
+					<view class="comtent2">
+						<view class="left2">级别:</view>
+						<view class="right2">{{item.grade}}</view>
+					</view>
+				</view>
+
+				<view class="oneBox">
+					<view class="comtent2">
+						<view class="left2" style="width: 35%;">模型代码:</view>
+						<view class="right2">{{item.model_code}}</view>
+					</view>
+
+				</view>
+			</view>
 		</view>
 
 		<!-- 4S销售车型 -->
-		<!-- <view class="mainBox" v-if="tabIndex==4" style="margin-top: 0rpx; padding: 0rpx">
-			<view class="topTitle">共<span style="color: #FF3B30;">999</span>条</view>
-			
-			<view class="workBox3" v-for="(item,index) in xiaoshouList" :key="index">
-				<view class="carMode">2009 手自一体变速器(MT)模拟7档 前置四驱 S5 </view>
-			</view>
+		<!-- <view class="mainBox" v-if="tabIndex==4" style="margin-top: 0rpx; padding: 0rpx">
+			<view class="topTitle">共<span style="color: #FF3B30;">999</span>条</view>
+			
+			<view class="workBox3" v-for="(item,index) in xiaoshouList" :key="index">
+				<view class="carMode">2009 手自一体变速器(MT)模拟7档 前置四驱 S5 </view>
+			</view>
 		</view>
  -->
 
@@ -199,141 +199,143 @@
 <script>
 	export default {
 		data() {
-			return {
-				epc_id:'',
-				partsnum:'',
+			return {
+				epc_id: '',
+				partsnum: '',
 				tabIndex: 0,
-				// tabList: ['配件信息', '维修工时', '通用件', 'EPC车型', '4S销售车型'],
-				tabList: ['配件信息', '通用件', 'EPC车型'],
-				mesData:{},
-				weizhi:'',
-				yongliang:'',
-				workHourseList: [],
-				tongyongList: [],
-				epcList: [],
-				epc_Count:'',
-				xiaoshouList:[],
-				page:1,
-				total_page:1
+				// tabList: ['配件信息', '维修工时', '通用件', 'EPC车型', '4S销售车型'],
+				tabList: ['配件信息', '通用件', 'EPC车型'],
+				mesData: {},
+				weizhi: '',
+				yongliang: '',
+				workHourseList: [],
+				tongyongList: [],
+				epcList: [],
+				epc_Count: '',
+				xiaoshouList: [],
+				page: 1,
+				total_page: 1
 			}
-		},
+		},
 		onLoad(opt) {
-			this.epc_id = opt.epc_id;
-			this.partsnum = opt.partsnum;
-			this.weizhi = opt.weizhi;
-			this.yongliang = opt.yongliang;
-			this.getItemData();
+			console.log('opt+',opt);
+			this.epc_id = opt.epc_id;
+			this.partsnum = opt.partsnum;
+			this.weizhi = opt.weizhi;
+			this.yongliang = opt.yongliang;
+			this.getItemData();
 		},
-		methods: {
-			// 配件信息
-			getItemData() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http('advancedEpc/generalEpc/infoPc', {
-					epc_id:this.epc_id,
-					partsnum:this.partsnum,
-					
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					
-					this.mesData = res.data.result;
-				
-					
-			
-				});
-			},
-			// 通用件
-			getTongData() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http('advancedEpc/generalEpc/replacePc', {
-					epc_id:this.epc_id,
-					partsnum:this.partsnum,
-					
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					
-					this.tongyongList = res.data.result;
-				
-					
-			
-				});
-			},
-			// EPC车型
-			getCarModelData() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http('advancedEpc/findApplicableModelsPc', {
-					epc_id:this.epc_id,
-					partnum:this.partsnum,
-					page:this.page,
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					
-					
-					this.epc_Count = res.data.result.total_count;
-					
-					this.total_page = res.data.result.total_page;
-					var list = res.data.result.list;
-					this.epcList = this.epcList.concat(list)
-				});
+		methods: {
+			// 配件信息
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('advancedEpc/generalEpc/infoPc', {
+					epc_id: this.epc_id,
+					partsnum: this.partsnum,
+
+				}, 'GET').then(res => {
+					uni.hideLoading();
+
+					this.mesData = res.data.result;
+
+
+
+				});
+			},
+			// 通用件
+			getTongData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('advancedEpc/generalEpc/replacePc', {
+					epc_id: this.epc_id,
+					partsnum: this.partsnum,
+
+				}, 'GET').then(res => {
+					uni.hideLoading();
+
+					this.tongyongList = res.data.result;
+
+
+
+				});
+			},
+			// EPC车型
+			getCarModelData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('advancedEpc/findApplicableModelsPc', {
+					epc_id: this.epc_id,
+					partnum: this.partsnum,
+					page: this.page,
+				}, 'GET').then(res => {
+					uni.hideLoading();
+
+
+					this.epc_Count = res.data.result.total_count;
+
+					this.total_page = res.data.result.total_page;
+					var list = res.data.result.list;
+					if (list.length != 0) {
+						this.epcList = this.epcList.concat(list)
+					}
+				});
 			},
 			topClick(index) {
-				this.tabIndex = index
-				this.page = 1;
-				if (this.tabIndex == 0) {
-					// 配件信息
-					this.getItemData();
-				} 
-				// else if (this.tabIndex == 1) {
-				// 	// 维修工时
-				// 	// this.getItemData();
-				// }
-				else if (this.tabIndex == 1) {
-					// 通用件
-					this.getTongData();
-				}
-				else if (this.tabIndex == 2) {
-					// EPC车型
-					this.getCarModelData();
-				}
-				// else if (this.tabIndex == 4) {
-				// 	// 4S销售车型
-				// 	// this.getItemData();
+				this.tabIndex = index
+				this.page = 1;
+				if (this.tabIndex == 0) {
+					// 配件信息
+					this.getItemData();
+				}
+				// else if (this.tabIndex == 1) {
+				// 	// 维修工时
+				// 	// this.getItemData();
+				// }
+				else if (this.tabIndex == 1) {
+					// 通用件
+					this.getTongData();
+				} else if (this.tabIndex == 2) {
+					// EPC车型
+					this.getCarModelData();
+				}
+				// else if (this.tabIndex == 4) {
+				// 	// 4S销售车型
+				// 	// this.getItemData();
 				// }
 			},
-		},
-		onReachBottom() {
-			
-			// if (this.tabIndex == 0) {
-			// 	// 配件信息
-			// 	this.getItemData();
-			// } 
-			// // else if (this.tabIndex == 1) {
-			// // 	// 维修工时
-			// // 	// this.getItemData();
-			// // }
-			// else if (this.tabIndex == 1) {
-			// 	// 通用件
-			// 	// this.getTongData();
-			// }
-			// else
-			 if (this.tabIndex == 2) {
-				// EPC车型
-				if (this.page <= this.total_page) {
-					this.page++;
-					
-					this.getCarModelData()()
-				}
-			}
-			// else if (this.tabIndex == 4) {
-			// 	// 4S销售车型
-			// 	// this.getItemData();
-			// }
-			
+		},
+		onReachBottom() {
+
+			// if (this.tabIndex == 0) {
+			// 	// 配件信息
+			// 	this.getItemData();
+			// } 
+			// // else if (this.tabIndex == 1) {
+			// // 	// 维修工时
+			// // 	// this.getItemData();
+			// // }
+			// else if (this.tabIndex == 1) {
+			// 	// 通用件
+			// 	// this.getTongData();
+			// }
+			// else
+			if (this.tabIndex == 2) {
+				// EPC车型
+				if (this.page <= this.total_page) {
+					this.page++;
+
+					this.getCarModelData()()
+				}
+			}
+			// else if (this.tabIndex == 4) {
+			// 	// 4S销售车型
+			// 	// this.getItemData();
+			// }
+
 		}
 	}
 </script>
@@ -377,14 +379,14 @@
 	.line {
 		background: #FFFFFF;
 		height: 4rpx;
-		
+
 	}
 
 	.lineBlue {
 		background: #3F90F7;
-		width: 60rpx;
-		margin-left: calc((100% - 60rpx)/2);
-		
+		width: 60rpx;
+		margin-left: calc((100% - 60rpx)/2);
+
 	}
 
 	.mainBox {
@@ -403,71 +405,77 @@
 
 	.left {
 		width: 40%;
-		color: #999999;
+		color: #999999;
 		white-space: nowrap;
 	}
 
 	.right {
 		width: 60%;
 		color: #333333;
-	}
-	
-	.workBox{
-		
-		background: #FFFFFF;
-		border-bottom: 1rpx solid #EEEEEE;
-		padding-bottom: 20rpx;
-		margin-bottom: 20rpx;
-	}
-	.oneBox{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		font-size: 26rpx;
-		padding-bottom: 20rpx;
-	}
-	.comtent2 {
-		display: flex;
-		align-items: baseline;
-		font-size: 26rpx;
-		width: 50%;
-	}
-	
-	.topTitle{
-		background-color: #F4F5F7;
-		padding: 14rpx 24rpx;
-		color: #666666;
-		font-size: 24rpx;
-	}
-	.workBox2{
-		
-		background: #FFFFFF;
-		border-bottom: 1rpx solid #EEEEEE;
-		padding: 20rpx 24rpx 0rpx;
-		
-		margin-bottom: 20rpx;
-	}
-	.left2 {
-		width: 20%;
-		color: #999999;
-		white-space: nowrap;
-	}
-	
-	.right2 {
-		width: 80%;
-		color: #333333;
-	}
-	.workBox3{
-		
-		background: #FFFFFF;
-		border-bottom: 1rpx solid #EEEEEE;
-		padding: 20rpx 24rpx;
-		
-		margin-bottom: 20rpx;
-	}
-	.carMode{
-		color: #333333;
-		font-size: 28rpx;
-		
+	}
+
+	.workBox {
+
+		background: #FFFFFF;
+		border-bottom: 1rpx solid #EEEEEE;
+		padding-bottom: 20rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.oneBox {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 26rpx;
+		padding-bottom: 20rpx;
+	}
+
+	.comtent2 {
+		display: flex;
+		align-items: baseline;
+		font-size: 26rpx;
+		width: 50%;
+	}
+
+	.topTitle {
+		background-color: #F4F5F7;
+		padding: 14rpx 24rpx;
+		color: #666666;
+		font-size: 24rpx;
+	}
+
+	.workBox2 {
+
+		background: #FFFFFF;
+		border-bottom: 1rpx solid #EEEEEE;
+		padding: 20rpx 24rpx 0rpx;
+
+		margin-bottom: 20rpx;
+	}
+
+	.left2 {
+		width: 20%;
+		color: #999999;
+		white-space: nowrap;
+	}
+
+	.right2 {
+		width: 80%;
+		color: #333333;
+	}
+
+	.workBox3 {
+
+		background: #FFFFFF;
+		border-bottom: 1rpx solid #EEEEEE;
+		padding: 20rpx 24rpx;
+
+		margin-bottom: 20rpx;
+	}
+
+	.carMode {
+		color: #333333;
+		font-size: 28rpx;
+
 	}
 </style>

+ 49 - 32
pages/mobile/OemSearch.vue

@@ -25,7 +25,7 @@
 		</view> -->
 
 
-		<view class="commentBox" v-for="(item,index) in itemData.list" :key="index">
+		<view class="commentBox" v-for="(item,index) in itemList" :key="index">
 
 			<view class="name">{{item.caption}}</view>
 			<view class="comment">{{item.description}}</view>
@@ -49,15 +49,17 @@
 				searchValue: '',
 				historyList: [1, 2, 3, 4, 5],
 				itemData: {},
-				brandList: [],
-				brand:'本田',
-				epc_id:'1014',
-				
+				itemList: [],
+				brandList: [],
+				brand: '本田',
+				epc_id: '1014',
+				page: 1,
+				total_page: 1
 			}
-		},
-		onLoad() {
-			this.getBrandData();
-			this.getItemData();
+		},
+		onLoad() {
+			this.getBrandData();
+			this.getItemData();
 		},
 		methods: {
 			goCarModelList(partnum) {
@@ -71,42 +73,57 @@
 			search(val) {
 				// console.log(val);
 				this.searchValue = val
+				this.page = 1;
 				this.getItemData();
 			},
 			getBrandData() {
 				uni.showLoading({
 					title: '加载中'
 				});
-				this.$http('advancedEpc/getBrandsPc', {
-					
+				this.$http('advancedEpc/getBrandsPc', {
+
 				}, 'GET').then(res => {
 					uni.hideLoading();
 
-					this.brandList = res.data.result.list;
+					this.brandList = res.data.result.list;
 					console.log(this.brandList);
 
 
 				});
-			},
-			// 配件查询
-			getItemData() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http('advancedEpc/findPartsPc', {
-					epc_id:this.epc_id,
-					keyword:this.searchValue,
-					cur_page:'2',
-				}, 'GET').then(res => {
-					uni.hideLoading();
-			
-					this.itemData = res.data.result;
-					
-					
-			
-				});
-			},
-			
+			},
+			// 配件查询
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('advancedEpc/findPartsPc', {
+					epc_id: this.epc_id,
+					keyword: this.searchValue,
+					page: this.page,
+				}, 'GET').then(res => {
+					uni.hideLoading();
+
+					this.itemData = res.data.result;
+
+					var list = res.data.result.list;
+
+					this.total_page = res.data.result.total_page;
+					if (list.length != 0) {
+						this.itemList = this.itemList.concat(list)
+					}
+					
+					
+
+				});
+			},
+
+		},
+		onReachBottom() {
+			if (this.page <= this.total_page) {
+				this.page++;
+
+				this.getItemData()
+			}
 		}
 	}
 </script>

+ 50 - 48
pages/mobile/SonGroup.vue

@@ -18,61 +18,63 @@
 <script>
 	export default {
 		data() {
-			return {
-				epc_id:'',
-				token:'',
-				param:'',
-				access_time:'',
-				itemData:{},
-				itemList: [],
-				page:1,
-				total_page:1
+			return {
+				epc_id: '',
+				token: '',
+				param: '',
+				access_time: '',
+				itemData: {},
+				itemList: [],
+				page: 1,
+				total_page: 1
 			}
-		},
-		onLoad(opt) {
-			this.epc_id = opt.epc_id;
-			this.token = opt.token;
-			this.param = opt.param;
-			this.access_time = opt.access_time;
-			this.getItemData();
 		},
-		methods: {
-			// 配件组别
-			getItemData() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http('advancedEpc/findInModelPc', {
-					epc_id:this.epc_id,
-					token:this.token,
-					param:this.param,
-					access_time:this.access_time,
-					page:this.page
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					
-					this.itemData = res.data.result;
-					
-					this.total_page = res.data.result.total_page;
-					var list = res.data.result.list;
-					this.itemList = this.itemList.concat(list)
-			
-				});
+		onLoad(opt) {
+			this.epc_id = opt.epc_id;
+			this.token = opt.token;
+			this.param = opt.param;
+			this.access_time = opt.access_time;
+			this.getItemData();
+		},
+		methods: {
+			// 配件组别
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('advancedEpc/findInModelPc', {
+					epc_id: this.epc_id,
+					token: this.token,
+					param: this.param,
+					access_time: this.access_time,
+					page: this.page
+				}, 'GET').then(res => {
+					uni.hideLoading();
+
+					this.itemData = res.data.result;
+
+					this.total_page = res.data.result.total_page;
+					var list = res.data.result.list;
+					if (list.length != 0) {
+						this.itemList = this.itemList.concat(list)
+					}
+				});
 			},
-			goModelThree(item) {
+			goModelThree(item) {
 				// console.log('num==',item);
 				uni.navigateTo({
-					url: 'modelThree?epc_id=' + this.epc_id + '&token=' + item.token + '&param=' + item.param+ '&access_time=' + this.itemData.access_time + '&oemSearch=true'
-				
+					url: 'modelThree?epc_id=' + this.epc_id + '&token=' + item.token + '&param=' + item.param +
+						'&access_time=' + this.itemData.access_time + '&oemSearch=true'
+
 				})
 			}
-		},
-		onReachBottom() {
-			if (this.page <= this.total_page) {
-				this.page++;
-				
-				this.getItemData()()
-			}
+		},
+		onReachBottom() {
+			if (this.page <= this.total_page) {
+				this.page++;
+
+				this.getItemData()()
+			}
 		}
 	}
 </script>

+ 128 - 125
pages/mobile/modelThree.vue

@@ -3,8 +3,8 @@
 		<view class="top">
 			<image class="topIMg" :src=imgUrl mode="">
 			</image>
-			<image @click="previewImage(imgUrl)"
-				src="../../static/img/icon_fangda@2x.png" mode="" class="enlarge"></image>
+			<image @click="previewImage(imgUrl)" src="../../static/img/icon_fangda@2x.png" mode="" class="enlarge">
+			</image>
 		</view>
 		<view style="height: 20rpx;background: #F4F5F7;"></view>
 		<view class="mainBox">
@@ -47,19 +47,19 @@
 				epc_id: '',
 				token: '',
 				param: '',
-				access_time: '',
-				oemSearch:'',
+				access_time: '',
+				oemSearch: '',
 				groupData: [],
-				itemList: [],
-				imgUrl:'',
-				tabIndex:1,
-				son_vin: '',
-				son_epc_id: '',
-				son_token: '',
-				son_param: '',
-				son_access_time: '',
-				page:1,
-				total_page:1
+				itemList: [],
+				imgUrl: '',
+				tabIndex: 1,
+				son_vin: '',
+				son_epc_id: '',
+				son_token: '',
+				son_param: '',
+				son_access_time: '',
+				page: 1,
+				total_page: 1
 			}
 		},
 		onLoad(opt) {
@@ -68,100 +68,100 @@
 			this.epc_id = opt.epc_id;
 			this.token = opt.token;
 			this.param = opt.param;
-			this.access_time = opt.access_time;
-			this.oemSearch = opt.oemSearch;
-			
-			if (this.oemSearch == 'true') {
-				//oem搜索过来的,没有分组概念
-				
-				this.getPeijianData();
-			} else{
-				// this.getGroupData();
-			}
-			
+			this.access_time = opt.access_time;
+			this.oemSearch = opt.oemSearch;
+
+			if (this.oemSearch == 'true') {
+				//oem搜索过来的,没有分组概念
+
+				this.getPeijianData();
+			} else {
+				// this.getGroupData();
+			}
+
 		},
-		methods: {
-			upGroup() {
-				this.tabIndex -= 1;
-				if (this.tabIndex <= 0) {
-					this.tabIndex = 1
-				}
-				
-				this.son_param = this.groupData[this.tabIndex-1].param;
-				this.son_token = this.groupData[this.tabIndex-1].token;
-				
-				
-				this.getItemData();
-			},
-			downGroup(){
-				this.tabIndex += 1;
-				if (this.tabIndex >= this.groupData.length) {
-					this.tabIndex = this.groupData.length
-				}
-				
-				this.son_param = this.groupData[this.tabIndex-1].param;
-				this.son_token = this.groupData[this.tabIndex-1].token;
-				
-				
-				this.getItemData();
-			},
-			/*
-			// 车型子组列表
-			getGroupData() {
-				var that = this
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http('/advancedEpc/getSubgroupPc', {
-					vin: this.vin,
-					epc_id: this.epc_id,
-					token: this.token,
-					param: this.param,
-					access_time: this.access_time,
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					
-					this.groupData = res.data.result.list;
-					
-					this.son_epc_id = res.data.result.epc_id;
-					this.son_access_time = res.data.result.access_time;
-					
-					that.groupData.forEach((item, index) => {
-						if (item.group_no.includes(that.group_no)) {
-							console.log('有index',index);
-						}
-					})
-					this.son_param = this.groupData[0].param;
-					this.son_token = this.groupData[0].token;
-					
-					
-					that.getItemData();
-				});
-			},
-			*/
-		   // 子组配件列表
-		   getItemData() {
-		   	
-		   	uni.showLoading({
-		   		title: '加载中'
-		   	});
-		   	this.$http('/advancedEpc/getPartsPc', {
-		   		vin: this.son_vin,
-		   		epc_id: this.son_epc_id,
-		   		token: this.son_token,
-		   		param: this.son_param,
-		   		access_time: this.son_access_time,
-		   	}, 'GET').then(res => {
-		   		uni.hideLoading();
-		   		
-		   		this.itemList = res.data.result.list.rows;
-		   		this.imgUrl = res.data.result.list.image_info[0].pic_url;
-		   		console.log('itemList++',this.itemList);
-		   	});
-		   },
+		methods: {
+			upGroup() {
+				this.tabIndex -= 1;
+				if (this.tabIndex <= 0) {
+					this.tabIndex = 1
+				}
+
+				this.son_param = this.groupData[this.tabIndex - 1].param;
+				this.son_token = this.groupData[this.tabIndex - 1].token;
+
+
+				this.getItemData();
+			},
+			downGroup() {
+				this.tabIndex += 1;
+				if (this.tabIndex >= this.groupData.length) {
+					this.tabIndex = this.groupData.length
+				}
+
+				this.son_param = this.groupData[this.tabIndex - 1].param;
+				this.son_token = this.groupData[this.tabIndex - 1].token;
+
+
+				this.getItemData();
+			},
+			/*
+			// 车型子组列表
+			getGroupData() {
+				var that = this
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('/advancedEpc/getSubgroupPc', {
+					vin: this.vin,
+					epc_id: this.epc_id,
+					token: this.token,
+					param: this.param,
+					access_time: this.access_time,
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					
+					this.groupData = res.data.result.list;
+					
+					this.son_epc_id = res.data.result.epc_id;
+					this.son_access_time = res.data.result.access_time;
+					
+					that.groupData.forEach((item, index) => {
+						if (item.group_no.includes(that.group_no)) {
+							console.log('有index',index);
+						}
+					})
+					this.son_param = this.groupData[0].param;
+					this.son_token = this.groupData[0].token;
+					
+					
+					that.getItemData();
+				});
+			},
+			*/
+			// 子组配件列表
+			getItemData() {
+
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('/advancedEpc/getPartsPc', {
+					vin: this.son_vin,
+					epc_id: this.son_epc_id,
+					token: this.son_token,
+					param: this.son_param,
+					access_time: this.son_access_time,
+				}, 'GET').then(res => {
+					uni.hideLoading();
+
+					this.itemList = res.data.result.list.rows;
+					this.imgUrl = res.data.result.list.image_info[0].pic_url;
+					console.log('itemList++', this.itemList);
+				});
+			},
 			// oem子组配件列表
-			getPeijianData() {
-				
+			getPeijianData() {
+
 				uni.showLoading({
 					title: '加载中'
 				});
@@ -170,24 +170,27 @@
 					epc_id: this.epc_id,
 					token: this.token,
 					param: this.param,
-					access_time: this.access_time,
-					page:this.page,
+					access_time: this.access_time,
+					page: this.page,
 				}, 'GET').then(res => {
 					uni.hideLoading();
-					
-					
-					this.imgUrl = res.data.result.list.image_info[0].pic_url;
-					
-					this.total_page = res.data.result.total_page;
-					
-					var list = res.data.result.list.rows;
-					this.itemList = this.itemList.concat(list)
-					console.log('itemList++',this.itemList);
+
+
+					this.imgUrl = res.data.result.list.image_info[0].pic_url;
+
+					this.total_page = res.data.result.total_page;
+
+					var list = res.data.result.list.rows;
+					if (list.length != 0) {
+						this.itemList = this.itemList.concat(list)
+					}
+					console.log('itemList++', this.itemList);
 				});
 			},
 			goOemDetail(item) {
 				uni.navigateTo({
-					url: 'OemDetail?epc_id=' + this.epc_id + '&partsnum=' + item.partnum+ '&weizhi=' + item.refernum+ '&yongliang=' + item.qty
+					url: 'OemDetail?epc_id=' + this.epc_id + '&partsnum=' + item.partnum + '&weizhi=' + item
+						.refernum + '&yongliang=' + item.qty
 				})
 			},
 			previewImage(imgUrl) {
@@ -210,13 +213,13 @@
 					}
 				});
 			}
-		},
-		onReachBottom() {
-			if (this.page <= this.total_page) {
-				this.page++;
-				
-				this.getPeijianData()
-			}
+		},
+		onReachBottom() {
+			if (this.page <= this.total_page) {
+				this.page++;
+
+				this.getPeijianData()
+			}
 		}
 	}
 </script>