twt il y a 1 an
Parent
commit
db884b83bc
4 fichiers modifiés avec 40 ajouts et 19 suppressions
  1. 8 5
      pages/index/carModel.vue
  2. 11 3
      pages/index/goodsDetail.vue
  3. 19 9
      pages/index/maintenance.vue
  4. 2 2
      pages/index/search.vue

+ 8 - 5
pages/index/carModel.vue

@@ -46,6 +46,7 @@
 			<view class="popup-content" >
 				<scroll-view class="brandList" scroll-y="true">
 					<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+					<view style="height: 20rpx;"></view>
 					<view v-for="item in carSeriesList" :key="item.manufactor" class="brandListkk">
 					  <h3 class="cell-item-title">{{ item.manufactor }}</h3>
 					  <span v-for="item2 in item.carSeries" :key="item2" :title="item2" class="span-cell" @click="selectCarFactory(item.manufactor,item2)" >{{item2}}</span>
@@ -523,16 +524,17 @@
 	.fast-navigation{
 	  position: absolute;
 	  text-align: center;
-	  right: 16rpx;
+	  right: 0rpx;
 	  top: 0rpx;
-	  width: 23rpx;
-	  font-size:26rpx;
+	  width: 34rpx;
+	  font-size:24rpx;
 	  font-weight:500;
 	  line-height:35rpx;
 	  color: rgb(153, 153, 153);
 	  a{
 	    display: block;
 		padding-top: 3rpx;
+		padding-left: 10rpx;
 	  }
 	  .select{
 	    color: #FF4F00;
@@ -553,7 +555,7 @@
 		background: #FFFFFF;
 		height: 100vh;
 		margin-left: 20vw;
-		padding-top: 20rpx;
+		/* padding-top: 20rpx; */
 	}
 	.carModel-nav-title{
 	  height:100rpx;
@@ -650,8 +652,9 @@
 		padding-top: 20rpx;
 	}
 	.brandList{
-		height: calc(100vh - 45px);
+		/* height: calc(100vh - 45px); */
 		/* padding-bottom:var(--status-bar-height); */
+		height: 100vh;
 	}
 	.displacementListLine{
 		min-height: 50rpx;

+ 11 - 3
pages/index/goodsDetail.vue

@@ -3,7 +3,7 @@
 	  <homenav :iStatusBarHeight="iStatusBarHeight" :title="'商品详情'"></homenav>
 	  <view class="uni-margin-wrap">
 			<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" :interval="3000"
-				:duration="duration">
+				:duration="duration" indicator-active-color="#EAEAEA">
 				<swiper-item v-for="(item,index) in info.imgList">
 					<view class="swiper-item">
 						<image @click="showImgList(item.imgPath)" :src="item.imgPath" mode="aspectFit" class="swiper-itemImg"></image>
@@ -16,7 +16,11 @@
 		<view style="height: 30rpx;background: #F4F5F7;"></view>
 		<view class="detail">
 			<view class="datailTitle">商品详情</view>
+		
+			<!-- <player-component vid="f3310d4pktb"></player-component> -->
 			<rich-text :nodes="html"></rich-text>
+			<!-- <u-parse :content="html"  ></u-parse> --> 
+			<!-- <view v-html="html"></view> -->
 		</view>
 	  
 	</view>
@@ -24,9 +28,10 @@
 
 <script>
 	import homenav from "../../components/homenav/nav.vue"
+	import uParse from '@/components/u-parse/u-parse.vue'
 	export default {
 		components: {
-			homenav
+			homenav,uParse
 		},
 		data() {
 			return {
@@ -34,7 +39,8 @@
 				info:'',
 				iStatusBarHeight:'',
 				html:'',
-				 loading:false,
+				loading:false,
+				
 			}
 		},
 		onLoad(opt) {
@@ -54,6 +60,8 @@
 					this.info=res.data;
 					this.html = this.info.ozContent
 					this.html = this.html.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
+					//this.html = this.html.replace(/\iframe/gi, 'video');
+					console.log(this.html)
 			   })
 		   },
 		   showImgList(img){

+ 19 - 9
pages/index/maintenance.vue

@@ -12,24 +12,31 @@
 		  </view>
 	  </view>
 	  
-	  <view class="" v-if="tabindex==1">
+	  <view class="tableBox" v-if="tabindex==1">
+		  <view class="teamContent" >
+		  	<view v-for="(itemRow,indexRow) in itemData" :key="indexRow">
+		  		<view class="row" :class="{grayColor:indexRow==0}">
+		  			<view  class="colBg grayColor" >
+		  				<view class="col" >{{itemRow[0]}}</view>
+		  				
+		  			</view>
+		  		</view>
+		  	</view>
+		  </view>
 	  	<scroll-view scroll-y="true" scroll-x="true" :scroll-top="scrollTop" :scroll-left="scrollTop" @scroll="scroll">
 	  	
 	  		<!-- 内容 -->
 	  		<view class="teamContent" :style="{width:HN_width}">
 	  			<view v-for="(itemRow,indexRow) in itemData" :key="indexRow">
 	  				<view class="row" :class="{grayColor:indexRow==0}">
-						<!-- <view  class="colBg grayColorOne"  >
-							<view class="col" >{{itemRow[0]}}</view>
-							
-						</view> -->
-	  					<view v-for="(itemCol,indexCol) in itemRow" :key="indexCol" class="colBg"  :class="{grayColor:indexCol==0}">
+	  					<view v-for="(itemCol,indexCol) in itemRow" v-if="indexCol!=0"  :key="indexCol" class="colBg"  :class="{grayColor:indexCol==0}">
 	  						<view class="col" v-if="indexCol==0">{{itemCol}}</view>
 	  						<view class="col" v-else-if="indexRow==0">{{itemCol}}</view>
 	  						<view class="redCol" v-else-if="indexRow!=0 && indexCol!=0 && itemCol==1"></view>
 	  						<view class="grayCol" v-else-if="indexRow!=0 && indexCol!=0 && itemCol==0"></view>
 	  						
 	  					</view>
+						<view class="colBg"></view>
 	  				</view>
 	  			</view>
 	  		</view>
@@ -39,11 +46,11 @@
 	  	</scroll-view>
 	  </view>
 	  <view class="" v-if="tabindex==2">
-	  	<view class="pjTitleBox">
+	  	<!-- <view class="pjTitleBox">
 			<view class="pjTitle">保养计划</view>
 			<view class="pjTitle">规格型号</view>
 			<view class="pjTitle">参考用量</view>
-		</view>
+		</view> -->
 		<view class="pjlineBox">
 			<view class="pjline" v-for="(item,index) in pjList">
 				<view class="pjitem">{{item[0]}}</view>
@@ -135,6 +142,9 @@
 .tabbox{
 	display: flex;
 }
+.tableBox{
+	display: flex;
+}
 .tabline{
 	width: 50%;
 }
@@ -178,7 +188,7 @@
 		padding: 20rpx;
 		width: 180rpx;
 		border: 1rpx #EEEEEE solid;
-		
+		height: 80rpx;
 		
 	}
 	.col {

+ 2 - 2
pages/index/search.vue

@@ -202,10 +202,10 @@
 				   this.$http('matchingByOpen/queryCarModelGroupByVinAggregation', {
 				     vin: this.value,type:2
 				    },'POST').then(res => {
-				     	uni.hideLoading();
+				     	
 						this.loading=true;
 						if(res.code==0){
-							
+							uni.hideLoading();
 							this.vinList=res.data;
 							if(this.vinList.length==1){
 								this.goDetal(this.vinList[0])