Browse Source

接口对接

twt 1 week ago
parent
commit
949116f020

+ 1 - 1
manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx7b55d68810dd6f1f",
+        "appid" : "wx95baeb5896f4769c",
         "setting" : {
             "urlCheck" : false
         },

+ 7 - 0
pages.json

@@ -9,6 +9,13 @@
 		}, */
 		{
 			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "巨江电源"
+				//"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/index/index2",
 			"style": {
 				"navigationBarTitleText": "用油查询",
 				"navigationStyle": "custom"

+ 119 - 31
pages/index/goodsList.vue

@@ -9,8 +9,11 @@
 				<view>
 					<view class="historylinecar">{{optdata.value}}</view>
 					<view class="historyLineVin" v-if="optdata.isVin==1"><!--  -->
-						<view class="vinms">VIN</view>
-						<view class="vinNum">{{optdata.vin}}</view>
+					     <view style="display: flex;">
+							 <view class="vinms">VIN</view>
+							 <view class="vinNum">{{optdata.vin}}</view>
+						 </view>
+						
 						<view class="copyVin">复制</view>
 					</view>
 				</view>
@@ -21,7 +24,7 @@
 				<view class="topBtn" @click="gopz">车辆详情</view>
 			</view>
 		</view>
-		<view class="cont">
+		<view class="goodscont">
 			<!-- <view class="topBox">
 				<view class="topLine" @click="goby">
 					<image src="../../static/img/icon_baoyang.png" mode="" class="toplineImg"></image>
@@ -33,26 +36,33 @@
 					<view class="topName">车辆配置</view>
 				</view>
 			</view> -->
+			<view class="goosLeft">
+				<view class="goodsLefeLine" :class="{glActive:leftIndex==index}"
+				 @click="leftFn(index,item)" v-for="(item,index) in leftData">
+					<view class="glName">{{item.name}}</view>
+				</view>
+			</view>
 			<view class="jiyouBox" v-if="loading">
-				 <!-- <view class="modelRemarkBox">
-					<view class="modelRemarkLine" @click="modelRemarkTab(1)" :class="{activeMr:modelRemarkNum==1}">0-10万公里</view>
-					<view class="modelRemarkLine" @click="modelRemarkTab(2)" :class="{activeMr:modelRemarkNum==2}">10万公里以上</view>
-				</view> -->
+				
 				<view class="brandBox">
-					<view class="brandBtn" :class="{brandActive:type==1}" @click="ckBrand(1)">阿诺德</view>
+					<!-- <view class="brandBtn" :class="{brandActive:type==1}" @click="ckBrand(1)">阿诺德</view>
 					<view class="brandBtn" :class="{brandActive:type==2}" @click="ckBrand(2)">鸿雁</view>
 					<view class="brandBtn" :class="{brandActive:type==3}" @click="ckBrand(3)">三冠</view>
-					<view class="brandBtn" :class="{brandActive:type==4}" @click="ckBrand(4)">威斯康</view>
+					<view class="brandBtn" :class="{brandActive:type==4}" @click="ckBrand(4)">威斯康</view> -->
+					<view class="brandBtn" v-for="(item,index) in brandList" :class="{brandActive:item.ck}" @click="ckBrand(item)">{{item.name}}</view>
+				</view>
+				<view class="ckName">
+					{{componentName}}
 				</view>
 				<view class="jylineBox">
-					<view class="jyline" v-for="(item,index) in 5" @click="godetail(item)"><!-- MaintainPartList -->
+					<view class="jyline" v-for="(item,index) in MaintainPartList" @click="godetail(item)"><!-- MaintainPartList -->
 						<view class="jyimgBox">
-							<!-- <image v-if="item.imgs.split(',')[0]" :src="item.imgs.split(',')[0]" mode="aspectFit" class="jyimg"></image> -->
-							<image  src="../../static/img/noimg.png" mode="aspectFit" class="jyimg"></image>
+						    <image v-if="item.imgs.split(',')[0]" :src="item.imgs.split(',')[0]" mode="aspectFit" class="jyimg"></image>
+							<image v-else src="../../static/img/noimg.png" mode="aspectFit" class="jyimg"></image>
 						</view>
 						<view class="lineRgiht">
-							<view class="goodsName">品牌 规格型号</view>
-							<view class="goodsMs">长了就换行显示,不要省略,长了就换行显示,不要省略,长了就换行显示,不要省略</view>
+							<view class="goodsName">{{item.name}}| {{item.partsCode}}</view>
+							<view class="goodsMs">{{item.specificationModel}} </view>
 						</view>
 						
 					</view>
@@ -100,6 +110,21 @@
 			   modelRemarkNum:1,
 			   oldMaintainPartList:'',
 			   type:'',
+			   leftIndex:0,
+			   leftData:[
+				   {name:'机油',componentCode:'015001'},
+				   {name:'变速箱油',componentCode:'007005'},
+				   {name:'变速箱滤清器',componentCode:'007004'},
+				   {name:'雨刷',componentCode:'006004'},
+			   ],
+			   componentCode:'015001',
+			   componentName:'机油',
+			   brandList:[
+				   {name:'欧洲维修',id:'69c6828c-8994-4d2e-8c25-a89c05e13b18',ck:false},
+				   {name:'美孚',id:'05897c44-8852-449a-8165-ba7a8675a16c',ck:false},
+				   {name:'嘉实多',id:'2f0b65aa-4945-4962-b794-7e2cd35685a8',ck:false},
+			   ],
+			   brandId:'',
 			}
 		},
 		onLoad(opt) {
@@ -113,12 +138,27 @@
 			  this.queryOilInfoByGroupID()
 		},
 		methods: {
-		    ckBrand(num){
-			  this.type=num	
+			leftFn(index,item){
+			  this.leftIndex=index
+			  this.componentCode=item.componentCode
+			  this.componentName=item.name
+			  this.queryMaintainPartList()
+			},
+		    ckBrand(item){
+				item.ck=!item.ck
+			  //this.type=num	
+			  var ids=[]
+			  this.brandList.forEach(item=>{
+				  if(item.ck){
+					  ids.push(item.id)
+				  }
+			  })
+			  this.brandId=ids.join(',')
+			  this.queryMaintainPartList()
 			},
 			goinstallation(){
 			   uni.navigateTo({
-			   	url:'installation?groupIds='+this.optdata.id+'&componentId='
+			   	url:'installation?groupIds='+this.optdata.id+'&componentCode='+this.componentCode
 			   })	
 			},
 			 modelRemarkTab(num){
@@ -161,11 +201,21 @@
              queryMaintainPartList(){
 				 this.loading=false;
 				 uni.showLoading({ title: '加载中'});
-				 this.$http('partsByOpen/queryMaintainPartList', {
-				   groupId:this.optdata.id,
-				   componentCode:'015001',
-				   
-				  },'POST').then(res => {
+				 if(this.componentCode){
+					 var json={
+						 groupId:this.optdata.id,
+						 componentCode:this.componentCode,
+						 brandId:this.brandId
+					 }
+				 }else{
+					 var json={
+					 	 groupId:this.optdata.id,
+					 	 brandId:this.brandId				 
+					 }
+					 
+				 }
+				
+				 this.$http('partsByOpen/queryMaintainPartList', json,'POST').then(res => {
 					  this.loading=true;
 				 	  uni.hideLoading();
 				 	  this.MaintainPartList=res.data
@@ -211,15 +261,31 @@
 </script>
 
 <style scoped>
+.goodscont{
+	display: flex;margin-top: 20rpx;
+}
 .salesLine{
 	display: flex;
 	font-size: 24rpx;
 	line-height: 30rpx;
 	padding: 20rpx 0;
 }
+.goodsLefeLine{
+	display: flex;justify-content: center;
+	padding: 22rpx 0;
+}
+.brandBox {
+	padding: 30rpx 20rpx;
+}
+.goosLeft{
+	width: 160rpx;
+	font-size: 26rpx;
+	color: #3C3C3C;
+}
 .salesLeft{
 	width: 200rpx;
 	color: #999999;
+	
 }
 	.content {
 		min-height: 100vh;
@@ -288,9 +354,10 @@ color: #FFFFFF;font-size: 28rpx;padding-left: 16rpx;
 		display: flex;justify-content: space-between;
 	}
 	.jiyouBox{
-		margin-top: 30rpx;
+		/* margin-top: 30rpx; */
 		background: #ffffff;
-		padding: 30rpx;
+		/* padding: 30rpx; */
+		width: 590rpx;
 	}
 	.jiyoutopTitle{
 		font-weight: 500;font-size: 28rpx;
@@ -307,8 +374,9 @@ color: #FFFFFF;font-size: 28rpx;padding-left: 16rpx;
 		border-radius: 10rpx;
 	}
 	.jyline{
-		padding-top: 30rpx;
+		padding: 24rpx 20rpx;
 		display: flex;
+		border-bottom: 1px solid #EEEEEE;
 	}
 	.jyName{
 		font-weight: 400;font-size: 22rpx;
@@ -329,7 +397,7 @@ color: #FFFFFF;font-size: 28rpx;padding-left: 16rpx;
 		/* display: flex;justify-content: space-between;flex-wrap: wrap; */
 	}
 	.historyLineVin{
-		display: flex;background: #ffffff;
+		display: flex;background: #ffffff;justify-content: space-between;
 	}
 	.historyLineCar{
 		display: flex;justify-content: space-between;
@@ -390,14 +458,11 @@ color: #FFFFFF;font-size: 28rpx;padding-left: 16rpx;
 	.copyVin{
 		font-weight: 400;
 		font-size: 22rpx;
-		color: #3C3C3C;
+		color:#3F90F7;
 		width: 62rpx;
 		height: 34rpx;
-		background: #F4F5F7;
-		border-radius: 4rpx;
 		line-height: 34rpx;
-		text-align: center;
-		margin-left: 16rpx;
+		text-align: right;
 	}
 	.brandBox{
 		display: flex;
@@ -429,4 +494,27 @@ color: #FFFFFF;font-size: 28rpx;padding-left: 16rpx;
 		border-radius: 6rpx;
 		color: #FF4F00;
 	}
+.glActive{
+	background: #ffffff;
+}
+.glActive .glName{
+font-weight: 500;
+font-size: 26rpx;
+color: #E60006;
+border-left:4rpx solid #E60006;
+}
+.glName{
+	padding: 0 16rpx;
+}
+.ckName{
+	width: 532rpx;
+	height: 60rpx;
+	background: #F6F6F6;
+	border-radius: 4rpx;
+	font-size: 24rpx;
+	color: #3C3C3C;
+	line-height: 60rpx;
+	margin-left: 20rpx;
+	padding-left: 20rpx;
+}
 </style>

+ 111 - 147
pages/index/index.vue

@@ -1,161 +1,39 @@
 <template>
 	<view class="content">
-		<!-- <view class="top">
-			
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view style="height: 43px;"></view>
-			<view class="searchBox">
-				<view class="searchInputBox" @click="goSearch">
-					<image src="../../static/img/icon_search.png" mode="" class="simg"></image>
-					<input type="text" placeholder="请输入车辆品牌、车系或VIN码" placeholder-class="ip" class="ssinput">
-				</view>
-				<view class="st" @click="stBtn">
-				   <image src="../../static/img/icon_shitu.png" mode="" class="stimg"></image>
-				   <view class="shitu">识图</view>
-				</view>
-				
-			</view>
-		</view> -->
 		
-		<!-- 历史查询 -->
-	<!-- 	<view class="historybox ">
-			<view class="history">
-				<view class="historyTop" @click="gohistory">
-					<view class="historyTitle">历史查询</view>
-					<image src="../../static/img/icon_arrow.png" mode="" class="jiantouimg"></image>
+		<view class="bigBox">
+			<image class="bigImg" src="http://dmsphoto.66km.com.cn/thFiles/A9157023-4939-48B7-BB49-D9D8113EF953.jpg" mode=""></image>
+		    <view class="ssBox"  v-if="bIndex==2">
+		    	<view class="ssView" @click="goSearch">
+					<image class="newSImg" src="/static/img/newS.png" mode=""></image>
+					<input type="text" class="sInput" placeholder-style="color:#C4C4C4" placeholder="请输入车辆品牌、车系或VIN码"/>
 				</view>
-				<view class="historyLine" v-for="(item,index) in historyList" v-if="index<3" @click="gocarDetail(item)">
-					<view class="historyLogoBox">
-						<image :src="item.logo" mode="" class="historylinecarImg"></image>
-					</view>
-					
-					<view class="historylinecar">{{item.title}}</view>
-				</view>
-			</view>
-		</view> -->
-		<!-- <view :style="{height: aaa}" class="aaaaa"></view> -->
-		<!-- <view @click="wy">asdfasdfasdfas</view> -->
-		<!-- <carModel ref="carModelView" :iStatusBarHeight="iStatusBarHeight" :svHeight="aaa"></carModel> -->
-		
-		<!-- 选择车型 -->
-	<!-- 	<view class="ckcarBox" v-if="ckCarShow" >
-			<view class="ckcar" @click.stop="">
-				<view class="ckcarTop flex">
-					<view class="ckcarTitle">请选择车型</view>
-					<image src="../../static/img/icon_quxiao.png" mode="" class="ckcarClose" @click="ckcarClose"></image>
-				</view>
-				<view class="ckcarlineBox"  v-for="(item,index) in moreVinList" @click="gobyItem(item)">
-					<view class="ckcarline flex">
-						<view class="ckcarLeft">{{item.title}}</view>
-						<image src="../../static/img/icon_arrow.png" mode="" class="ckcarJtimg"></image>
-					</view>
+		    </view>
+			<view class="ssBox"  v-if="bIndex==3">
+				<view class="ssView" >
+					<image @click="goSearch" class="newSImg" src="/static/img/newS.png" mode=""></image>
+					<input @click="goSearch" type="text" class="sInput" placeholder-style="color:#C4C4C4" placeholder="请输入车辆品牌、车系或VIN码"/>
+				    <image @click="stBtn" class="newSbImg" src="/static/img/newSb.png" mode=""></image>
 				</view>
 			</view>
 		</view>
-		 -->
-		 <view class="viewBox" v-if="tabIndex==1">
-			 <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			 <view style="height: 43px;"></view>
-			 <view class="topNavBox">
-			 	<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			 	<view class="indexnav">巨江电源</view>
+		
+		
+		 <view class="bottomBox">
+			 <view class="bottomLine" @click="bFn(1)">
+				 <image class="indexbg" v-if="bIndex==1" src="/static/img/indexbg.png" mode=""></image>
+				 <span class="bottomLineTxt" :class="{bAciveTxt:bIndex==1}">车型</span> 
 			 </view>
-			 <!-- 轮播-->
-			 <view class="swpBox">
-			 			 <swiper class="swiperTk" circular  :autoplay="true" :interval="interval"
-			 			 				:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
-			 			 	<swiper-item >
-			 			 		<view class="swiper-itemTk" >
-			 			 			<image class="tkHdImg" src="http://dmsphoto.66km.com.cn/thFiles/06A3DFF0-2663-4CF2-B9F3-2AA99C9C59EA.png" mode="widthFix"></image>
-			 			 		</view>	
-			 			 	</swiper-item>
-			 				<swiper-item >
-			 					<view class="swiper-itemTk" >
-			 						<image class="tkHdImg" src="http://dmsphoto.66km.com.cn/thFiles/37B94D9D-5D8A-4754-9BBF-5715C1B5F665.jpg" mode="widthFix"></image>
-			 					</view>	
-			 				</swiper-item>
-			 			 </swiper>
+			 <view class="bottomLine" @click="bFn(2)">
+			 <image class="indexbg" v-if="bIndex==2" src="/static/img/indexbg.png" mode=""></image>
+			 <span class="bottomLineTxt" :class="{bAciveTxt:bIndex==2}">搜索</span> 
 			 </view>
-			 
-			 <view class="contBox">
-			 			 <view class="vincar">
-			 				 <view class="vincarTab">
-			 					  <view class="vincarTabLine anVin " :class="{vincarActive:vincarActiveNum==1}" @click="vincarActiveFn(1)">按VIN</view>
-			 					  <view class="vincarTabLine" style="margin-right: 50rpx;" @click="goCarModel">按车型</view>
-								  <view class="vincarTabLine" :class="{vincarActive:vincarActiveNum==3}" @click="vincarActiveFn(3)">按商品</view>
-			 				 </view>
-			 				 <view class="inputsBox" v-if="vincarActiveNum==1">
-			 					 <view class="searchInputBox" @click="goSearch">
-			 					 	<image src="../../static/img/icon_search.png" mode="" class="simg"></image>
-			 					 	<input type="text" placeholder="请输入车辆品牌、车系或VIN码" placeholder-class="ip" class="ssinput">
-			 					 </view>
-			 					 <view class="inputsBtn">查询</view>
-			 				 </view>
-							 <view class="inputsBox" v-if="vincarActiveNum==3">
-									 <view class="searchInputBox" @click="goSgoods">
-										<image src="../../static/img/icon_search.png" mode="" class="simg"></image>
-										<input type="text" placeholder="请输入品牌" placeholder-class="ip" class="ssinput">
-									 </view>
-									 <view class="inputsBtn">查询</view>
-							 </view>
-			 				 <view class="historyBox"  v-if="vincarActiveNum==1">
-			 					 <view class="historyLeft" >
-			 						 <view class="historyLeftTxt">历史查询:</view>
-									 <view v-if="historyvinLoding">
-										 <view class="historyLeftNum" @click="gocarDetail" v-if="historyvin">{{historyvin}}	</view>
-										 <view class="historyLeftNum" v-else>暂无</view>
-									 </view>
-			 						
-			 					 </view>
-			 					 <view class="historyMore" @click="gohistory">更多
-			 					   <image src="../../static/img/lanjt.png" mode="" class="lanjt"></image>
-			 					 </view>
-			 				 </view>
-			 			 </view>
-			 			 
-			 			 <view class="productBox"  v-if="vincarActiveNum==1">
-			 			 		<view class="productTitle">产品列表</view>
-			 					<view class="productLinBox">
-			 						<view class="productLine" @click="goCarModelType(1)">
-			 							<image class="productImg" src="/static/img/and.png" mode=""></image>
-			 							<view class="productTxt" >阿诺德</view>
-			 						</view>
-			 						<view class="productLine" @click="goCarModelType(2)">
-			 							<image class="productImg" src="/static/img/hy.png" mode=""></image>
-			 							<view class="productTxt" >鸿雁</view>
-			 						</view>
-			 						<view class="productLine" @click="goCarModelType(3)">
-			 							<image class="productImg" src="/static/img/sg.png" mode=""></image>
-			 							<view class="productTxt" >三冠</view>
-			 						</view>
-			 						<view class="productLine" @click="goCarModelType(4)">
-			 							<image class="productImg" src="/static/img/wsk.png" mode=""></image>
-			 							<view class="productTxt" >威斯康</view>
-			 						</view>
-			 					</view>
-			 			 </view>
-			 			 
-			 			 
+			 <view class="bottomLine" @click="bFn(3)">
+				 <image class="indexbg" v-if="bIndex==3" src="/static/img/indexbg.png" mode=""></image>
+				 <span class="bottomLineTxt" :class="{bAciveTxt:bIndex==3}">VIN码</span> 
 			 </view>
-			 
+			
 		 </view>
-	    <user v-if="tabIndex==2" :iStatusBarHeight="iStatusBarHeight"></user>
-		<view class="bTabBox">
-			<view class="btabLine" @click="tabFn(1)">
-				<image class="btabLineImg" v-if="tabIndex==1" src="/static/img/index1.png" mode=""></image>
-				<image class="btabLineImg" v-if="tabIndex==2" src="/static/img/index2.png" mode=""></image>
-				<view class="btabLineTxt">首页</view>
-			</view>
-			<view class="btabLine">
-				<image @click="stBtn" class="btabLineImg2" src="/static/img/vin.png" mode=""></image>
-			</view>
-			<view class="btabLine" @click="tabFn(2)">
-				<image class="btabLineImg"  v-if="tabIndex==2"  src="/static/img/user1.png" mode=""></image>
-				<image class="btabLineImg"  v-if="tabIndex==1"  src="/static/img/user2.png" mode=""></image>
-				<view class="btabLineTxt">我的</view>
-			</view>
-		</view>
-		 
 	</view>
 </template>
 
@@ -185,6 +63,7 @@
 				byItem:'',
 				historyvinLoding:false,
 				vincarActiveNum:1,
+				bIndex:2,
 			}
 		},
 		onLoad() {
@@ -207,6 +86,14 @@
 			}
 		},
 		methods: {
+			bFn(num){
+			  this.bIndex=num	
+			  if(num==1){
+				  uni.navigateTo({
+				  	  url:'carModel2'
+				  })
+			  }
+			},
 			vincarActiveFn(num){
 				this.vincarActiveNum=num
 			},
@@ -458,6 +345,83 @@
 </script>
 
 <style scoped>
+.bottomBox{
+	width: 100%;
+	height: 87rpx;
+	background: #39434F;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	display: flex;
+	z-index: 11;
+}	
+.bottomLine{
+	width: 250rpx;
+	line-height: 87rpx;
+	text-align: center;
+	font-weight: 400;
+	font-size: 29rpx;
+	color: #7A8490;
+	position: relative;
+}
+.bAciveTxt{
+	font-weight: 500;
+	font-size: 34rpx;
+	color: #FFFFFF;
+	position: relative;
+	z-index: 111;
+}
+.indexbg{
+	width: 250rpx;
+	height: 87rpx;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+.bigBox{
+	width: 100%;
+	height: 100vh;
+	position: relative;
+	/* background: url('http://dmsphoto.66km.com.cn/thFiles/A9157023-4939-48B7-BB49-D9D8113EF953.jpg') no-repeat;
+	background-size: 100%; */
+}
+.bigImg{
+	position: absolute;
+	width: 100%;
+	height: 100vh;
+	top: 0;
+	left: 0;
+}
+.ssBox{
+	width: 676rpx;
+	background: rgba(0, 0, 0, 0.7);
+	position: absolute;
+	left: 37rpx;
+	top: 200rpx;
+	padding: 40rpx 0;
+}
+.ssView{
+	width: 595rpx;
+	height: 78rpx;
+	background: #646464;
+	display: flex;
+	margin-left: 40rpx;
+}
+.newSImg{
+	width: 40rpx;height: 40rpx;
+	margin-top: 20rpx;margin-left: 10rpx;
+}
+.sInput{
+ height: 78rpx;line-height: 78rpx;padding-left: 20rpx;font-size: 28rpx;
+ width: 450rpx;
+}
+.newSbImg{
+	width: 45rpx;height: 42rpx;
+	margin-top: 20rpx;
+}
+/*  */	
 .contBox{
 	padding: 0 24rpx;
 }

+ 729 - 0
pages/index/index2.vue

@@ -0,0 +1,729 @@
+<template>
+	<view class="content">
+		<!-- <view class="top">
+			
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view style="height: 43px;"></view>
+			<view class="searchBox">
+				<view class="searchInputBox" @click="goSearch">
+					<image src="../../static/img/icon_search.png" mode="" class="simg"></image>
+					<input type="text" placeholder="请输入车辆品牌、车系或VIN码" placeholder-class="ip" class="ssinput">
+				</view>
+				<view class="st" @click="stBtn">
+				   <image src="../../static/img/icon_shitu.png" mode="" class="stimg"></image>
+				   <view class="shitu">识图</view>
+				</view>
+				
+			</view>
+		</view> -->
+		
+		<!-- 历史查询 -->
+	<!-- 	<view class="historybox ">
+			<view class="history">
+				<view class="historyTop" @click="gohistory">
+					<view class="historyTitle">历史查询</view>
+					<image src="../../static/img/icon_arrow.png" mode="" class="jiantouimg"></image>
+				</view>
+				<view class="historyLine" v-for="(item,index) in historyList" v-if="index<3" @click="gocarDetail(item)">
+					<view class="historyLogoBox">
+						<image :src="item.logo" mode="" class="historylinecarImg"></image>
+					</view>
+					
+					<view class="historylinecar">{{item.title}}</view>
+				</view>
+			</view>
+		</view> -->
+		<!-- <view :style="{height: aaa}" class="aaaaa"></view> -->
+		<!-- <view @click="wy">asdfasdfasdfas</view> -->
+		<!-- <carModel ref="carModelView" :iStatusBarHeight="iStatusBarHeight" :svHeight="aaa"></carModel> -->
+		
+		<!-- 选择车型 -->
+	<!-- 	<view class="ckcarBox" v-if="ckCarShow" >
+			<view class="ckcar" @click.stop="">
+				<view class="ckcarTop flex">
+					<view class="ckcarTitle">请选择车型</view>
+					<image src="../../static/img/icon_quxiao.png" mode="" class="ckcarClose" @click="ckcarClose"></image>
+				</view>
+				<view class="ckcarlineBox"  v-for="(item,index) in moreVinList" @click="gobyItem(item)">
+					<view class="ckcarline flex">
+						<view class="ckcarLeft">{{item.title}}</view>
+						<image src="../../static/img/icon_arrow.png" mode="" class="ckcarJtimg"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		 -->
+		 <view class="viewBox" v-if="tabIndex==1">
+			 <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			 <view style="height: 43px;"></view>
+			 <view class="topNavBox">
+			 	<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			 	<view class="indexnav">巨江电源</view>
+			 </view>
+			 <!-- 轮播-->
+			 <view class="swpBox">
+			 			 <swiper class="swiperTk" circular  :autoplay="true" :interval="interval"
+			 			 				:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
+			 			 	<swiper-item >
+			 			 		<view class="swiper-itemTk" >
+			 			 			<image class="tkHdImg" src="http://dmsphoto.66km.com.cn/thFiles/06A3DFF0-2663-4CF2-B9F3-2AA99C9C59EA.png" mode="widthFix"></image>
+			 			 		</view>	
+			 			 	</swiper-item>
+			 				<swiper-item >
+			 					<view class="swiper-itemTk" >
+			 						<image class="tkHdImg" src="http://dmsphoto.66km.com.cn/thFiles/37B94D9D-5D8A-4754-9BBF-5715C1B5F665.jpg" mode="widthFix"></image>
+			 					</view>	
+			 				</swiper-item>
+			 			 </swiper>
+			 </view>
+			 
+			 <view class="contBox">
+			 			 <view class="vincar">
+			 				 <view class="vincarTab">
+			 					  <view class="vincarTabLine anVin " :class="{vincarActive:vincarActiveNum==1}" @click="vincarActiveFn(1)">按VIN</view>
+			 					  <view class="vincarTabLine" style="margin-right: 50rpx;" @click="goCarModel">按车型</view>
+								  <view class="vincarTabLine" :class="{vincarActive:vincarActiveNum==3}" @click="vincarActiveFn(3)">按商品</view>
+			 				 </view>
+			 				 <view class="inputsBox" v-if="vincarActiveNum==1">
+			 					 <view class="searchInputBox" @click="goSearch">
+			 					 	<image src="../../static/img/icon_search.png" mode="" class="simg"></image>
+			 					 	<input type="text" placeholder="请输入车辆品牌、车系或VIN码" placeholder-class="ip" class="ssinput">
+			 					 </view>
+			 					 <view class="inputsBtn">查询</view>
+			 				 </view>
+							 <view class="inputsBox" v-if="vincarActiveNum==3">
+									 <view class="searchInputBox" @click="goSgoods">
+										<image src="../../static/img/icon_search.png" mode="" class="simg"></image>
+										<input type="text" placeholder="请输入品牌" placeholder-class="ip" class="ssinput">
+									 </view>
+									 <view class="inputsBtn">查询</view>
+							 </view>
+			 				 <view class="historyBox"  v-if="vincarActiveNum==1">
+			 					 <view class="historyLeft" >
+			 						 <view class="historyLeftTxt">历史查询:</view>
+									 <view v-if="historyvinLoding">
+										 <view class="historyLeftNum" @click="gocarDetail" v-if="historyvin">{{historyvin}}	</view>
+										 <view class="historyLeftNum" v-else>暂无</view>
+									 </view>
+			 						
+			 					 </view>
+			 					 <view class="historyMore" @click="gohistory">更多
+			 					   <image src="../../static/img/lanjt.png" mode="" class="lanjt"></image>
+			 					 </view>
+			 				 </view>
+			 			 </view>
+			 			 
+			 			 <view class="productBox"  v-if="vincarActiveNum==1">
+			 			 		<view class="productTitle">产品列表</view>
+			 					<view class="productLinBox">
+			 						<view class="productLine" @click="goCarModelType(1)">
+			 							<image class="productImg" src="/static/img/and.png" mode=""></image>
+			 							<view class="productTxt" >阿诺德</view>
+			 						</view>
+			 						<view class="productLine" @click="goCarModelType(2)">
+			 							<image class="productImg" src="/static/img/hy.png" mode=""></image>
+			 							<view class="productTxt" >鸿雁</view>
+			 						</view>
+			 						<view class="productLine" @click="goCarModelType(3)">
+			 							<image class="productImg" src="/static/img/sg.png" mode=""></image>
+			 							<view class="productTxt" >三冠</view>
+			 						</view>
+			 						<view class="productLine" @click="goCarModelType(4)">
+			 							<image class="productImg" src="/static/img/wsk.png" mode=""></image>
+			 							<view class="productTxt" >威斯康</view>
+			 						</view>
+			 					</view>
+			 			 </view>
+			 			 
+			 			 
+			 </view>
+			 
+		 </view>
+	    <user v-if="tabIndex==2" :iStatusBarHeight="iStatusBarHeight"></user>
+		<view class="bTabBox">
+			<view class="btabLine" @click="tabFn(1)">
+				<image class="btabLineImg" v-if="tabIndex==1" src="/static/img/index1.png" mode=""></image>
+				<image class="btabLineImg" v-if="tabIndex==2" src="/static/img/index2.png" mode=""></image>
+				<view class="btabLineTxt">首页</view>
+			</view>
+			<view class="btabLine">
+				<image @click="stBtn" class="btabLineImg2" src="/static/img/vin.png" mode=""></image>
+			</view>
+			<view class="btabLine" @click="tabFn(2)">
+				<image class="btabLineImg"  v-if="tabIndex==2"  src="/static/img/user1.png" mode=""></image>
+				<image class="btabLineImg"  v-if="tabIndex==1"  src="/static/img/user2.png" mode=""></image>
+				<view class="btabLineTxt">我的</view>
+			</view>
+		</view>
+		 
+	</view>
+</template>
+
+<script>
+	import carModel from './carModel.vue'
+	import user from './user.vue'
+	export default {
+		components: {
+			carModel, //注册子组件
+			user
+		},
+		//props:['iStatusBarHeight',],
+		data() {
+			return {
+				fileURl: '',
+				ckCarShow:false,
+				vinNum:'',
+				moreVinList:[],
+				historyList:[],
+				iStatusBarHeight:'',
+				openId:'',
+				aaa:'',
+				duration:500,
+				interval:3000,
+				historyvin:'',
+				tabIndex:1,
+				byItem:'',
+				historyvinLoding:false,
+				vincarActiveNum:1,
+			}
+		},
+		onLoad() {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			//console.log(this.iStatusBarHeight) 
+           var that=this;
+		   this.uniLogin()
+          /* setTimeout(function(){
+           		that.$refs.carModelView.getdata();
+           },500) */
+		   var bb= this.iStatusBarHeight + 44 + 'px';
+		  
+		   var cc= '520rpx'
+		   this.aaa= `calc(100vh - ${bb} - ${cc})`
+		},
+		onShow() {
+			
+			if(this.openId){
+				this.queryHistory()
+			}
+		},
+		methods: {
+			vincarActiveFn(num){
+				this.vincarActiveNum=num
+			},
+			goSgoods(){
+				uni.navigateTo({
+					  url:'sgoodsList'
+				})
+			},
+			tabFn(num){
+				this.tabIndex=num
+			},
+			goCarModel(){
+			   uni.navigateTo({
+			   	  url:'carModel2'
+			   })	
+			},
+			goCarModelType(type){
+				
+				uni.navigateTo({
+					  url:'carModel2?type='+type
+				})
+			},
+			wy(){
+				
+				uni.chooseImage({
+					count: 6, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function (res) {
+						console.log(JSON.stringify(res.tempFilePaths));
+					}
+				});
+			},
+			
+			 uniLogin(){
+				 var that=this;
+				 uni.login({
+				   provider: 'weixin',
+				   success: function (loginRes) {
+				     console.log(loginRes);
+				 		that.getWxOpenID(loginRes)
+				   }
+				 });
+			 },
+			 getWxOpenID(e){
+			 	var that=this;
+				this.$http2('sys/getWxOpenID', {
+				  code:e.code,
+				 
+				 },'GET').then(res => {
+					 this.openId=res.data.openId;
+					 uni.setStorage({
+					 	key: 'wxdata',
+					 	data: res.data,
+					 	 success: function () {
+					 	    that.queryHistory()
+					 	 
+					 	 }
+					 }); 
+				 })
+			 },
+			 queryHistory(){
+				 this.historyvinLoding=false
+				 this.$http2('queryHistory', {
+				   
+				  
+				  },'POST').then(res => {
+				 			
+				 	this.historyList=res.data
+					this.historyList.forEach(item=>{
+						if(item.vin){
+							if(!this.historyvin){
+								this.historyvin=item.vin
+								this.byItem=item
+							}
+							
+						}
+					})
+					this.historyvinLoding=true	
+					var bb= this.iStatusBarHeight + 44 + 'px';
+					var cc='520rpx'
+					if(this.historyList.length==0){
+						cc= '240rpx'	   
+					}else
+					if(this.historyList.length==1){
+						cc= '352rpx'	   
+					}else
+					if(this.historyList.length==2){
+						cc= '418rpx'	   
+					}
+				
+					this.aaa= `calc(100vh - ${bb} - ${cc})`
+				 })
+			 },
+			 gocarDetail(){
+				  var e=this.byItem
+				 uni.navigateTo({
+				 	url:'/pages/index/byItem?nLevelID='+e.nLevelID+'&logo='+e.logo+'&value='+e.title+'&id='+e.groupID+'&isVin='+e.ifVin+'&vin='+e.vin
+				 })
+			 },
+			 gobyItem(e){
+				 var nLevelID=e.nLevelIDs.split(',')[0]
+				 uni.navigateTo({
+				 	url:'/pages/index/byItem?nLevelID='+nLevelID+'&logo='+e.carModelInfo.logo+'&value='+e.title+'&id='+e.ids+'&isVin=1&vin='+this.vinNum
+				 })
+			 },
+             gohistory(){
+				 uni.navigateTo({
+				 	url:'/pages/index/history'
+				 })
+			 },
+			 goSearch(){
+				 uni.navigateTo({
+				 	url:'/pages/index/search'
+				 })
+			 },
+			 stBtn(){
+				 var that = this;
+				 console.log("识图识图识图识图")
+				 uni.authorize({
+				     scope: 'scope.camera',
+				     success() {
+				        console.log("chengg");
+						uni.chooseImage({
+							sourceType: ['album','camera'],
+							count:1, 
+							success: (chooseImageRes) => {
+								//console.log(chooseImageRes)
+								const tempFilePaths = chooseImageRes.tempFilePaths;
+								this.fileURl=tempFilePaths[0]
+								 uni.showLoading({ title: '加载中'});
+								 uni.uploadFile({
+							            url: that.$baseURL+'scanner?action=/vinByOpenApi/scanner', //仅为示例,非真实的接口地址
+							            filePath: tempFilePaths[0],
+							            name: 'photo',
+							           /* formData: {
+							                'user': 'test'
+							            }, */
+							            success: (uploadFileRes) => {
+											var data=JSON.parse(uploadFileRes.data);
+											uni.hideLoading();
+											if(data.code == 0){
+												console.log(data.data)
+												that.vinNum=data.data;
+												that.queryCarModelGroupByVinAggregation()
+											}else{
+												uni.showToast({
+												    title: data.msg,
+												    duration: 3000,
+													icon:'none',
+												});
+											}
+											
+							                //console.log(JSON.parse(uploadFileRes.data).data );
+											
+							            },fail(err) {
+											uni.hideLoading();
+								           console.log(err)
+										   uni.showToast({
+										       title: '拉取失败',
+										   	   icon:'none',
+										       duration: 3000,
+										   });
+							            },
+										complete(obj){
+											uni.hideLoading();
+											if(obj.statusCode!=200){
+												uni.showToast({
+												    title: 'vin扫描失败,请重试',
+													icon:'none',
+												    duration: 3000,
+												}); 
+												console.log("vin扫描失败,请重试")
+											}
+											
+											
+										}
+							        }); 
+						
+								
+							},fail(err){
+								console.log("上传失败")
+								console.log(err)
+							}
+						});
+				     },fail(err) {
+						 uni.showToast({
+						     title: '授权失败',
+						 	   icon:'none',
+						     duration: 3000,
+						 });
+				     	console.log("授权失败")
+						uni.showModal({
+							title: '是否重新授权识图功能',
+							success(res) {
+								if (res.confirm) {
+									uni.openSetting({
+										success() {
+											console.log('开启权限成功');
+										},
+										fail() {
+											console.log('开启权限失败');
+										}
+									});
+								} else if (res.cancel) {
+									console.log('拒绝开启开启权限');
+								}
+							}
+						});
+						
+						
+				     }
+				 })
+				
+			 },
+			 queryCarModelGroupByVinAggregation(){
+				 this.$http('matchingByOpen/queryCarModelGroupByVinAggregation', {
+				 	vin: this.vinNum,type:2
+				 }, 'POST').then(res => {
+					if(res.code!=1){
+						this.moreVinList=res.data;
+						if(this.moreVinList.length>1){
+								this.ckCarShow=true;
+						}else{
+							this.gobyItem(this.moreVinList[0])
+						}
+					
+						
+					}
+				 	 else {
+				 	
+						 uni.showToast({
+							 title: res.msg,
+							 duration: 3000,
+							 icon:'none',
+						 });
+				 	}
+				 	
+				 })
+			 },
+			 ckcarClose(){
+				 this.ckCarShow=false;
+			 }
+		},
+		onShareAppMessage(){
+				   
+		}
+	}
+</script>
+
+<style scoped>
+.contBox{
+	padding: 0 24rpx;
+}
+.productBox{
+height: 520rpx;
+background: #FFFFFF;
+border-radius: 16rpx;
+padding: 30rpx;
+margin-top: 20rpx;
+}
+.productTitle{
+	font-weight: 500;
+	font-size: 28rpx;
+	color: #1A1A1A;
+	line-height: 40rpx;
+}
+.productLinBox{
+	display: flex;justify-content: space-between;
+}
+.productImg{
+	width: 125rpx;height: 44rpx;
+}
+.productLine{
+	text-align: center;
+	padding-top: 24rpx;
+}
+.productTxt{
+	text-align: center;
+	font-size: 26rpx;
+	color: #1A1A1A;
+	padding-top: 22rpx;
+}
+.vincar{
+	background: #FFFFFF;
+	border-radius: 16rpx;
+	padding: 24rpx 30rpx;
+}
+.vincarTab{
+	display: flex;
+}
+.vincarTabLine{
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 37rpx;
+}
+.anVin{
+	font-weight: 500;
+	font-size: 28rpx;
+	
+	margin-right: 50rpx;
+	
+}
+.vincarActive{
+	color: #FF4F00;border-bottom: 4rpx solid  #FF4F00;
+}
+.inputsBox{
+	border-radius: 10rpx;
+	border: 2rpx solid #FF4F00;
+	padding: 8rpx;
+	display: flex;justify-content: space-between;
+	margin-top: 27rpx;
+}
+.inputsBtn{
+	width: 108rpx;
+	height: 58rpx;
+	background: #FF4F00;
+	border-radius: 6rpx;
+	text-align: center;
+	line-height: 58rpx;
+	font-size: 26rpx;
+	color: #FFFFFF;
+}
+.lanjt{
+	width: 8rpx;height: 15rpx;
+	margin-top: 20rpx;margin-left: 6rpx;
+}
+.historyLeft{
+	display: flex;
+	font-size: 24rpx;
+	color: #999999;
+}
+.historyLeftNum{
+	height: 50rpx;
+	background: #FAFAFA;
+	padding: 0 10rpx;line-height: 50rpx;
+}
+.historyLeftTxt{
+	line-height: 50rpx;
+}
+.historyMore{
+	line-height: 50rpx;color: #3E86F0;font-size: 24rpx;display: flex;
+}
+.historyBox{
+	display: flex;justify-content: space-between;padding-top: 24rpx;
+}
+.swpBox{
+	height: 400rpx;
+}
+.swiperTk{
+	height: 400rpx;
+}
+.swiper-itemTk{
+	padding-top: 20rpx;text-align: center;
+	overflow: hidden;height: 360rpx;
+}
+.tkHdImg{
+	width: 702rpx;height: 360rpx;
+}
+.aaaaa{
+	width: 500rpx;
+	background-color: #1A1A1A;
+}
+.ckcarJtimg{
+	width: 26rpx;height: 26rpx;margin-top: 4rpx;
+}
+.ckcarlineBox{
+  padding:24rpx ;	
+  border-bottom: 1px solid #EEEEEE;
+}
+.ckcarLeft{
+	font-weight: 400;line-height: 36rpx;
+	color: #1A1A1A;font-size: 26rpx;
+}
+.ckcarBox{
+	width: 100vw;height: 100vh;
+	background:rgba(0, 0, 0, 0.4) ;
+	position: fixed;top: 0;left: 0;
+}
+.ckcar{
+	width: 750rpx;
+	height: 772rpx;
+	background: #FFFFFF;
+	border-radius: 24rpx 24rpx 0rpx 0rpx;
+	position: absolute;
+	left: 0;
+	bottom: 0;
+}
+.ckcarClose{
+	width: 30rpx;height: 30rpx;
+}
+.ckcarTitle{
+	font-weight: 500;font-size: 28rpx;
+	color: #1A1A1A;
+	line-height: 40rpx;
+}
+.ckcarTop{
+	padding: 40rpx 26rpx 20rpx 24rpx;
+}
+.content{
+	min-height: 100vh;background: #F4F5F7;
+}
+.top{
+	width: 100%;height: 385rpx;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/DE1573A0-1C08-4243-8313-C0BA094406D0.png') no-repeat;
+	background-size: 100% 100%;
+}
+.topNavBox{
+	background: #FFFFFF;
+	width: 750rpx;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 111;
+    color: #333333;
+}
+.searchInputBox{
+	width: 550rpx;display: flex;
+	height: 58rpx;
+	background: #FFFFFF;
+	border-radius: 16rpx;
+}
+.simg{
+	width: 34rpx;height: 34rpx;margin-top: 13rpx;margin-left:30rpx;
+}
+.stimg{
+	width: 44rpx;height: 44rpx;
+}
+.searchBox{
+	display: flex;padding: 20rpx 24rpx;
+	justify-content: space-between;
+	padding-right: 0rpx;
+}
+.st{
+	text-align: center;padding-left: 20rpx;padding-right: 24rpx;
+}
+.ssinput{
+	font-size: 28rpx;font-weight: 400;padding-left: 24rpx;line-height: 58rpx;height: 58rpx;
+	width: 450rpx;
+}
+.ip{
+	color: #999999;
+}
+.shitu{
+	font-weight: 400;
+	color: #FFFFFF;font-size: 22rpx;
+}
+
+.historybox{
+	padding: 0 18rpx;    margin-top: -88rpx;
+}
+.history{
+	background: #FFFFFF;
+	border-radius: 16rpx;
+	padding: 20rpx;padding-bottom: 0;
+}
+.jiantouimg{
+	width: 26rpx;height: 26rpx;margin-top: 7rpx;
+}
+.historyTop{
+	display: flex;justify-content: space-between;
+	padding-bottom: 30rpx;
+}
+.historyTitle{
+	font-weight: 500;font-size: 28rpx;
+	color: #1A1A1A;line-height: 40rpx;
+}
+.historylinecarImg{
+	width: 54rpx;
+	height: 54rpx;
+}
+.historylinecar{
+	font-weight: 400;font-size: 26rpx;
+	color: #1A1A1A;
+	line-height: 46rpx;width: 576rpx;
+}
+.historyLine{
+	display: flex;justify-content: space-between;
+	padding: 15rpx 0;border-top: 1rpx solid #EEEEEE;
+}
+.indexnav{
+		height: 44px;
+		line-height: 44px;
+		text-align: center;
+		font-size: 36rpx;
+	/* 	color: #FFFFFF; */
+	}
+	.historyLogoBox{
+		display: flex;align-items: center;
+	}
+	
+	.bTabBox{
+		width: 100vw;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		background: #FFFFFF;
+		box-shadow: 0rpx -2rpx 16rpx 0rpx rgba(153,153,153,0.2);
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom); 
+		display: flex;
+		justify-content: space-around;
+	}
+	.btabLineImg{
+		width: 42rpx;height: 42rpx;
+	}
+	.btabLineTxt{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #1A1A1A;
+		
+	}
+	.btabLine{
+		padding-top: 21rpx;
+	}
+	.btabLineImg2{
+		width: 140rpx;height: 140rpx;
+		margin-top: -70rpx;
+	}
+</style>

+ 49 - 7
pages/index/installation.vue

@@ -2,8 +2,26 @@
 	<view class="content">
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'电池安装'"></homenav>
 	  <view class="box">
-		 <video style="width:750rpx;" class="edui-faked-video twtcs" :src="videoUrl" width="420" height="280" enable-danmu danmu-btn controls></video>
+		<!-- <video style="width:750rpx;" class="edui-faked-video twtcs" :src="videoUrl" width="420" height="280" enable-danmu danmu-btn controls></video> -->
+		  <!-- <image :src="imgUrl" mode=""></image> -->
+		  <view v-for="item in mtList" :key="item.id" class="parts-info-detail">
+		    <view v-for="item2 in parseInfo">
+		      <view v-for="item3 in item2">
+		        <view v-for="item4 in Object.keys(item3)">
+		          <h4>{{ item4 }}</h4>
+		          <!-- <video-player class="vjs-custom-skin"
+		           :options="getPlayerOptions(videoUrl)"/> -->
+		           <view v-for="img in item3[item4]">
+		              <image  mode="widthFix" style="width: 100%;" :src="imgUrl+img" alt="" v-if="img.substring(img.length-3)!='mp4'"></image>
+		            <!-- <video-player class="vjs-custom-skin"
+		              :options="getPlayerOptions(info.imgUrl+img)" v-else /> -->
+		            <video style="width:750rpx;" class="edui-faked-video twtcs" v-else :src="imgUrl+img" width="420" height="280" enable-danmu danmu-btn controls></video>
+		           </view>
 		  
+		        </view>
+		      </view>
+		    </view>
+		  </view>
 	  </view>
 	</view>
 </template>
@@ -21,11 +39,19 @@
 				historyList:[],
 				iStatusBarHeight:'',
 				loading:false,
+				groupIds:'',
+				componentCode:'',
+				mtList:'',
+				imgUrl:'',
+				//parseInfo:'',
 			}
 		},
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-           // this.queryHistory()
+           // 
+		   this.componentCode='005001'//opt.componentCode
+		   this.groupIds=opt.groupIds
+		   this.queryList()
 		},
 		methods: {
 			goDetail(e){
@@ -33,17 +59,33 @@
 					url:'/pages/index/byItem?nLevelID='+e.nLevelID+'&logo='+e.logo+'&value='+e.title+'&id='+e.groupID+'&isVin='+e.ifVin+'&vin='+e.vin
 				}) 
 			},
-           queryHistory(){
+           queryList(){
 			 this.loading=false;
-			 this.$http2('queryHistory', {
-			   
+			 this.$http('partsByOpen/queryCarmodelhelp', {
+			   componentCode:this.componentCode,
+			   groupId:this.groupIds
 			  
 			  },'POST').then(res => {
-					this.loading=true;		
-					this.historyList=res.data
+					this.loading=true;	
+					//	console.log(res.data.yhzl.imgUrl)
+					this.imgUrl=res.data.yhzl.imgUrl
+					this.mtList=res.data.yhzl.mtList
+					/* var mtList=res.data.yhzl.mtList
+					 mtList?.map(item => {
+					  return JSON.parse(item.content.replace(/'/g, '"'))
+					})
+					this.parseInfo=mtList */
 			 })
            },
+		},
+		computed:{
+			parseInfo() {
+			  return this.mtList?.map(item => {
+			    return JSON.parse(item.content.replace(/'/g, '"'))
+			  })
+			}
 		}
+		
 	}
 </script>
 

+ 9 - 3
pages/index/search.vue

@@ -118,14 +118,20 @@
 			   this.value=''
 		   },
 		   goDetal(e){
-			   uni.navigateTo({
+			  /* uni.navigateTo({
 			   	url:'/pages/index/byItem?nLevelID='+e.carModelInfo.nLevelID+'&logo='+e.carModelInfo.logo+'&isVin='+this.isVin+'&value='+e.value+'&id='+e.ids+'&vin='+this.vin
-			   }) 
+			   }) */ 
+			   uni.navigateTo({
+			    	url:'/pages/index/goodsList?nLevelID='+e.carModelInfo.nLevelID+'&logo='+e.carModelInfo.logo+'&isVin='+this.isVin+'&value='+e.value+'&id='+e.ids+'&vin='+this.vin
+			    })
 		   },
 		   goDetalcx(e){
 			   console.log(e)
-			   uni.navigateTo({
+			  /* uni.navigateTo({
 			   	url:'/pages/index/byItem?scarid='+e.id
+			   }) */ 
+			   uni.navigateTo({
+			   	url:'/pages/index/goodsList?scarid='+e.id
 			   }) 
 		   },
 		   carMbtn(e){

BIN
static/img/indexbg.png


BIN
static/img/newS.png


BIN
static/img/newSb.png


BIN
static/img/vinsb.png


+ 3 - 3
utils/request.js

@@ -1,7 +1,7 @@
  //测试地址
- //const baseURL = 'http://192.168.0.122:8002/' 
+ const baseURL = 'http://192.168.1.10:19001/' 
  //正式
-const baseURL='https://oil.66km.com.cn/' 
+//const baseURL='https://jujiang.66km.cn/' 
 //66正式
 /* const baseURL = 'https://apidms.66km.com/' 
  const burl2='https://apidms.66km.com/' */
@@ -9,7 +9,7 @@ const baseURL='https://oil.66km.com.cn/'
  //const baseURL = 'http://oil.66km.com.cn/' 
 // const burl2='http://edms.eurorepar.cn/ ' 
 // import md5 from './MD5.js'
-
+//巨江电源小程序秘钥 8fce4b8bed857e5401ad2600c7681119
  
 const ajax = (url = '', date = {}, type = 'POST', header = {
 }) => {