guo hace 2 años
padre
commit
82f4213029

+ 1 - 1
pages/mobile/CarModelList.vue

@@ -28,7 +28,7 @@
 
 					<view class="oneBox">
 						<view class="comtent2">
-							<view class="left2" style="width: 28%;">变箱:</view>
+							<view class="left2" style="width: 28%;">变箱:</view>
 							<view class="right2">{{item.trans}}</view>
 						</view>
 						<view class="comtent2">

+ 16 - 5
pages/mobile/OemSearch.vue

@@ -25,11 +25,11 @@
 		</view> -->
 
 
-		<view class="commentBox" v-for="(item,index) in itemList" :key="index">
+		<view @click="goCarModelList(item.partnum)" class="commentBox" v-for="(item,index) in itemList" :key="index">
 
 			<view class="name">{{item.caption}}</view>
 			<view class="comment">{{item.description}}</view>
-			<view @click="goCarModelList(item.partnum)" class="code">{{item.extened}}</view>
+			<view class="code">{{item.extened}}</view>
 		</view>
 
 
@@ -52,7 +52,11 @@
 				itemList: [],
 				brandList: [],
 				brand: '',
-				epc_id: '',
+				epc_id: '',
+				vin:'',
+				token:'',
+				param:'',
+				access_time:'',
 				page: 1,
 				total_page: 1
 			}
@@ -61,7 +65,10 @@
 			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.access_time = opt.access_time;
 			
 		},
 		methods: {
@@ -87,7 +94,11 @@
 				});
 				this.$http('advancedEpc/findParts', {
 					epc_id: this.epc_id,
-					keyword: this.searchValue,
+					keyword: this.searchValue,
+					vin:this.vin,
+					token: this.token,
+					param: this.param,
+					access_time:this.access_time,
 					page: this.page,
 				}, 'GET').then(res => {
 					uni.hideLoading();

+ 1 - 1
pages/mobile/SonGroup.vue

@@ -64,7 +64,7 @@
 				// 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'
+						'&access_time=' + this.itemData.access_time
 
 				})
 			}

+ 5 - 2
pages/mobile/group.vue

@@ -99,7 +99,9 @@
 						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;
+						this.epc_id = res.data.result.epc_id;
+						this.token = res.data.result.list[0].token;
+						this.param = res.data.result.list[0].param;
 						if (res.data.result.restrains.length > 0) {
 							this.restrains = res.data.result.restrains;
 							this.restrainShow = true;
@@ -168,7 +170,8 @@
 			},
 			goOemSearch() {
 				uni.navigateTo({
-					url: 'OemSearch?brand=' + this.brand_name + '&epc_id=' + this.epc_id
+					url: 'OemSearch?brand=' + this.brand_name + '&epc_id=' + this.epc_id + '&vin=' + this.vin + '&param=' + this.param +
+						'&token=' + this.token + '&access_time=' + this.access_time
 				})
 			},
 			goback() {

+ 8 - 95
pages/mobile/modelThree.vue

@@ -17,17 +17,7 @@
 		</view>
 		<view style="height: 20rpx;background: #F4F5F7;"></view>
 		<view class="mainBox">
-			<!-- <view v-if="oemSearch == false" class="mainTop">
-				<view class="arrowBox">
-					<image src="../../static/img/icon_arrow_blue_l@2x.png" mode="" class="arrow"></image>
-					<view class="title" @click="upGroup">上一组</view>
-				</view>
-				<view class="page">{{tabIndex}}/{{groupData.length}}</view>
-				<view class="arrowBox">
-					<view class="title" @click="downGroup">下一组</view>
-					<image src="../../static/img/icon_arrow_blue_r@2x.png" mode="" class="arrow"></image>
-				</view>
-			</view> -->
+			
 
 			<view class="commentBox" v-for="(item,index) in itemList" :key="index">
 				<view class="line">
@@ -57,7 +47,7 @@
 				token: '',
 				param: '',
 				access_time: '',
-				oemSearch: '',
+				
 				groupData: [],
 				itemList: [],
 				bannerArr: [],
@@ -78,96 +68,19 @@
 			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();
-			}
+			
 
 		},
 		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/getSubgroup', {
