12-16

pages/index/index.vue

@@ -19,7 +19,7 @@
 				  <view class="carLeft">
 					  <view class="carTop" @click="changeCar">
 						  <image :src="carInfo.brandLogo" mode="" class="carLogo"></image>
-						  <view class="carInfomodel">{{carInfo.brand}}&nbsp;{{carInfo.series}}</view>
+						  <view class="carInfomodel">{{carInfo.brand?carInfo.brand:''}}&nbsp;{{carInfo.series?carInfo.series:''}}</view>
 						  <image src="../../static/img2/xia.png" mode="" class="carXia"></image>
 						  <view class="plateNumber" v-if="carInfo.plateNumber">
 						     <span class="plateNumberSpan1">{{carInfo.plateNumber.slice(0, 2)}}</span>
@@ -162,31 +162,31 @@
 		
 			<!-- 广告区 -->
 			<view class="advertisement" v-if="homeCardList.ad1.length>0">
-				<swiper class="swiper2" circular  :autoplay="true" :interval="interval"
+				<swiper class="swiper2" :style="{height: appletHomeSetting.adHeightSize1 + 'rpx'}" circular  :autoplay="true" :interval="interval"
 								:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
 					<swiper-item v-for="(item,index) in homeCardList.ad1">
-						<view class="swiper-item2" @click="goRoter(item)">
-							<image class="swiper-item2Img" :src="item.icon" mode=""></image>
+						<view class="swiper-item2"  @click="goRoter(item)">
+							<image class="swiper-item2Img" :style="{height: appletHomeSetting.adHeightSize1 + 'rpx'}" :src="item.icon" mode=""></image>
 						</view>	
 					</swiper-item>
 				</swiper>
 			</view>
 			<view class="advertisement" v-if="homeCardList.ad2.length>0">
-				<swiper class="swiper2" circular  :autoplay="true" :interval="interval"
+				<swiper class="swiper2" circular  :autoplay="true" :interval="interval" :style="{height: appletHomeSetting.adHeightSize2 + 'rpx'}"
 								:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
 					<swiper-item v-for="(item,index) in homeCardList.ad2">
 						<view class="swiper-item2" @click="goRoter(item)">
-							<image class="swiper-item2Img" :src="item.icon" mode=""></image>
+							<image class="swiper-item2Img" :src="item.icon" :style="{height: appletHomeSetting.adHeightSize2 + 'rpx'}" mode=""></image>
 						</view>	
 					</swiper-item>
 				</swiper>
 			</view>
 			<view class="advertisement" v-if="homeCardList.ad3.length>0">
-				<swiper class="swiper2" circular  :autoplay="true" :interval="interval"
+				<swiper class="swiper2" circular  :autoplay="true" :interval="interval" :style="{height: appletHomeSetting.adHeightSize3 + 'rpx'}"
 								:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
 					<swiper-item v-for="(item,index) in homeCardList.ad3">
 						<view class="swiper-item2" @click="goRoter(item)">
-							<image class="swiper-item2Img" :src="item.icon" mode=""></image>
+							<image class="swiper-item2Img" :src="item.icon" mode="" :style="{height: appletHomeSetting.adHeightSize3 + 'rpx'}"></image>
 						</view>	
 					</swiper-item>
 				</swiper>
@@ -196,18 +196,13 @@
 			<!-- 商品区 -->
 			<view class="goodsBox">
 				<view class="goodsTabBox">
-					<view class="goodsTab goodsACt">
-						<view>做保养</view>
-						<image class="activeGoodsIcon" src="../../static/img2/activeGoods.png" mode=""></image>
-					</view>
-					<view class="goodsTab">
-						<view>换轮胎</view>
-						<image class="activeGoodsIcon" src="../../static/img2/activeGoods.png" mode=""></image>
-					</view>
-					<view class="goodsTab">
-						<view>其他</view>
-						<image class="activeGoodsIcon" src="../../static/img2/activeGoods.png" mode=""></image>
+					<view class="goodsTab " :class="{goodsACt:tabIndex==index}" v-for="(item,index) in appletHomeSetting.sortSettingList">
+						<view @click="tabFn(index)" v-if="item.type==2">热销商品</view>
+						<view @click="tabFn(index)" v-if="item.type==1">热门活动</view>
+						<view @click="tabFn(index)" v-if="item.type==3&&homeCardList.isShowMaintain==1">{{homeCardList.maintainTitle}}</view>
+						<image v-if="tabIndex==index" class="activeGoodsIcon" src="../../static/img2/activeGoods.png" mode=""></image>
 					</view>
