浏览代码

样式修改

twt 2 年之前
父节点
当前提交
11130e18d0

+ 3 - 3
components/timeSelect/timeSelect.vue

@@ -167,7 +167,7 @@ export default {
 	      content: '';
 	      width: 6rpx;
 	      height: 30rpx;
-	      background:rgba(63,144,247,1);
+	      background:#D53533;
 	      position: absolute;
 	      left: 0;
 	      top: 32rpx;
@@ -209,7 +209,7 @@ export default {
 	        background-color: rgb(255, 255, 255);
 	        height: 80rpx;
 	        border: 1px solid #FF0000;
-	        color:#FF0000 !important;
+	        color:#D53533 !important;
 	        position: relative;
 	        &:before{
 	          position: absolute;
@@ -249,7 +249,7 @@ export default {
 	  color: #ffffff;
 	  height: 100rpx;
 	  line-height: 100rpx;
-	  background: #FF0000;
+	  background: #D53533;
 	  font-size: 32rpx;
 	  text-align: center;
 	  

+ 18 - 0
pages.json

@@ -303,6 +303,24 @@
 			"style": {
 				"navigationBarTitleText": "活动详情"
 			}
+		},
+		{
+			"path": "pages/index/newCar",
+			"style": {
+				"navigationBarTitleText": "新车"
+			}
+		},
+		{
+			"path": "pages/index/usedCar",
+			"style": {
+				"navigationBarTitleText": "二手车"
+			}
+		},
+		{
+			"path": "pages/index/evaluation",
+			"style": {
+				"navigationBarTitleText": "爱车估价"
+			}
 		}
     ],
 	"tabBar": {

+ 1 - 1
pages/activity/jkDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="top">
-			<img :src="mainImg" alt="" class="topimg">
+			<img :src="mainImg" alt="" class="topimg" mode="widthFix">
 		</view>
 		<view class="cont">
 			<view class="name">{{info.activityName}}</view>

+ 25 - 0
pages/index/evaluation.vue

@@ -0,0 +1,25 @@
+<template>
+	<view class="content">
+		<web-view src="https://activitym.che168.com/2022/valuation/index?leadssources=3&sourcetwo=2&sourcethree=511&pvareaid=109493"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: 'Hello'
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped>
+	
+</style>

+ 170 - 10
pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="indexTop">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view class="indexnav">首页</view>
+			<view class="indexnav">{{wxOpenData.unionName}}</view>
 		</view>
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 43px;"></view>
@@ -38,7 +38,7 @@
 		          <view class="huancheBtn">换车</view>
 		        </view>
 		      </view>
-		      <view class="carInfoBottom">
+		      <!-- <view class="carInfoBottom">
 		        <view class="carInfoBottomLine">
 		          <view class="carInfoBottomLineTitle">下次保养里程</view>
 		          <view class="carInfoBottomLineTxt" v-if="carInfo.nextCareMilage">{{carInfo.nextCareMilage}}</view>
@@ -53,7 +53,34 @@
 		          <view class="carInfoBottomLineTitle">保养手册</view>
 		          <view class="carInfoBottomLineTxt" @click="information">点击查看</view>
 		        </view>
-		      </view>
+		      </view> -->
+			  <view class="bxBox">
+				  <view class="bxline bxline1">
+					  <img src="../../static/timg/car1.png" alt="" class="bxlineIcon">
+					  <view class="bxlineTitle">保险</view>
+					  <view class="bxlineMs1" v-if="carInfo.insuranceExpireDate">{{InsuranceExpireDate}}天到期</view>
+					  <view class="bxlineMs2" v-else>--</view>
+				  </view>
+				  <view class="bxline bxline2">
+					  <img src="../../static/timg/car2.png" alt="" class="bxlineIcon" style="width: 22rpx;height: 32rpx;">
+					  <view class="bxlineTitle">下次保养</view>
+					  <view class="bxlineMs1" v-if="carInfo.nextCareDate||carInfo.nextCareMilage">{{NextCareDate}}天后
+					     <span v-if="carInfo.nextCareMilage">或{{carInfo.nextCareMilage}}km</span>
+					  </view>
+					   <view class="bxlineMs2" v-else>--</view>
+				  </view>
+				  <view class="bxline bxline1">
+					  <img src="../../static/timg/car3.png" alt="" class="bxlineIcon" style="width: 23rpx;height: 30rpx;margin-top: 2rpx;">
+					  <view class="bxlineTitle">年审</view>
+					  <view class="bxlineMs1" v-if="carInfo.nextAuditDate">{{NextAuditDate}}天到期</view>
+					   <view class="bxlineMs2" v-else>--</view>
+				  </view>
+				  <view class="bxline bxline2">
+					  <img src="../../static/timg/car4.png" alt="" class="bxlineIcon" style="width: 33rpx;height: 24rpx;margin-top: 6rpx;">
+					  <view class="bxlineTitle">保养手册</view>
+					  <view class="bxlineMs2" @click="information">查看</view>
+				  </view>
+			  </view>
 		  </view>
 		</view>
 		
@@ -119,7 +146,7 @@
 					<img src="../../static/timg/icon_arrow_right.png" alt="" class="hotMoreJt">
 				</view>
 			</view>
-			<view class="hotLine" @click="goJk(item)" v-for="(item,index) in homeCardList.openMActivity.openCollectingList"> 
+			<view class="hotLine" @click="goJk(item)" v-for="(item,index) in homeCardList.openMActivity.openCollectingList" v-if="index<homeCardList.openMActivity.showCount"> 
 				<view class="hotLineTop">
 					<image class="hotLineTopImg" :src="item.img" mode=""></image>
 				    <view class="hotlineTimebox">
@@ -132,13 +159,13 @@
 			</view>
 			
 		</view>
-		<!-- 热门商品 -->
+		<!-- 热门车型 -->
 		<view class="" v-if="homeCardList">
 			<view class="Hot" v-if="homeCardList.openMGoods.showType==1">
 				<view class="hotTop">
 					<view class="hotLeft">
 						<view class="hotSx"></view>
-						<view class="hottitle">热门商品</view>
+						<view class="hottitle">热门车型</view>
 					</view>
 					<view class="hotRight" @click="goShop">
 						<view class="hotMore">更多</view>
@@ -146,7 +173,7 @@
 					</view>
 				</view>
 				
-				<view class="hotGoodsLine" v-for="(item,index) in homeCardList.openMGoods.goodsList" @click="goGoods(item)">
+				<view class="hotGoodsLine" v-for="(item,index) in homeCardList.openMGoods.goodsList" @click="goGoods(item)" v-if="index<homeCardList.openMGoods.showCount">
 					<view>
 						<image :src="item.url" mode="" class="hotGoodsLineImg"></image>
 					</view>
@@ -160,7 +187,9 @@
 						<view class="goodsPrice">
 							<view class="goodsPrice1">{{item.saleLabel}}</view>
 							<view class="goodsPrice2">¥</view>
-							<view class="goodsPrice3">{{item.salePrice}}</view>
+							<view class="goodsPrice3">{{item.salePrice}}
+							  <span v-if="item.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+							</view>
 							<view class="goodsPrice4" v-if="item.showLabel&&item.scribingPrice&&item.showLabel.indexOf('1')!=-1">¥{{item.scribingPrice}}</view>
 						</view>
 					</view>
@@ -209,6 +238,9 @@
 				ext:'',
 				duration:500,
 				interval:3000,
+				InsuranceExpireDate:'',
+				NextCareDate:'',
+				NextAuditDate:'',
 			}
 		},
 		onLoad() {
@@ -243,6 +275,7 @@
 				this.uniLogin()
 			}
 			
+			
 		},
 		onShow() {
 		    var indexaddcar = uni.getStorageSync("indexaddcar")
@@ -321,7 +354,27 @@
 					this.authorizShow=true;
 				}else{
 					if(item.bizType==0){
+						if(item.name=='新车'){ //
+							uni.navigateTo({
+								url:'newCar'
+							})
+						}else if(item.name=='二手车'){
+							uni.navigateTo({
+								url:'usedCar'
+							})
+						}else if(item.name=='爱车估价'){
+							uni.navigateTo({
+								url:'evaluation'
+							})
+						}
 						
+						else{
+							uni.showToast({
+								 title: '敬请期待',
+								 icon:'none',
+								 duration: 3000
+							});
+						}
 					}else if(item.bizType==1){ //紧急救援
 						uni.navigateTo({
 							url:'rescue'
@@ -448,6 +501,9 @@
 				   unionId:this.unionId
 				  },'GET').then(res => {
 				 	this.wxOpenData=res.data;
+					uni.setNavigationBarTitle({
+					  title:this.wxOpenData.miniAppName
+					})
 					
 					that.queryHomeCardList()
 					//that.wxPhoneLogin()
@@ -513,10 +569,74 @@
 					 }else{
 						 this.carInfo=res.data[0]
 						 this.$store.commit('mutationscarInfo', this.carInfo)
+						 this.carInfo.insuranceExpireDate='2022-11-11';
+						 this.carInfo.nextCareDate='2022-08-11';
+						 this.carInfo.nextAuditDate='2022-08-13';
+						 this.jsTime()
 					 }
 				 	 				
 				  })
 			 },