-					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/getParts', {
-					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.bannerArr = res.data.result.list.image_info;
-					console.log('itemList++', this.itemList);
-				});
-			},
+			
+			
+			
 			// oem子组配件列表
 			getPeijianData() {
 

+ 12 - 23
pages/mobile/modelTwo.vue

@@ -118,7 +118,8 @@
 		methods: {
 			goOemSearch(){
 				uni.navigateTo({
-					url:'OemSearch?brand='+ this.brand_name + '&epc_id=' + this.epc_id
+					url:'OemSearch?brand='+ this.brand_name + '&epc_id=' + this.epc_id + '&vin=' + this.vin + '&param=' + this.param +
+						'&token=' + this.token + '&access_time=' + this.access_time
 				})
 			},
 			goback() {
@@ -332,7 +333,8 @@
 
 	.content {
 		background: #F4F5F7;
-		min-height: 100vh;
+		min-height: 100vh;
+		width: 100vw;
 		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 	}
@@ -465,7 +467,8 @@
 	}
 
 	.mainBox {
-		background: #FFFFFF;
+		background: #FFFFFF;
+		width: 100vw;
 	}
 
 	.maintitle {
@@ -506,7 +509,7 @@
 
 	.mainLine {
 		display: flex;
-
+		width: 100vw;
 		border-bottom: 1px solid #EEEEEE;
 		padding: 29rpx 24rpx;
 	}
@@ -517,15 +520,8 @@
 		font-weight: bold;
 		color: #333333;
 		line-height: 40rpx;
-		width: 570rpx;
-		word-wrap: break-word;
-		/*强制换行*/
-		overflow: hidden;
-		/*超出隐藏*/
-		text-overflow: ellipsis;
-		/*隐藏后添加省略号*/
-		white-space: nowrap;
-		/*强制不换行*/
+		
+		
 	}
 
 	.mainLine2 {
@@ -549,7 +545,8 @@
 	}
 
 	.lineRIght {
-		padding-left: 20rpx;
+		padding-left: 20rpx;
+		padding-right: 24rpx;
 	}
 
 	.lineBm {
@@ -565,14 +562,6 @@
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #999999;
-		width: 570rpx;
-		word-wrap: break-word;
-		/*强制换行*/
-		overflow: hidden;
-		/*超出隐藏*/
-		text-overflow: ellipsis;
-		/*隐藏后添加省略号*/
-		white-space: nowrap;
-		/*强制不换行*/
+		
 	}
 </style>

+ 12 - 76
pages/mobile/vinDetail.vue

@@ -19,7 +19,7 @@
 		</view>
 		<view style="height: 20rpx;background: #F4F5F7;"></view>
 		<view class="mainBox">
-			<view v-if="oemSearch == false" class="mainTop">
+			<view class="mainTop">
 				<view v-if="tabIndex > 1" class="arrowBox">
 					<image src="../../static/img/icon_arrow_blue_l@2x.png" mode="" class="arrow"></image>
 					<view class="title" @click="upGroup">上一组</view>
@@ -47,7 +47,7 @@
 				<view class="name">{{item.description}}</view>
 				<view class="comment">{{item.remark}}</view>
 				<view class="forLine">
-					<view @click="goOemDetail(item)" class="code">{{item.extened}}</view>
+					<view @click="goOemDetail(item)" class="code">{{item.extened.join()}}</view>
 					<view class="price">4S店价:
 						<span class="orangePrice">¥ {{item.price}}</span>
 					</view>
@@ -67,16 +67,11 @@
 				token: '',
 				param: '',
 				access_time: '',
-				oemSearch: '',
+				
 				groupData: [],
 				itemList: [],
 				bannerArr: [],
 				tabIndex: 1,
-				son_vin: '',
-				son_epc_id: '',
-				son_token: '',
-				son_param: '',
-				son_access_time: '',
 				page: 1,
 				total_page: 1
 			}
@@ -89,7 +84,7 @@
 			this.token = opt.token;
 			this.param = opt.param;
 			this.access_time = opt.access_time;
-			this.getPeijianData();
+			this.getItemData();
 
 
 		},
@@ -100,8 +95,8 @@
 					this.tabIndex = 1
 				}
 
-				this.son_param = this.groupData[this.tabIndex - 1].param;
-				this.son_token = this.groupData[this.tabIndex - 1].token;
+				this.param = this.groupData[this.tabIndex - 1].param;
+				this.token = this.groupData[this.tabIndex - 1].token;
 
 
 				this.getItemData();
@@ -112,68 +107,16 @@
 					this.tabIndex = this.groupData.length
 				}
 
-				this.son_param = this.groupData[this.tabIndex - 1].param;
-				this.son_token = this.groupData[this.tabIndex - 1].token;
+				this.param = this.groupData[this.tabIndex - 1].param;
+				this.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/getParts', {
-					vin: this.vin,
-					token: this.son_token,
-					param: this.son_param,
-					access_time: this.access_time,
-				}, 'GET').then(res => {
-					uni.hideLoading();
-
-					this.itemList = res.data.result.list.rows;
-					this.bannerArr = res.data.result.list.image_info;
-					console.log('itemList++', this.itemList);
-				});
-			},
-			// oem子组配件列表
-			getPeijianData() {
-
 				uni.showLoading({
 					title: '加载中'
 				});
@@ -182,22 +125,15 @@
 					token: this.token,
 					param: this.param,
 					access_time: this.access_time,
-					page: this.page,
 				}, 'GET').then(res => {
 					uni.hideLoading();
-
-
+					this.epc_id = res.data.result.epc_id;
+					this.itemList = res.data.result.list.rows;
 					this.bannerArr = res.data.result.list.image_info;
-
-					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