+					
 				</view>
 				<view class="goodsLIneBox">
 					<view class="goodsLine">
@@ -288,7 +283,7 @@
 				 				:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
 				 	<swiper-item v-for="(item,index) in homeCardList.activityModules">
 				 		<view class="swiper-itemTk" @click="goRoter(item)">
-				 			<image class="tkHdImg" :src="item.icon" mode="aspectFit"></image>
+				 			<image class="tkHdImg" :src="item.icon" mode="widthFix"></image>
 				 		</view>	
 				 	</swiper-item>
 				 </swiper>
@@ -340,6 +335,9 @@
 				exitNum:'',
 				appletHomeSetting:'',
 				activityModulesShow:false,
+				tabIndex:0,
+				OpenMGoods:'',
+				OpenMActivity:'',
 			}
 		},
 		onLoad(opt) {
@@ -384,6 +382,7 @@
 				this.getCarList();
 				this.queryHomeCardList()
 				this.queryManagerInfo()
+			
 			}else{
 					this.uniLogin()
 				
@@ -391,6 +390,7 @@
 			//版本更新
 		    this.UpdateManager();
 			
+			
 		},
 		onShow() {
 			
@@ -433,6 +433,21 @@
 			}, 1000);
 		},
 		methods: {
+			tabData(){
+				this.$http('openHome/queryOpenMGoods', {
+				 unionId:this.unionId
+				 },'GET').then(res => {
+					 
+				 })
+				 this.$http('openHome/queryOpenMActivity', {
+				  unionId:this.unionId
+				  },'GET').then(res => {
+				 	 
+				  })
+			},
+			tabFn(index){
+			  this.tabIndex=index	
+			},
 			activityModulesHide(){
 				this.activityModulesShow=false
 			},
@@ -936,6 +951,7 @@
 						this.$store.commit('mutationsuserInfo', that.wxOpenData.loginInfo.openUser)
 						this.userInfo=that.wxOpenData.loginInfo.openUser
 						that.queryManagerInfo()
+						that.tabData()
 						uni.setStorage({
 							key: 'userInfo',
 							data: that.wxOpenData.loginInfo.openUser,
@@ -1331,7 +1347,8 @@
 }
 .topCont{
 	padding: 8rpx 20rpx;
-	padding-bottom: 210rpx;
+	height: 100rpx;
+	/* padding-bottom: 210rpx; */
 }
 .carBox{
 	background: #FFFFFF;
@@ -1381,7 +1398,7 @@
 	height: 47rpx;
 	background: #FBF0E4;
 	border-radius: 10rpx;
-	margin-top: 18rpx;
+	margin-top: 22rpx;
 }
 .carDui{
 	width: 24rpx;height: 24rpx;
@@ -1421,24 +1438,26 @@
 }
 .contBox{
 	padding: 20rpx;
-	margin-top: -200rpx;
+	margin-top: 160rpx;
+/* 	margin-top: -200rpx; */
 }
 .swiper2{
 	height: 200rpx;
 }
 .swiper-item2Img{
-	height: 200rpx;width: 100%;
+	 height: 200rpx; 
+	width: 100%;
 	border-radius: 10rpx;
 }
-.swiper-item2{
+/* .swiper-item2{
 	height: 200rpx;
 	
-}
+} */
 .advertisement{
 	background: #FFFFFF;
 	margin-top: 20rpx;
 	border-radius: 16rpx;
-	height: 200rpx;
+/* 	height: 200rpx; */
 	/* padding: 12rpx 15rpx; */
 }
 .activeGoodsIcon{
@@ -1748,8 +1767,7 @@ color: #EC0F0A;margin-right: 10rpx;
 	}
 	.bxline{
 		display: flex;
-		
-		padding-top: 22rpx;
+		padding-bottom: 20rpx;
 	}
 	.bxline1{
 		width: 40%;
@@ -1781,8 +1799,8 @@ color: #EC0F0A;margin-right: 10rpx;
 	/* 	margin-left: 24rpx; */
 	}
 	.carTimeBox{
-		border-top: 1px solid #EEEEEE;
-		padding-bottom: 15rpx;
+	/* 	border-top: 1px solid #EEEEEE; */
+		/* padding-bottom: 15rpx; */
 	}
 	.plateNumberSpan1{
 		background: #0041FF;
@@ -1798,14 +1816,19 @@ color: #EC0F0A;margin-right: 10rpx;
 			border-radius: 0rpx 4rpx 4rpx 0rpx;
 	}
 	.swiperTk{
-		height: 30vh;
+		height: 50vh;
 		width: 100vw;
 	}
 	.swiper-itemTk{
-		height: auto;
+		display: flex;
+		justify-content: flex-end;
+		flex-direction: column;
+		align-items: center;
+		height: 50vh;
+		padding-bottom: 50rpx;
 	}
 	.tkHdImg{
-		width: 80vw;
+		width: 80vw;margin-bottom: 10px;
 	}
 	.swiper-itemTk{
 		text-align: center;

pages/user/addCar/addCar.vue

@@ -66,15 +66,15 @@
 					<image :src="carModelInfo.carModelInfo.logo" mode="" class="logo"></image>
 					<view class="mbContBox">
 						<view style="display: flex;justify-content: space-between;">
-							<view class="brand">{{carModelInfo.carModelInfo.brand}}
-							 &nbsp;  {{carModelInfo.carModelInfo.carModel}}
+							<view class="brand">{{carModelInfo.carModelInfo.brand?carModelInfo.carModelInfo.brand:''}}
+							 &nbsp;  {{carModelInfo.carModelInfo.carModel?carModelInfo.carModelInfo.carModel:''}}
 							</view>
-						    <view class="lineRgiht">
+						    <view class="lineRgiht" @click="goModel">
 						    	<view class="lineRtxt">重新选择</view>
 						    	<image src="../../../static/img2/jt1.png" mode="" class="jtIcon"></image>
 						    </view>
 						</view>
-						<view class="carMTxt">{{carModelInfo.value}}</view>
+						<view class="carMTxt">{{carModelInfo.value?carModelInfo.value:''}}</view>
 					</view>
 				</view>
 			</view>
@@ -216,6 +216,11 @@
 			} */
 		},
 		methods: {
+			goModel(){
+				uni.navigateTo({
+					url:'carModel'
+				})
+			},
 			keyDel(v){
 				 let d = this.vin	
 			    this.vin = d.substring(0,d.length-1)
@@ -591,6 +596,7 @@
 	font-size: 32rpx;
 	color: #090909;
 	line-height: 45rpx;
+	width: 350rpx;
 }
 .mbCont{
 	display: flex;

pages/user/user.vue

@@ -90,7 +90,7 @@
 				</view>
 				
 			</view>
-			<view style="padding-bottom: 20rpx;">
+			<view style="padding-bottom: 20rpx;" v-if="numList.remindIntegral">
 				<view class="remindBox" >
 				  <view class="remindLeft" style="display: flex;">
 					  <image style="width: 24rpx;height: 24rpx;margin-top: 2rpx;" src="http://dmsphoto.66km.com.cn/thFiles/BA87B937-90F3-420C-A21C-A5B7BE7E8B07.png" mode=""></image>
@@ -232,7 +232,7 @@
 					<view class="klineRow carInfoklineRow" @click="gonavigateTo('./addCar/cailist?type=3')">
 						<image :src="carInfo.brandLogo" mode="" class="carbrandLogo"></image>
 						<view class="carModel KlineTxt">
-							<span>{{carInfo.brand}}{{carInfo.series}}</span>
+							<span>{{carInfo.brand?carInfo.brand:''}}{{carInfo.series?carInfo.series:''}}</span>
 						</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('historySpend')">
@@ -250,7 +250,7 @@
 				</view>
 			</view>
 			
-			<view class="klineCont" ><!-- v-if="!carInfo" -->
+			<view class="klineCont"  v-if="!carInfo"><!-- -->
 				<image @click="addCar" :src="carAddImage" mode="" style="width: 100%;height: 148rpx;"></image>
 				<!-- <view class="klineTitle">我的爱车</view>
 				<view class="addCarBox">
@@ -285,11 +285,11 @@
 					    <view class="KlineTxt2">服务顾问</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('myBespeak')">
-						<image class="klineIcon" src="../../static/img2/huiyuan.png" mode=""></image>
+						<image class="klineIcon" src="../../static/img2/icon_yuyue.png" mode=""></image>
 					    <view class="KlineTxt2">我的预约</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('../subPack/rescueOrder')">
-						<image class="klineIcon" src="../../static/timg/sos.png" mode=""></image>
+						<image class="klineIcon" src="../../static/img2/jyjl.png" mode=""></image>
 					    <view class="KlineTxt2">救援记录</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('../index/onlineBooking')">
@@ -309,12 +309,12 @@
 				<view class="kline">
 					<button open-type="share" class="klineRow">
 					<view class="">
-						<image class="klineIcon" src="../../static/img/icon_me6.png" mode=""></image>
+						<image class="klineIcon" src="../../static/img2/fenx.png" mode=""></image>
 					    <view class="KlineTxt2">分享好友</view>
 					</view>
 					</button>
 					<view class="klineRow" @click="gonavigateTo('../subPack/luckList')" v-if="numList.shopSettings.luckdrawDisabled">
-						<image class="klineIcon" src="../../static/timg/icon_jydd.png" mode=""></image>
+						<image class="klineIcon" src="../../static/img2/hdjp.png" mode=""></image>
 					    <view class="KlineTxt2">活动奖品</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('../referral/referral')" v-if="numList.customerInfo.rebateState==1&&numList.shopSettings.introductionDisabled">
@@ -342,7 +342,7 @@
 					    <view class="KlineTxt2">公司介绍</view>
 					</view>
 					<view class="klineRow" @click="makePhoneCall(showSetting.tel)">
-						<image class="klineIcon" src="../../static/img2/icon_fwzj.png" mode=""></image>
+						<image class="klineIcon" src="../../static/img2/kefu.png" mode=""></image>
 					    <view class="KlineTxt2">联系客服</view>
 					</view>
 				</view>
@@ -604,14 +604,14 @@
 					// color: '#FF0000',
 					 selectedColor: '#222222',
 				}) */
-				uni.setTabBarItem({
+				/* uni.setTabBarItem({
 					index: 3,
 					text: '我的',
 					selectedIconPath: backgroundImage
-				})
+				}) */
 			}
 			uni.setNavigationBarColor({
-				frontColor: "#ffffff",
+				frontColor: "#000000",
 				backgroundColor: '#' + this.themeColor
 			})
 			this.getVersionInfo()
@@ -1136,7 +1136,7 @@ padding-right: 10rpx;
 	/* 	margin-top: -100rpx; */
 }
 .marginTop{
-	margin-top: -240rpx;
+	margin-top: -190rpx;
 }
 .marginTop2{
 	margin-top: -120rpx;
@@ -1320,7 +1320,7 @@ padding-right: 10rpx;
 	}
 
 	.top {
-		height: 350rpx;
+		height: 300rpx;
 		padding: 20rpx 24rpx 0;
 		/* background-color: #D53533; */
 		border-radius: 0 0 5% 5%;
@@ -1346,7 +1346,7 @@ padding-right: 10rpx;
 
 	.nickName {
 		font-size: 34rpx;
-		color: #FFFFFF;
+		color: #010000;
 		font-weight: bold;
 		line-height: 48rpx;
 		height: 48rpx;
@@ -1357,7 +1357,7 @@ padding-right: 10rpx;
 	}
 	.nickName2 {
 		font-size: 30rpx;
-		color: #FFFFFF;
+		color: #010000;
 		font-weight: bold;
 		line-height: 48rpx;
 		height: 48rpx;
@@ -1381,7 +1381,7 @@ padding-right: 10rpx;
 
 	.phone {
 		font-size: 24rpx;
-		color: #FFFFFF;
+		color: #010000;
 	}
     .padingBox{
 		padding: 0 20rpx;

utils/request.js

@@ -9,8 +9,8 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 //const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.1.14:20187/'
-const baseUrl='http://api.dms.66km.com.cn/'
+const baseUrl='http://192.168.1.14:20187/'
+//const baseUrl='http://api.dms.66km.com.cn/'
 //const baseUrl='http://192.168.0.10:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://apidms.66km.com/'