+			 jsTime(){
+				 if (Number(new Date().getTime()) > (Number(new Date(this.carInfo.insuranceExpireDate.replace(/-/g, '/')).getTime()) || 0)) {
+				   console.log("现在时间大于开始时间")
+				   this.InsuranceExpireDate = 0
+				 } else {
+				   this.clock()
+				 }
+				 if (Number(new Date().getTime()) > (Number(new Date(this.carInfo.nextCareDate.replace(/-/g, '/')).getTime()) || 0)) {
+				   this.NextCareDate = 0
+				 } else {
+				   this.clock2()
+				 }
+				 if (Number(new Date().getTime()) > (Number(new Date(this.carInfo.nextAuditDate.replace(/-/g, '/')).getTime()) || 0)) {
+				   this.NextAuditDate = 0
+				 } else {
+				   this.clock3()
+				 }
+			 },
+			 clock () {
+			   let _this = this
+			   let today = new Date() // 当前时间
+			   let h = today.getHours()
+			   let m = today.getMinutes()
+			   let s = today.getSeconds()
+			   let stopTime = new Date(_this.carInfo.insuranceExpireDate.replace(/-/g, '/')) // 结束时间
+			   let stopH = stopTime.getHours()
+			   let stopM = stopTime.getMinutes()
+			   let stopS = stopTime.getSeconds()
+			   let shenyu = stopTime.getTime() - today.getTime() // 倒计时毫秒数
+			   let shengyuD = parseInt(shenyu / (60 * 60 * 24 * 1000)) // 转换为天
+			   this.InsuranceExpireDate=shengyuD+1;
+			  
+			  // setTimeout(_this.clock, 500)
+			 },
+			 clock2 () {
+			   let _this = this
+			   let today = new Date() // 当前时间
+			   let h = today.getHours()
+			   let m = today.getMinutes()
+			   let s = today.getSeconds()
+			   let stopTime = new Date(_this.carInfo.insuranceExpireDate.replace(/-/g, '/')) // 结束时间
+			   let stopH = stopTime.getHours()
+			   let stopM = stopTime.getMinutes()
+			   let stopS = stopTime.getSeconds()
+			   let shenyu = stopTime.getTime() - today.getTime() // 倒计时毫秒数
+			   let shengyuD = parseInt(shenyu / (60 * 60 * 24 * 1000)) // 转换为天
+			   this.NextCareDate=shengyuD+1;
+			  
+			  // setTimeout(_this.clock, 500)
+			 },
+			 clock3 () {
+			   let _this = this
+			   let today = new Date() // 当前时间
+			   let stopTime = new Date(_this.carInfo.nextAuditDate.replace(/-/g, '/')) // 结束时间
+			   let shenyu = stopTime.getTime() - today.getTime() // 倒计时毫秒数
+			   let shengyuD = parseInt(shenyu / (60 * 60 * 24 * 1000)) // 转换为天
+			   this.NextAuditDate=shengyuD+1;
+			  
+			  // setTimeout(_this.clock, 500)
+			 },
 			 queryManagerInfo(){
 				 console.log("11")
 				 this.$http('openHome/queryManagerInfo', {
@@ -574,6 +694,44 @@
 </script>
 
 <style scoped>
+	.bxBox{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.bxline{
+		display: flex;
+		
+		padding-top: 22rpx;
+	}
+	.bxline1{
+		width: 40%;
+	}
+	.bxline2{
+		width: 60%;
+	}
+	.bxlineTitle{
+		color: #333333;
+		font-size: 26rpx;
+		line-height: 37rpx;
+		padding-left: 10rpx;
+	}
+	.bxlineMs1{
+		line-height: 37rpx;
+		color: #D53533;
+		font-size: 24rpx;
+		padding-left: 12rpx;
+	}
+	.bxlineMs2{
+		line-height: 37rpx;
+		color: #999999;
+		font-size: 24rpx;
+		padding-left: 12rpx;
+	}
+	.bxlineIcon{
+		width: 27rpx;
+		height: 34rpx;
+		margin-left: 24rpx;
+	}
 	.indexTop{
 		background: #D53533;
 		width: 750rpx;
@@ -665,11 +823,12 @@
 	}
 	.carinfoBox{
 		width: 702rpx;
-		height: 250rpx;
+		/* height: 250rpx; */
 		background: #FFFFFF;
 		border-radius: 10rpx;
 		margin-left: 24rpx;
 		overflow: hidden;
+		height: 270rpx;
 		
 	}
 	.carinfoBox2{
@@ -685,7 +844,8 @@
 		
 	}
 	.carinfoBox .carLogo{
-		width: 72rpx;height: 72rpx;
+		width: 60rpx;height: 60rpx;
+		margin-top: 6rpx;
 	}
 	.carinfoBoxTop{
 		display: flex;

+ 25 - 0
pages/index/newCar.vue

@@ -0,0 +1,25 @@
+<template>
+	<view class="content">
+		<web-view src="https://dealer4s.m.autohome.com.cn/dealer4S/newcar?dealerId=13093&channel=1"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: 'Hello'
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped>
+	
+</style>

+ 4 - 3
pages/index/onlineBooking.vue

@@ -2,9 +2,9 @@
 	<view class="box">
 		<view class="top">
 			<view class="shopTop">
-				<swiper class="swiper" circular  :autoplay="false" :interval="interval"
+				<swiper class="swiper" circular  :autoplay="true" :interval="interval"
 								:duration="duration" v-if="shopInfo.imgs">
-					<swiper-item v-for="(item,index) in shopInfo.imgs.split(',')">
+					<swiper-item v-for="(item,index) in shopInfo.imgs.split(',')" v-if="item">
 						<view class="swiper-item">
 							<img mode="aspectFit" :src="item" alt="">
 						</view>
@@ -117,7 +117,8 @@
 	export default {
 		data() {
 			return {
-				interval:2000,
+				interval:3000,
+				duration:500,
 				distance:0.05,
 				leftIndex:0,
 				yydetailShow:false,

+ 6 - 3
pages/index/personalCard.vue

@@ -44,7 +44,7 @@
 		onLoad(e) {
 			// console.log('个人名片传递的参数', e);
 			this.adInfo = JSON.parse(e.adInfo)
-			// console.log('个人名片传递的参数', this.adInfo);
+			 console.log('个人名片传递的参数', this.adInfo);
 		},
 		computed: {
 	
@@ -97,8 +97,11 @@
 			},
 			// 门店地址
 			addressOpra() {
-				uni.switchTab({
-					url:'/pages/index/index'
+				// uni.switchTab({
+				// 	url:'/pages/index/index'
+				// })
+				uni.navigateTo({
+					url:'onlineBooking?naShopId='+this.adInfo.shopID
 				})
 			}
 		}

+ 25 - 0
pages/index/usedCar.vue

@@ -0,0 +1,25 @@
+<template>
+	<view class="content">
+		<web-view src="https://m.che168.com/china/list/#pvareaid=6854933"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: 'Hello'
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped>
+	
+</style>

+ 7 - 2
pages/shop/confirm.vue

@@ -10,7 +10,9 @@
 		<view class="goodsBoxRgiht">
 			<view class="goodsName">{{goodsInfo.name}}</view>
 			<view class="goodsBottom">
-				<view class="goodsPrice"> <span class="goodsPrice1">¥</span> {{goodsInfo.salePrice?goodsInfo.salePrice:goodsInfo.scribingPrice}}</view>
+				<view class="goodsPrice"> <span class="goodsPrice1">¥</span> {{goodsInfo.salePrice?goodsInfo.salePrice:goodsInfo.scribingPrice}}
+				 <span v-if="goodsInfo.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+				</view>
 				<view class="numJsbox">
 					<view class="numJj" @click="calculation(1)">-</view>
 					<view class="goodsnum">
@@ -271,7 +273,10 @@
 			},
 			jsMoney(){
 				if(this.goodsInfo.salePrice){
-					this.totalMoney=this.goodsInfo.salePrice*this.goodsnum;
+					if(this.goodsInfo.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'){
+						this.totalMoney=this.goodsInfo.salePrice*this.goodsnum*10000;
+					}
+					
 					if(this.goodsInfo.scribingPrice){
 						var wyh=this.goodsInfo.scribingPrice*this.goodsnum;
 						this.yhMoney=wyh-this.totalMoney;

+ 8 - 2
pages/shop/goodsDetail.vue

@@ -16,7 +16,9 @@
 			<view class="goodsPrice">
 				<view class="goodsPrice1" v-if="info.saleLabel">{{info.saleLabel}}</view>
 				<view class="goodsPrice2">¥</view>
-				<view class="goodsPrice3">{{info.salePrice?info.salePrice:info.scribingPrice}}</view>
+				<view class="goodsPrice3">{{info.salePrice?info.salePrice:info.scribingPrice}}
+				 <span v-if="info.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+				</view>
 				<view class="goodsPrice4" v-if="info.showLabel&&info.scribingPrice&&info.showLabel.indexOf('1')!=-1">¥{{info.scribingPrice}}</view>
 			</view>
 			<view class="Sold" v-if="info.showLabel&&info.showLabel.indexOf('3')!=-1">已售 {{info.saleQty}}</view>
@@ -138,7 +140,9 @@
 						<view class="goodsPrice">
 							<view class="goodsPrice11" v-if="info.saleLabel">{{info.saleLabel}}</view>
 							<view class="goodsPrice22">¥</view>
-							<view class="goodsPrice33">{{info.salePrice?info.salePrice:info.scribingPrice}}</view>
+							<view class="goodsPrice33">{{info.salePrice?info.salePrice:info.scribingPrice}}
+							 <span v-if="info.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+							</view>
 							<view class="goodsPrice44" v-if="info.showLabel&&info.scribingPrice&&info.showLabel.indexOf('1')!=-1">¥{{info.scribingPrice}}</view>
 						</view>
 					</view>
@@ -209,6 +213,8 @@
 				code:'',
 				wxOpenData:'',
 				ext:'',
+				categoryIds:'',
+				thenShow:false,
 			}
 		},
 		onLoad(opt) {

+ 3 - 1
pages/shop/shop.vue

@@ -64,7 +64,9 @@
 	   					<view class="goodsPrice">
 	   						<view class="goodsPrice1">{{item.saleLabel}}</view>
 	   						<view class="goodsPrice2">¥</view>
-	   						<view class="goodsPrice3">{{item.salePrice?item.salePrice:item.scribingPrice}}</view>
+	   						<view class="goodsPrice3">{{item.salePrice?item.salePrice:item.scribingPrice}}
+							 <span v-if="item.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+							</view>
 	   						<view class="goodsPrice4" v-if="item.showLabel&&item.scribingPrice">
 								<span v-if="item.showLabel.indexOf('1')!=-1">¥{{item.scribingPrice}}</span>
 							</view>

二进制
static/timg/car1.png


二进制
static/timg/car2.png


二进制
static/timg/car3.png


二进制
static/timg/car4.png


二进制
static/timg/nocar.png