2.0

components/tki-float-keyboard/tki-float-keyboard.vue

@@ -178,8 +178,8 @@ export default {
 			number: [1, 2, 3, 4, 5, 6, 7, 8, 9, 0],
 			letter: {
 				row_1: ["Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P"],
-				row_2: ["A", "S", "D", "F", "G", "H", "J", "K", "L","Z",],
-				row_3: ["X", "C", "V", "B", "N", "M"],
+				row_2: ["A", "S", "D", "F", "G", "H", "J", "K", "L",],
+				row_3: ["Z","X", "C", "V", "B", "N", "M"],
 			},
 			symbolCP_: true,
 			provinceCP_: true,

pages.json

@@ -181,8 +181,10 @@
 		{
 			"path": "pages/user/addCar/addCar",
 			"style": {
-				"navigationBarTitleText": "添加车辆",
-				"enablePullDownRefresh": false
+				/* "navigationBarTitleText": "添加车辆",
+				"enablePullDownRefresh": false */
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 
 		},
@@ -515,6 +517,14 @@
 				"navigationBarTitleText": "优惠券详情"
 				
 			}
+		},
+		{
+			"path": "pages/shopList/shopList",
+			"style": {
+				"navigationBarTitleText": "门店",
+				"enablePullDownRefresh": true
+			}
+		
 		}
     ],
 	"subPackages": [{
@@ -583,7 +593,13 @@
 							"navigationStyle": "custom",
 							"enablePullDownRefresh": true
 						}
-					
+					},{
+						"path": "addCarCK",
+						"style": {
+							"navigationBarTitleText": "选择车型",
+							"enablePullDownRefresh": false
+						}
+
 					}
 				]
 				
@@ -591,7 +607,7 @@
 	
 		"tabBar": {
 			"color": "#8a8a8a",
-			"selectedColor": "#8a8a8a",
+			"selectedColor": "#222222",
 			"borderStyle": "black",
 			"backgroundColor": "#ffffff",
 			"list": [{
@@ -612,6 +628,12 @@
 					"selectedIconPath": "./static/tabimg/activty2.png",
 					"text": "活动"
 				},
+				 {
+					"pagePath": "pages/shopList/shopList",
+					"iconPath": "./static/tabimg/activty2.png",
+					"selectedIconPath": "./static/tabimg/activty2.png",
+					"text": "门店"
+				}, 
 				{
 					"pagePath": "pages/user/user",
 					"iconPath": "./static/tabimg/me2.png",

pages/activity/activity.vue

@@ -76,7 +76,7 @@
 				if(this.themeColor=='D53533'){
 					var backgroundImage='/static/tabimg/activity1.png'
 				}
-				uni.setTabBarStyle({
+				/* uni.setTabBarStyle({
 				  // color: '#FF0000',
 				  selectedColor: '#'+this.themeColor,
 				})
@@ -84,7 +84,7 @@
 				  index: 2,
 				  text: '活动',
 				   selectedIconPath: backgroundImage
-				})
+				}) */
 			}
 		},
 

pages/index/index.vue

@@ -1,9 +1,11 @@
 <template>
 	<view class="content">
+		<view v-show="homeCardList">
 		 <view class="top" :style="{background:'#'+themeColor}">
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view class="logoBox">
-				<image src="../../static/img2/indexlogo.png" mode="" class="logoImg"></image>
+				<!-- <image src="../../static/img2/indexlogo.png" mode="" class="logoImg"></image> -->
+				 <image v-if="appletHomeSetting.showImageType==0" :src="appletHomeSetting.showImage" mode="" class="logoImg"></image> 
 			</view>
 		</view>
 		<view>
@@ -11,93 +13,217 @@
 			<view style="height: 100rpx;"></view>
 		</view>
 		<view class="topCont" :style="{background:'#'+themeColor}">
+			<!-- 有车 -->
 			<view class="carBox">
-			  <view class="carLeft">
-				  <view class="carTop">
-					  <image src="../../static/timg/nocar.png" mode="" class="carLogo"></image>
-					  <view class="carInfomodel">{{carInfo.brand}}&nbsp;{{carInfo.model}}</view>
-					  <image src="../../static/img2/xia.png" mode="" class="carXia"></image>
-					  <view class="plateNumber">{{carInfo.plateNumber}}</view>
-					  <image src="../../static/img2/carBj.png" mode="" class="carBj"></image>
-				  </view>
-				  <view class="carBq">
-					  <view class="carBqLine">
-						  <image src="../../static/img2/carDui.png" mode="" class="carDui"></image>
-						  <view class="carTitle">车况报告</view>
-					  </view>
-					  <view class="carBqLine">
-						  <image src="../../static/img2/carDui.png" mode="" class="carDui"></image>
-						  <view class="carTitle">车况报告</view>
+				<view class="carBox2">
+				  <view class="carLeft">
+					  <view class="carTop" @click="changeCar">
+						  <image src="../../static/timg/nocar.png" mode="" class="carLogo"></image>
+						  <view class="carInfomodel">{{carInfo.brand}}&nbsp;{{carInfo.model}}</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>
+							 <span class="plateNumberSpan2">{{carInfo.plateNumber.slice(2)}}</span>
+						  </view>
+						<!--  <image src="../../static/img2/carBj.png" mode="" class="carBj"></image> -->
 					  </view>
-					  <view class="carBqLine">
-						  <image src="../../static/img2/carDui.png" mode="" class="carDui"></image>
-						  <view class="carTitle">车况报告</view>
+					  <view class="carBq">
+						  <view class="carBqLine">
+							  <image src="../../static/img2/carDui.png" mode="" class="carDui"></image>
+							  <view class="carTitle">车况报告</view>
+						  </view>
+						  <view class="carBqLine">
+							  <image src="../../static/img2/carDui.png" mode="" class="carDui"></image>
+							  <view class="carTitle">保养记录</view>
+						  </view>
+						  <view class="carBqLine">
+							  <image src="../../static/img2/carDui.png" mode="" class="carDui"></image>
+							  <view class="carTitle">快速救援</view>
+						  </view>
 					  </view>
+					
 				  </view>
-			  </view>
-			  <view class="carRight">
-				  <image src="../../static/img2/carLogo.png" mode="" class="carLogoBg"></image>
-			  </view>
+				  <view class="carRight">
+					  <image src="../../static/img2/carLogo.png" mode="" class="carLogoBg"></image>
+				  </view>
+				  
+				</view>
+				<view class="carTimeBox">
+					  <view class="bxBox">
+							  <view class="bxline bxline1" v-if="appletHomeSetting.carInsuranceType==3">
+								  <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 bxline1" v-if="appletHomeSetting.carInsuranceType==2">
+										  <img src="../../static/timg/car1.png" alt="" class="bxlineIcon">
+										  <view class="bxlineTitle">保险</view>
+										  <view class="bxlineMs1" v-if="carInfo.insuranceExpireDate">{{carInfo.insuranceExpireDate}}</view>
+										  <view class="bxlineMs2" v-else>--</view>
+							  </view>
+							  <view class="bxline bxline2" v-if="appletHomeSetting.carMaintainType ==3">
+								  <img src="../../static/timg/car2.png" alt="" class="bxlineIcon" >
+								  <view class="bxlineTitle">下次保养</view>
+								  <view class="bxlineMs1" v-if="carInfo.nextCareDate||carInfo.nextCareMilage">
+									 <span v-if="NextCareDate||NextCareDate===0">{{NextCareDate}}天后</span>
+									 <span v-if="NextCareDate===0&&carInfo.nextCareMilage">或</span>
+									 <span v-if="carInfo.nextCareMilage&&NextCareDate">或</span>
+									 <span v-if="carInfo.nextCareMilage">{{carInfo.nextCareMilage}}km</span>
+								  </view>
+								   <view class="bxlineMs2" v-else>--</view>
+							  </view>
+							  <view class="bxline bxline2" v-if="appletHomeSetting.carMaintainType ==2">
+								  <img src="../../static/timg/car2.png" alt="" class="bxlineIcon" >
+								  <view class="bxlineTitle">下次保养</view>
+								  <view class="bxlineMs1" v-if="carInfo.nextCareDate||carInfo.nextCareMilage">
+									 <span v-if="NextCareDate||NextCareDate===0">{{carInfo.nextCareDate}}</span>
+									 <span v-if="NextCareDate===0&&carInfo.nextCareMilage">或</span>
+									 <span v-if="carInfo.nextCareMilage&&NextCareDate">或</span>
+									 <span v-if="carInfo.nextCareMilage">{{carInfo.nextCareMilage}}km</span>
+								  </view>
+								   <view class="bxlineMs2" v-else>--</view>
+							  </view>
+							  <view class="bxline bxline1" v-if="appletHomeSetting.carAuditType==3">
+								  <img src="../../static/timg/car3.png" alt="" class="bxlineIcon" >
+								  <view class="bxlineTitle">年审</view>
+								  <view class="bxlineMs1" v-if="carInfo.nextAuditDate">{{NextAuditDate}}天到期</view>
+								   <view class="bxlineMs2" v-else>--</view>
+							  </view>
+							  <view class="bxline bxline1" v-if="appletHomeSetting.carAuditType==2">
+								  <img src="../../static/timg/car3.png" alt="" class="bxlineIcon" >
+								  <view class="bxlineTitle">年审</view>
+								  <view class="bxlineMs1" v-if="carInfo.nextAuditDate">{{arInfo.nextAuditDate}}</view>
+								  <view class="bxlineMs2" v-else>--</view>
+							  </view>
+							  <view class="bxline bxline2" v-if="homeCardList.openMCar.showType==1">
+								  <img src="../../static/timg/car4.png" alt="" class="bxlineIcon" >
+								  <view class="bxlineTitle">保养手册</view>
+								  <view class="bxlineMs2" @click="information">点击查看</view>
+							  </view>
+					  </view>
+				</view>
+			</view>
+		
+			<!-- 有车 -->
+			<!-- 无车 -->
+			<view class="nocarBox" v-if="!carInfo">
+				<view style="display: flex;">
+					<image v-if="appletHomeSetting.carAddImageType==1" src="../../static/img2/pic.png" mode="" class="carAddImage"></image>
+					<image v-else :src="appletHomeSetting.carAddImage" mode="" class="carAddImage"></image>
+					<view class="addCarMs">
+						<view class="addCarMs1">添加爱车推荐精准服务</view>
+						<view class="addCarMs2">车辆有问题,安徒生来帮您!</view>
+					</view>
+				</view>
+				<view class="addCarBtn" @click="addCar">添加爱车</view>
+				
 			</view>
+			<!-- 无车 -->
 
 		</view>
 		<view class="contBox">
+		<!-- 服务顾问 -->
+		<view v-if="homeCardList.openMUsers">
+			<view class="adviser" v-if="homeCardList.openMUsers.showType!=2&&managerInfo" @click="goMUsers()">
+				<view class="adviserLeft">
+					<img v-if="managerInfo.avatar" :src="managerInfo.avatar" alt="" class="advisertx">
+					<img v-else src="../../static/timg/pic_def_ava@2x.png" alt="" class="advisertx">
+					<view class="adviserNema">{{managerInfo.name}}</view>
+					<view class="adviserms" :style="{border:'1px solid #'+themeColor,color:'#'+themeColor}">服务顾问</view>
+				</view>
+				<img src="../../static/timg/icon_arrow_right.png" alt="" class="adviserJt">
+			</view>
+		</view>
+		<!-- 服务顾问 -->
 		<!-- 	 中间应用模块 -->
 			<view class="modular">
 				<view class="modularLine">
-					<view class="modularMk" @click="goShopList">
+					<view class="modularMk"  @click="goRoter(item)" v-if="index<4"  v-for="(item,index) in homeCardList.application">
 						<view class="modularLogoBox">
-							<image src="../../static/img2/icon_1.png" mode="" class="modularLogo"></image>
+							<image :src="item.icon" mode="" class="modularLogo"></image>
 						</view>
-						<view class="modularTitle">做保养</view>
-					</view>
-					<view class="modularMk">
-						<view class="modularLogoBox">
-							<image src="../../static/img2/icon_1.png" mode="" class="modularLogo"></image>
-						</view>
-						<view class="modularTitle">做保养</view>
-					</view>
-					<view class="modularMk">
-						<view class="modularLogoBox">
-							<image src="../../static/img2/icon_1.png" mode="" class="modularLogo"></image>
-						</view>
-						<view class="modularTitle">做保养</view>
-					</view>
-					<view class="modularMk">
-						<view class="modularLogoBox">
-							<image src="../../static/img2/icon_1.png" mode="" class="modularLogo"></image>
-						</view>
-						<view class="modularTitle">做保养</view>
+						<view class="modularTitle">{{item.name}}</view>
 					</view>
+					
 				</view>
 				<view class="modularLine" style="margin-top: 13rpx;">
-					<view class="modularMk">
+					<view class="modularMk"  @click="goRoter(item)" v-if="index>3"  v-for="(item,index) in homeCardList.application">
 						<view class="modularLogoBox">
-							<image src="../../static/img2/icon_1.png" mode="" class="modularLogo"></image>
+							<image :src="item.icon" mode="" class="modularLogo"></image>
 						</view>
-						<view class="modularTitle2">做保养</view>
+						<view class="modularTitle2">{{item.name}}</view>
 					</view>
-					<view class="modularMk">
-						<view class="modularLogoBox">
-							<image src="../../static/img2/icon_1.png" mode="" class="modularLogo"></image>
-						</view>
-						<view class="modularTitle2">做保养</view>
+				
+				</view>
+			</view>
+			<!-- 中间应用模块 -->
+		
+			<!-- 广告区 -->
+			<view class="advertisement" v-if="homeCardList.ad1.length>0">
+				<swiper class="swiper2" 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>	
+					</swiper-item>
+				</swiper>
+			</view>
+			<!-- 广告区 -->
+			
+			<!-- 商品区 -->
+			<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="modularMk">
-						<view class="modularLogoBox">
-							<image src="../../static/img2/icon_1.png" mode="" class="modularLogo"></image>
-						</view>
-						<view class="modularTitle2">做保养</view>
+					<view class="goodsTab">
+						<view>换轮胎</view>
+						<image class="activeGoodsIcon" src="../../static/img2/activeGoods.png" mode=""></image>
 					</view>
-					<view class="modularMk">
-						<view class="modularLogoBox">
-							<image src="../../static/img2/icon_1.png" mode="" class="modularLogo"></image>
+					<view class="goodsTab">
+						<view>其他</view>
+						<image class="activeGoodsIcon" src="../../static/img2/activeGoods.png" mode=""></image>
+					</view>
+				</view>
+				<view class="goodsLIneBox">
+					<view class="goodsLine">
+						<view class="goodsLeft">
+							<image class="goodsIcon" src="../../static/img2/icon_1.png" mode=""></image>
+						</view>
+						<view class="goodsRight">
+							<view class="goodsRtop">
+								<view class="goodsName">全合成机油保养2次</view>
+								<view class="goodsMs">含:发动机机油、机油滤芯、雾化杀菌等</view>
+							</view>
+							<view class="goodsRb">
+								<view class="goodsCBox">
+									<view class="goodsCLeft">
+										<view style="display: flex;"><view class="goodsTitle">2次更划算</view></view>
+										<view class="goodsPriceBox">
+											<span class="goodsPrice1">￥</span>
+											<span class="goodsPrice2">294</span>
+											<span class="goodsPrice3">/次¥588</span>
+										</view>
+									</view>
+									<view class="goodsCRight">
+										立即抢购
+									</view>
+								</view>
+								<view class="goodsKbox">
+									<view class="goosK1">增效全合成</view>
+									<view class="goosK2">粘度级别</view>
+									<!-- <view class="goosK2">0W-20/5W-40/5W-30</view> -->
+								</view>
+							</view>
 						</view>
-						<view class="modularTitle2">做保养</view>
 					</view>
 				</view>
 			</view>
-			<!-- 中间应用模块 -->
+			<!-- 商品区 -->
+			
 		</view>
 		 
 		
@@ -135,7 +261,7 @@
 		 </view>
 		 
  
-		 
+		</view> 
 	</view>
 </template>
 
@@ -173,6 +299,7 @@
 				qrSHow:false,
 				customerInfo:'',
 				exitNum:'',
+				appletHomeSetting:'',
 			}
 		},
 		onLoad(opt) {
@@ -704,21 +831,7 @@
 							 msg='授权失败'
 						 }
 						 console.log(msg);
-						 // uni.showModal({
-						 // 	title: '提示',
-						 // 	content: msg,
-						 // 	success: function(resTK) {
-						 // 		if (resTK.confirm) {
-						 			
-						 // 		}
-						 // 	}
-						 // });
-						 // uni.showToast({
-						 // 	title:msg,
-						 // 	icon: 'none',
-						 // 	duration: 3000
-						 // });
-						//return false
+						
 					}
 				 	this.wxOpenData=res.data;
 					this.themeColor=res.data.themeColor
@@ -741,13 +854,15 @@
 					}
 					uni.setTabBarStyle({
 					  // color: '#FF0000',
-					  selectedColor: '#'+this.themeColor,
+					  //selectedColor: '#'+this.themeColor,
+					  selectedColor: '#222222',
 					})
-					uni.setTabBarItem({
-					  index: 0,
-					  text: '首页',
+					
+					/* uni.setTabBarItem({
+					   index: 0,
+					   text: '首页',
 					   selectedIconPath: backgroundImage
-					})
+					}) */
 					if(res.code==0){
 						that.queryHomeCardList()
 					}
@@ -1042,6 +1157,8 @@
 				  },'GET').then(res => {
 					    uni.hideLoading();
 				 		this.homeCardList=res.data;
+						this.appletHomeSetting=res.data.appletHomeSetting;
+						var appletHomeSetting=this.appletHomeSetting
 						uni.setStorage({
 							key: 'openMCar',
 							data: res.data.openMCar,
@@ -1049,7 +1166,36 @@
 							   that.getCarList()
 							 }
 						}); 
-						
+						uni.setTabBarItem({
+						   index: 0,
+						   text: '首页',
+						   iconPath:appletHomeSetting.homeImageUnCheck,
+						   selectedIconPath: appletHomeSetting.homeImageCheck
+						})
+						uni.setTabBarItem({
+						   index: 1,
+						   text: '商城',
+						   iconPath:appletHomeSetting.mallImageUnCheck,
+						   selectedIconPath: appletHomeSetting.mallImageCheck
+						})
+						uni.setTabBarItem({
+						   index: 2,
+						   text: '活动',
+						   iconPath:appletHomeSetting.activityImageUnCheck,
+						   selectedIconPath: appletHomeSetting.activityImageCheck
+						})
+						uni.setTabBarItem({
+						   index: 3,
+						   text: '门店',
+						   iconPath:appletHomeSetting.storeImageUnCheck,
+						   selectedIconPath: appletHomeSetting.storeImageCheck
+						})
+						uni.setTabBarItem({
+						   index: 4,
+						   text: '我的',
+						   iconPath:appletHomeSetting.mineImageUnCheck,
+						   selectedIconPath: appletHomeSetting.mineImageCheck
+						})
 				  })
 			 },
 			 getShopinfo(num,shopId){
@@ -1106,6 +1252,9 @@
 .logoImg{
 	height: 72rpx;width: 492rpx;
 }
+.logoBox{
+	height: 72rpx;
+}
 .logoBox{
 	padding-left: 20rpx;
 	padding-bottom: 20rpx;
@@ -1118,12 +1267,15 @@
 .carBox{
 	background: #FFFFFF;
 	border-radius: 17rpx;
-	display: flex;
-	justify-content: space-between;
+	
 	padding-top: 20rpx;
 	padding-right: 24rpx;
 	padding-left: 30rpx;
 }
+.carBox2{
+	display: flex;
+	justify-content: space-between;
+}
 .carLogoBg{
 	width: 123rpx;
 	height: 127rpx;
@@ -1179,10 +1331,10 @@
 	padding: 34rpx 0;
 }
 .modularMk{
-	padding: 0 38rpx;text-align: center;
+	width: 25%;text-align: center;
 }
 .modularLine{
-	display: flex;
+	display: flex;flex-wrap: wrap;
 }
 .modularLogo{
 	width: 97rpx;height: 97rpx;
@@ -1200,6 +1352,163 @@
 	padding: 20rpx;
 	margin-top: -200rpx;
 }
+.swiper2{
+	height: 200rpx;
+}
+.swiper-item2Img{
+	height: 200rpx;width: 100%;
+	border-radius: 10rpx;
+}
+.swiper-item2{
+	height: 200rpx;
+	
+}
+.advertisement{
+	background: #FFFFFF;
+	margin-top: 20rpx;
+	border-radius: 16rpx;
+	height: 200rpx;
+	padding: 12rpx 15rpx;
+}
+.activeGoodsIcon{
+	width: 55rpx;height: 19rpx;margin-top: 10rpx;
+}
+.goodsTabBox{
+	display: flex;
+}
+.goodsTab{
+	text-align: center;
+	font-weight: 400;
+	font-size: 28rpx;
+	color: #8B8B8B;
+	line-height: 40rpx;
+	padding-right: 50rpx;
+}
+.goodsBox{
+	margin-top: 20rpx;
+}
+.goodsACt{
+	font-weight: 500;
+	font-size: 28rpx;
+	color: #222222;
+}
+.goodsLine{
+	background: #FFFFFF;border-radius: 16rpx;
+	padding: 24rpx;
+}
+.goodsIcon{
+	width: 246rpx;border-radius: 12rpx;
+	height: 246rpx;
+}
+.goodsLine{
+	display: flex;
+}
+.goodsName{
+	font-weight: 500;
+	font-size: 28rpx;
+	color: #222222;
+	line-height: 40rpx;
+}
+.goodsRight{
+	padding-left: 24rpx;
+	width: 438rpx;
+	display: flex;
+	 flex-direction: column;justify-content: space-between;
+}
+.goodsMs{
+	font-weight: 400;padding-top: 5rpx;
+	font-size: 20rpx;
+	color: #8B8B8B;
+	line-height: 28rpx;
+}
+.goodsCBox{
+	display: flex;justify-content: space-between;
+}
+.goodsTitle{
+	height: 25rpx;line-height: 25rpx;font-size: 18rpx;
+color: #EC0F0A;padding: 0 10rpx;
+	background: #FEE6E5;
+}
+.goodsCRight{
+	width: 147rpx;
+	height: 58rpx;
+	background: #EC0F0A;
+	border-radius: 29rpx;
+	line-height: 58rpx;
+	text-align: center;
+	font-size: 24rpx;
+    color: #FFFFFF;
+}
+.goodsPriceBox{
+	line-height: 45rpx;
+	font-size: 22rpx;
+	color: #8B8B8B;
+}
+.goodsPrice1{
+	font-weight: 500;
+	font-size: 20rpx;
+	color: #EC0F0A;
+}
+.goodsPrice2{
+	font-weight: 500;
+	font-size: 34rpx;
+	color: #EC0F0A;
+}
+.goodsKbox{
+	display: flex;flex-wrap: wrap;
+}
+.goosK1 {
+	height: 25rpx;line-height: 25rpx;padding: 0 8rpx;
+	border: 1rpx solid #EC0F0A;font-size: 18rpx;
+color: #EC0F0A;margin-right: 10rpx;
+}
+.goosK2{
+	height: 25rpx;line-height: 25rpx;padding: 0 8rpx;color: #000000;
+	border: 1rpx solid #FCD903;font-size: 18rpx;
+}
+.carAddImage{
+	width: 91rpx;height: 123rpx;
+}
+.nocarBox{
+	background: #FFFFFF;
+	border-radius: 17rpx;
+	padding: 12rpx 20rpx;
+	display: flex;
+	margin-top: 20rpx;
+	justify-content: space-between;
+}
+.addCarMs{
+	padding-left: 26rpx;padding-top: 32rpx;
+}
+.addCarMs1{
+	font-weight: 500;
+	font-size: 30rpx;
+	color: #222222;
+}
+.addCarMs1{
+	font-weight: 500;
+	font-size: 30rpx;
+	color: #222222;
+}
+.addCarMs2{
+	font-weight: 400;
+	font-size: 24rpx;
+	color: #999999;
+}
+.addCarBtn{
+	width: 183rpx;
+	height: 53rpx;
+	background: #222222;
+	border-radius: 27rpx;
+	font-weight: 600;
+	font-size: 28rpx;
+	color: #FCD903;
+	text-align: center;
+	line-height: 53rpx;
+	margin-top: 40rpx;
+}
+
+
 	.authorizBox{
 		width: 100vw;
 		height: 100vh;
@@ -1326,5 +1635,95 @@
 		margin-top:40rpx;
 	}
 	
-	
+	.adviser{
+		
+		background: #FFFFFF;
+		border-radius: 10px;
+		display: flex;
+		justify-content: space-between;
+		padding: 18rpx 20rpx;
+		margin-bottom: 20rpx;
+	}
+	.adviserLeft{
+		display: flex;
+	}
+	.advisertx{
+		width: 62rpx;height: 62rpx;
+	}
+	.adviserNema{
+		color: #333333;font-size: 30rpx;
+		line-height: 62rpx;padding-left: 24rpx;
+	}
+	.adviserms{
+		width: 118rpx;
+		height: 36rpx;
+		border-radius: 4rpx;
+		border: 1px solid #D53533;
+		line-height: 36rpx;
+		text-align: center;
+		margin-top: 12rpx;
+		margin-left: 20rpx;
+		color: #D53533;
+		font-size: 24rpx;
+	}
+	.adviserJt{
+		width: 12rpx;
+		height: 20rpx;
+		margin-top: 20rpx;
+	}
+	.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: 26rpx;
+		padding-left: 12rpx;
+	}
+	.bxlineMs2{
+		line-height: 37rpx;
+		color: #999999;
+		font-size: 24rpx;
+		padding-left: 12rpx;
+	}
+	.bxlineIcon{
+		width: 34rpx;
+		height: 34rpx;
+	/* 	margin-left: 24rpx; */
+	}
+	.carTimeBox{
+		border-top: 1px solid #EEEEEE;
+		padding-bottom: 15rpx;
+	}
+	.plateNumberSpan1{
+		background: #0041FF;
+		border-radius: 4rpx 0rpx 0rpx 4rpx;
+		color: #FFFFFF;
+		border: 1px solid #0041FF;
+		padding: 0 6rpx;
+	}
+	.plateNumberSpan2{
+		color: #0B0B0B;
+		border: 1px solid #0041FF;
+			padding: 0 6rpx;
+			border-radius: 0rpx 4rpx 4rpx 0rpx;
+	}
 </style>

pages/shop/shop.vue

@@ -178,7 +178,7 @@
 				if(this.themeColor=='D53533'){
 					var backgroundImage='/static/tabimg/shop1.png'
 				}
-				uni.setTabBarStyle({
+				/* uni.setTabBarStyle({
 				  // color: '#FF0000',
 				  selectedColor: '#'+this.themeColor,
 				})
@@ -186,7 +186,7 @@
 				  index: 1,
 				  text: '商城',
 				   selectedIconPath: backgroundImage
-				})
+				}) */
 			}
 			this.ext=this.$common.getExtStoreId();
 			this.getcategoryList();

pages/shopList/shopList.vue

@@ -0,0 +1,995 @@
+<template>
+	<view class="box">
+		<!-- <view class="sstop">
+			<image src="../../static/timg/icon_search@2x.png" mode="" class="sstopimg"></image>
+			<input type="text" v-model="shopName" placeholder="请输入门店名称、门店地址" class="sstopInput" @confirm="getqueryShopList2">
+			<image src="../../static/img/icon_close.png" mode="" @click="empty" v-if="inputChShow" class="inputCh"></image>
+		</view>
+        <view class="regionBox">
+			<view class="regionLine" @click="gocity">
+				<view class="regionTxt">{{cityName}}</view>
+				<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
+			</view>
+			<view class="regionSx"></view>
+			<view class="regionLine" @click="quCilck">
+				
+				<view class="regionTxt">{{areaName}}</view>
+				<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
+			</view>
+		</view> -->
+		<view class="newTop">
+			<view class="newTopSSbox">
+				<view class="newTopSSLeft">
+					<view class="newregionTxt">{{cityName}}</view>
+					<image src="../../static/img2/xia.png" mode="" class="newTopXia"></image>
+				</view>
+				<view class="newTopSSRight">
+					<image class="newSImg" src="../../static/timg/icon_search@2x.png" mode=""></image>
+					<input type="text" v-model="shopName" placeholder="门店名称、地址" class="sstopInput" @confirm="getqueryShopList2">
+				</view>
+				
+			</view>
+		</view>
+		
+		
+		<view style="height: 135rpx;"></view>
+		<view class="shopline" v-for="(item,index) in queryShopList">
+			<view class="newdistance" v-if="item.distance&&item.distance!= '0.00'">
+				 <image src="../../static/img2/dh.png" mode="" class="dhImg"></image>
+				<view><span >{{item.distance}}km</span></view>
+			</view>
+				
+			<view class="shoplineLeft">
+				<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
+				<image src="../../static/timg/noimg.png" mode="" class="shopImg" v-else></image>
+			</view>
+			<view class="shopright">
+				<view style="display: flex;justify-content: space-between;">
+					<view style="width: 410rpx;">
+						<view class="shopTop">
+							<view class="shopName">{{item.shopName}}</view>
+						</view>
+						<view class="brandsBg" v-if="item.brands">
+							<view class="brands" v-for="(v,index2) in item.brands.split(',')">{{v}}</view>
+						</view>
+					</view>
+					
+				</view>	
+				
+				
+
+				<view class="shopTime">
+					营业时间: <span v-if="item.startTime">{{item.startTime}}</span> - <span
+						v-if="item.endTime">{{item.endTime}}</span> </view>
+
+				<view class="shopBottomLeft">
+
+					<span class="shopaddress"
+						v-if="item.address">{{item.address}}</span>
+				
+				</view>
+				<view class="shopdhBox"> 
+					<view class="shopcall" style="" @click.stop="goDetail(item)">
+						  <image class="shopcallIcon" src="../../static/img2/yueyue.png" mode=""></image>
+						<view class="shopcallTxt">预约</view>
+					</view>
+					<view class="shopcall"  @click.stop="goMap(item)">
+						  <image class="shopcallIcon" src="../../static/img2/dhjt.png" mode=""></image>
+						<view class="shopcallTxt">导航</view>
+					</view>
+					<view class="shopcall" @click.stop="makePhoneCall(item.mobilePhone)">
+						  <image class="shopcallIcon" src="../../static/img2/call.png" mode=""></image>
+						  <view class="shopcallTxt">电话</view>
+					</view>
+					<view class="shopcall" >
+						  <image class="shopcallIcon" src="../../static/img2/wx.png" mode=""></image>
+						  <view class="shopcallTxt">店长微信</view>
+					</view>
+				 
+				</view>
+
+			</view>
+
+
+
+		</view>
+
+
+		<!-- 上拉 加载更多 -->
+		<view class="noMore" v-if="noMoreShow && (queryShopList.length!=0)">没有更多数据</view>
+		<!-- 无数据空白页 -->
+		<nodata v-if="queryShopList.length==0&&loading"></nodata>
+        <uni-popup ref="popup" type="right" :mask-click="true">
+			<view class="popup-content">
+				<scroll-view class="brandList" scroll-y="true">
+					<!-- :class="{areaActvie:item.area==areaName}" -->
+					<view v-for="item in areaList" class="areaListLine"
+					 
+					 @click="checkarea(item)">
+					  <span >{{item.area}}</span>
+					  <image v-if="item.code==area" class="areaCkIcon" src="http://dmsphoto.66km.com.cn/thFiles/0A1DADEA-1807-4ABC-B391-ECC8B1882DA4.png" mode=""></image>
+					</view>
+				</scroll-view>
+			</view>
+			
+		</uni-popup>
+		<!-- 手机号授权 -->
+		<view class="authorizBox" v-if="authorizShow" @click="authorizShowno">
+			<view class="authorizCont" @click.stop="">
+				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
+				<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
+				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+			</view>
+			<view style="text-align: center;padding-top: 56rpx;">
+				<image src="../../static/timg/icon_guanbi@2x.png"  @click="authorizShowno" mode="" class="authorizCloseImg"></image>
+			</view>
+		</view>
+		<!-- <view>lng:{{location.lng}}</view>
+		<view>lat:{{location.lat}}</view> -->
+	</view>
+</template>
+
+<script>
+	import nodata from '../../components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata,
+		},
+
+		data() {
+			return {
+				location: {
+					lng: '',
+					lat: '',
+				},
+				queryShopList: '',
+				noMoreShow: false,
+                regionName:'',
+                twoRegionName:'',
+                cityName:'城市',
+				area:'',
+				cityCode:'',
+				areaList:'',
+				index:'',
+				areaName:'区域',
+				loading:false,
+				ext:'',
+				authorizShow:false,
+				wxOpenData:'',
+				userInfo: '',
+				shopName:'',
+				inputChShow:false,
+			}
+		},
+        watch:{
+			shopName(val){
+				console.log(val)
+				if(val){
+					this.inputChShow=true
+				}
+			},
+        		
+        },
+		onLoad() {
+			var that = this;
+			uni.removeStorageSync('selectCity');
+			this.userInfo = this.$store.state.userInfo;
+			this.ext=this.$common.getExtStoreId();
+			 if(this.userInfo){
+				 this.themeColor = uni.getStorageSync("themeColor");
+				 this.wxOpenData=this.$store.state.wxOpenData;
+				 this.init()
+			 }else{
+				 this.$common.automaticlogin().then(val => {
+				 	this.themeColor = uni.getStorageSync("themeColor");
+				 	this.userInfo=this.$store.state.userInfo;
+				 	this.wxOpenData=this.$store.state.wxOpenData;
+				 	this.init()
+					if(!this.userInfo){
+						uni.hideLoading();
+						this.authorizShow=true
+					}
+				 })
+			 }
+			
+			
+			// that.getqueryShopList();
+			
+		},
+		onShow() {
+			const selectCity = uni.getStorageSync('selectCity');
+			//console.log("onShow")
+			//console.log(selectCity)
+			if(selectCity){
+				this.cityName=selectCity.city
+				this.cityCode=selectCity.code
+				this.areaName='区域'
+				this.area=''
+				this.shopName=''
+				this.getAreaList()
+				this.getqueryShopList() //获取门店列表
+			}
+		},
+		methods: {
+			empty(){
+				
+				this.shopName='';
+				this.inputChShow=false;
+				this.queryShopList=[];
+				this.page=1;
+				this.getqueryShopList()
+			},
+			authorizShowno(){
+				this.authorizShow=false
+			},
+			decryptPhoneNumber: function(e) {
+				  console.log(e);
+				  this.code=e.detail.code
+				  this.wxPhoneLogin()
+				  this.authorizShow=false;
+			},
+			wxPhoneLogin(){
+					 var that=this;
+					 this.$http('miniApp2/sys/wxPhoneLogin', {
+					   appId:this.ext.appId,
+					   unionId:this.ext.unionId,
+					   code:this.code,
+					   openId:this.wxOpenData.openid
+					  },'POST').then(res => {
+						var data = res.data;
+						if(data.loginInfo){
+							this.userInfo=data.loginInfo.openUser;
+							this.wxOpenData=data.loginInfo;
+							this.$store.commit('mutationswxOpenData', data)
+							this.$store.commit('mutationsuserInfo', this.userInfo)
+						    this.init()
+						}	
+					  })
+			},
+			init(){
+				var that = this;
+				uni.showLoading({
+					title: '加载中'
+				})
+				uni.authorize({
+					scope: 'scope.userLocation',
+					success() {
+						uni.getLocation({
+							type: 'gcj02',
+							success: function(res) {
+								console.log(res)
+								that.location.lat = res.latitude
+								that.location.lng = res.longitude
+						        that.getAdress();
+								//that.getqueryShopList() //获取全部门店列表
+						
+							},
+							fail(err) {
+								console.log("定位失败")
+						        that.getqueryShopList();
+							}
+						});
+					},
+					fail: (err) => {
+						console.log(err)
+						 that.getqueryShopList();
+						 
+					}})
+			},
+			quCilck(){
+				console.log(this.cityName)
+				if(this.cityName){	
+					this.$refs.popup.open("right")
+					//this.popupShow=true;
+					if(this.areaList.length==0){
+						/* uni.showToast({
+							title: '当前城市下无区域，请切换城市查看',
+							icon: 'none',
+							duration: 4000
+						}); */
+						uni.showModal({
+						        title: '提示',
+						        content: '当前城市下无区域，请切换城市查看',
+						        success: function(res) {
+						        if (res.confirm) {
+						            // 执行确认后的操作
+									uni.navigateTo({
+										url:'/pages/subPack/chooseCity?type=1'
+									})
+						        } 
+						        else {
+						            // 执行取消后的操作
+						        }
+						    }
+						})
+					}
+				}else{
+					uni.showModal({
+					        title: '提示',
+					        content: '当前城市暂无门店，请切换城市查看',
+					        success: function(res) {
+					        if (res.confirm) {
+					            // 执行确认后的操作
+								uni.navigateTo({
+									url:'/pages/subPack/chooseCity?type=1'
+								})
+					        } 
+					        else {
+					            // 执行取消后的操作
+					        }
+					    }
+					})
+				}
+				
+			},
+			gocity(){
+				uni.navigateTo({
+					url:'/pages/subPack/chooseCity?type=1'
+				})
+			},
+			checkarea(item){
+				this.shopName=''
+				if(this.area==item.code){
+					this.areaName='区域'
+					this.area=''
+					this.getqueryShopList() //获取门店列表
+				}else{
+					this.areaName=item.area
+					this.area=item.code
+					this.getqueryShopList() //获取门店列表
+				}
+				
+				this.$refs.popup.close()
+			},
+			bindPickerChange(e){
+				//console.log(e)
+				this.areaName=this.areaList[e.detail.value].area
+				this.area=this.areaList[e.detail.value].code
+				this.getqueryShopList() //获取门店列表
+			},
+			cancelHandling(){
+				this.areaName='区域'
+				this.area=''
+				this.getqueryShopList() //获取门店列表
+			},
+            makePhoneCall(num){
+				uni.makePhoneCall({
+					phoneNumber:num
+				});
+			},
+            goMap(item){
+				var that = this;
+				if (!item.lat || !item.lng) {
+					uni.showToast({
+						title: '该店铺未设置定位',
+						icon: 'none',
+						duration: 3000
+					});
+				} else {
+					uni.openLocation({
+						latitude: Number(item.lat),
+						longitude: Number(item.lng),
+						name: item.shopName,
+						address: item.provinceName + item.cityName + item.areaName +
+							item.address,
+						success: function() {
+							console.log('success');
+						},
+						fail(err) {
+							console.log(err)
+						}
+					});
+				}
+			},
+			getAdress(){
+				var that=this;
+				var location = this.location.lng + ',' + this.location.lat
+				console.log('location'+location)
+				//location='117.29249484592015,39.026727973090274'
+				
+				uni.request({
+					url: 'https://restapi.amap.com/v3/geocode/regeo',
+					data: {
+						key: '389a059efa3f499d9145eb84b1c3248d',
+						location: location,
+					},
+					dataType: "json",
+					success: (res) => {
+						console.log('定位城市', res);
+						if(res.data.regeocode){
+							console.log("城市名称")
+							 console.log(res.data.regeocode.addressComponent.city)
+							// console.log(res.data.pois[0].cityname)
+							if(res.data.regeocode.addressComponent.city.length!=0){
+								var cityname = res.data.regeocode.addressComponent.city;
+								
+							}else{
+								var cityname = res.data.regeocode.addressComponent.province;
+							}
+							
+							var cityCode = res.data.regeocode.addressComponent.adcode
+							cityCode = cityCode.slice(0, -2)
+							cityCode = cityCode + '00'
+							this.cityName = cityname
+							this.cityCode = cityCode
+							that.getqueryShopList() //获取全部门店列表
+							that.getAreaList()
+							
+						}else{
+							console.log("接口获取失败")
+							uni.hideLoading();
+						}
+						
+					}
+				});
+			},
+			getAreaList(){
+				this.$http('opencarOwnerHome/shop-area-list', {
+				    city:this.cityCode
+				}, 'GET').then(res => {
+				    this.areaList=res.data
+				
+				})
+			},
+			getqueryShopList2(){
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.loading=false;
+				this.$http('opencarOwnerHome/queryShopInfoList', {
+				
+					lat: this.location.lat ? this.location.lat : '',
+					lng: this.location.lng ? this.location.lng : '',
+				    city:'',
+				    area:'',
+					shopName:this.shopName
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.queryShopList = res.data.shop;
+					this.loading=true;
+					//console.log('list+=', this.queryShopList);
+					if(this.queryShopList.length==0){
+						/* uni.showToast({
+							title: '当前城市暂无门店，请切换城市查看',
+							icon: 'none',
+							duration: 4000
+						}); */
+						uni.showModal({
+						        title: '提示',
+						        content: '当前城市暂无门店，请切换城市查看',
+						        success: function(res) {
+						        if (res.confirm) {
+						            // 执行确认后的操作
+									uni.navigateTo({
+										url:'/pages/subPack/chooseCity?type=1'
+									})
+						        } 
+						        else {
+						            // 执行取消后的操作
+						        }
+						    }
+						})
+					}
+				
+				})
+			},
+			getqueryShopList() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.loading=false;
+				this.$http('opencarOwnerHome/queryShopInfoList', {
+
+					lat: this.location.lat ? this.location.lat : '',
+					lng: this.location.lng ? this.location.lng : '',
+                    city:this.cityCode,
+                    area:this.area,
+					shopName:this.shopName
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.queryShopList = res.data.shop;
+					this.loading=true;
+					//console.log('list+=', this.queryShopList);
+					if(this.queryShopList.length==0){
+						/* uni.showToast({
+							title: '当前城市暂无门店，请切换城市查看',
+							icon: 'none',
+							duration: 4000
+						}); */
+						uni.showModal({
+						        title: '提示',
+						        content: '当前城市暂无门店，请切换城市查看',
+						        success: function(res) {
+						        if (res.confirm) {
+						            // 执行确认后的操作
+									uni.navigateTo({
+										url:'/pages/subPack/chooseCity?type=1'
+									})
+						        } 
+						        else {
+						            // 执行取消后的操作
+						        }
+						    }
+						})
+					}
+
+				})
+			},
+
+			goDetail(item) {
+				// uni.navigateTo({
+				// 	url: '../shop/shopDetail?id=' + item.shopId
+				// })
+				if (this.userInfo) {
+					uni.navigateTo({
+						url:'onlineBooking?naShopId='+item.shopId+'naUnionId='+item.unionId
+					})
+				} else {
+					this.authorizShow = true;
+					return false;
+				}
+				
+			}
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			
+			this.getqueryShopList()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		
+	}
+</script>
+
+<style scoped>
+.newTop{
+	width: 702rpx;
+	height: 70rpx;
+	background: #FFFFFF;
+	padding: 24rpx;
+	position: fixed;
+	top: 0;left: 0;z-index: 11;
+}
+.newTopSSbox{
+	height: 50rpx;
+	border-radius: 15rpx;
+	border: 2rpx solid #FCD903;
+	padding: 10rpx 0;
+	display: flex;
+}
+.newTopXia{
+	width: 12rpx;height: 8rpx;margin-top: 20rpx;margin-left: 10rpx;
+}
+.newTopSSLeft{
+	width: 190rpx;
+	display: flex;
+	border-right: 1px solid #EEEEEE;
+	justify-content: center;
+}
+.newSImg{
+	width: 30rpx;height: 30rpx;
+	margin-left: 30rpx;margin-top: 10rpx;
+}
+.sstopInput{
+	width: 400rpx;
+	height: 50rpx;
+	line-height: 50rpx;
+	font-size: 28rpx;
+	padding-left: 16rpx;
+}
+.newTopSSRight{
+	display: flex;
+}
+.newregionTxt{
+	font-size: 26rpx;
+	color: #333333;
+	line-height: 50rpx;
+	 white-space: nowrap; /* 禁止换行 */
+	  overflow: hidden; /* 隐藏溢出内容 */
+	  text-overflow: ellipsis; /* 添加省略号 */
+	  max-width: 150rpx;
+}
+.dhImg{
+	width: 35rpx;height: 35rpx;
+}
+.newdistance{
+	position: absolute;top: 22rpx;right: 18rpx;
+	text-align: center;
+	font-size: 22rpx;
+	color: #666666;
+}
+
+
+
+
+.areaCkIcon{
+	width: 38rpx;height: 28rpx;
+}
+	.popup-content{
+		width: 590rpx;
+		background: #FFFFFF;
+		height: 100vh;
+	}
+	.brandList{
+		height:99vh;
+	}
+	.areaListLine{
+		padding:30rpx 24rpx;
+		color: #666666;
+		font-size: 28rpx;
+		border-bottom: 1px solid #eaeaea;
+		display: flex;
+		justify-content: space-between;
+		line-height: 28rpx;
+	}
+	.areaActvie{
+		background: #F19D01;
+		color: #FFFFFF;
+	}
+	
+.jtbelow{
+	width: 14rpx;height: 7rpx;
+	margin-left: 10rpx;margin-top: 10rpx;
+}
+.regionSx{
+	width: 2rpx;height: 33rpx;background:#EEEEEE;
+}
+.regionLine{
+	display: flex;justify-content: center;font-size: 26rpx;
+	width: 370rpx;line-height: 33rpx;color: #3C3C3C;
+}
+.regionBox{
+	display: flex;
+	justify-content: center;
+	background: #FFFFFF;
+	padding: 20rpx 0;
+	margin-bottom: 20rpx;
+	position: fixed;
+	width: 100vw;
+	top: 118rpx;left: 0;
+}
+	.box {
+		min-height: 100vh;
+		background-color: #F4F5F7;
+		padding-bottom: 60rpx;
+	}
+	.shopdhBox{
+		display: flex;padding-top: 16rpx;
+		justify-content: space-between;
+	}
+	.shopcall{
+		display: flex;
+	}
+	.shopcallIcon{
+		width: 26rpx;height: 26rpx;margin-top: 5rpx;
+	}
+	.shopcallTxt{
+	font-size: 24rpx;
+	color: #222222;
+		line-height: 33rpx;padding-left: 8rpx;
+	}
+	.yuyuBtnBox{
+		    display: flex;
+		    font-size: 24rpx;
+		    color: #FF8113;
+		    align-items: center;
+		    justify-items: center;
+		/* border-left: 1px solid #EEEEEE;
+		 padding-left: 20rpx; */
+	}
+
+	.shopline {
+		margin: 0rpx 24rpx 20rpx;
+		padding: 20rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		display: flex;
+		position: relative;
+	}
+
+
+	.nodataImg {
+		width: 400rpx;
+		padding-top: 100rpx;
+	}
+
+	.noTxt {
+		font-size: 36rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
+
+	.nodataBox {
+		text-align: center;
+	}
+
+	.shopImg {
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 10rpx;
+	}
+
+	.shopBox {
+		padding-top: 30rpx;
+		display: flex;
+	}
+
+	.flex {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.shopCont {
+		padding-left: 22rpx;
+		width: 520rpx;
+	}
+
+	
+
+	.span1 {
+		color: #FF4F00;
+		font-size: 36rpx;
+	}
+
+	.span2 {
+		color: #FF4F00;
+		font-size: 22rpx;
+	}
+
+	.span3 {
+		color: #333333;
+		font-size: 22rpx;
+		padding-left: 22rpx;
+	}
+
+	.shopBq {
+		color: #FF4F00;
+		font-size: 22rpx;
+		border-radius: 4rpx;
+		border: 1px solid #FF4F00;
+		line-height: 30rpx;
+		height: 30rpx;
+		padding: 0rpx 5rpx;
+		margin-top: 10rpx;
+	}
+
+	.brandsBg {
+		display: flex;
+		align-items: center;
+		padding: 5rpx 0rpx;
+		flex-wrap: wrap;
+		    height: 36rpx;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	
+
+	.brands {
+		border-radius: 4rpx;
+		padding: 0 5rpx;
+		color: #F19D01;
+		height: 28rpx;
+		border: 1px solid #F19D01;
+		font-size: 22rpx;
+		line-height: 28rpx;
+		margin: 5rpx 10rpx 5rpx 0rpx;
+	}
+
+	.timeBg {
+		display: flex;
+
+	}
+
+	.shopTime {
+		color: #666666;
+		font-size: 26rpx;
+	}
+
+	.addressBox {
+		color: #666666;
+		font-size: 22rpx;
+	}
+
+	.shopNameSearchInput {
+		width: 500rpx;
+	}
+
+	.colorCS {
+		color: #FF4F00;
+	}
+
+	.shopbox {
+		padding: 0 16rpx;
+	}
+
+
+
+	.shopCallImg {
+		width: 38rpx;
+		height: 46rpx;
+	}
+
+	.shopTop {
+		display: flex;
+		justify-content: space-between;
+		
+	}
+
+	.shopright {
+		padding-left: 28rpx;
+		width: 500rpx;
+	}
+
+	.shopName {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #222222;
+		line-height: 40rpx;
+		width: 450rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.shopScore1 {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #FF4F00;
+		height: 50rpx;
+		line-height: 50rpx;
+	}
+
+	.shopScore11 {
+		font-size: 22rpx;
+		color: #FF4F00;
+		margin-right: 14rpx;
+
+	}
+
+	.shopScore2 {
+		font-size: 22rpx;
+		color: #666666;
+		margin-right: 14rpx;
+		padding: 8rpx 0;
+	}
+
+	.shopScore3 {
+		font-size: 22rpx;
+		color: #333333;
+		padding-left: 20rpx;
+	}
+
+
+
+	.Btn {
+		width: 104rpx;
+		height: 56rpx;
+		background: #FF2400 linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		border-radius: 6rpx;
+		font-size: 26rpx;
+		text-align: center;
+		color: #FFFFFF;
+		line-height: 56rpx;
+	}
+
+	.shopBottom {
+		display: flex;
+
+	}
+
+	.shopBottomLeft {
+
+		font-size: 25rpx;
+		color: #666666;
+		line-height: 30rpx;
+		padding-top: 10rpx;
+		display: flex;
+		justify-content: space-between;
+		padding-right: 10rpx;
+	}
+
+	.shopaddress {
+		width: 400rpx;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
+	.authorizBox{
+		width: 100vw;
+		height: 100vh;
+		background: rgba(0, 0, 0, 0.5);
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+	.authorizCont{
+		margin-top: 30vh;
+		width: 564rpx;
+		height: 408rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		margin-left: 93rpx;
+		position: relative;
+	}
+	.authorizCloseImg{
+		width: 62rpx;
+		height: 62rpx;
+	}
+	.sqLogoBox{
+		width: 180rpx;
+		height: 180rpx;
+		background: #FFFFFF;
+		border-radius: 90rpx;
+		text-align: center;
+		position: absolute;
+		top: -50rpx;
+		left: 192rpx;
+	}
+	.authorizName{
+		color: #333333;
+		line-height: 42rpx;
+		font-size: 30rpx;
+		text-align: center;
+		padding-top: 58rpx;
+	}
+	.authorizMs{
+		color: #999999;
+		line-height: 36rpx;
+		font-size: 26rpx;
+		width: 452rpx;
+		padding-top: 24rpx;
+		text-align: center;
+		margin-left: 56rpx;
+	}
+	.authorizContbutton{
+		width: 422rpx;
+		height: 88rpx;
+		background: #D53533;
+		border-radius: 44rpx;
+		line-height: 88rpx;
+		text-align: center;
+		font-size:30rpx;
+		color: #FFFFFF;
+		margin-top: 62rpx;
+		margin-left:71rpx;
+	}
+
+	.sstop{
+		position: fixed;
+		padding-top: 24rpx;
+		padding-left: 24rpx;
+		background: #ffffff;
+		width: 100vw;
+		top: 0rpx;
+		left: 0;
+		padding-bottom: 20rpx;
+	}
+	.sstopimg{
+		width: 40rpx;
+		height: 40rpx;
+		position: absolute;
+		left: 44rpx;
+		top: 40rpx;
+	}
+	.inputCh{
+	width:40rpx;
+	height: 40rpx;
+	position: absolute;
+	right: 60rpx;
+	top: 40rpx;
+	z-index: 11;
+	}
+</style>

pages/subPack/addCarCK.vue

@@ -0,0 +1,99 @@
+<template>
+	<view class="box">
+		<view class="title">选择车型</view>
+		<view class="cont">
+			<view class="line" @click="goCarModel">
+				<view class="lineTxt">手动选择车型</view>
+				<view class="lineRgiht">
+					<view class="lineRtxt">请选择</view>
+					<image src="../../static/img2/jt1.png" mode="" class="jtIcon"></image>
+				</view>
+			</view>
+			<view class="line">
+				<view class="lineTxt">扫描VIN码</view>
+				<view class="lineRgiht">
+					<image src="../../static/img2/sm.png" mode="" class="smIcon"></image>
+				</view>
+			</view>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(opt) {
+           
+		},
+		onShow() {
+			
+		},
+		methods: {
+			goCarModel(){
+				uni.navigateTo({
+					url:'../user/addCar/carModel'
+				})
+			}
+		
+
+		},
+		
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+	}
+.title{
+	font-weight: 400;
+	font-size: 22rpx;
+	color: #000000;
+	padding-top: 40rpx;
+	padding-left: 24rpx;
+	padding-bottom: 28rpx;
+}
+.cont{
+	padding: 0 24rpx;
+}
+.line{
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	padding: 30rpx;
+	line-height: 40rpx;
+	margin-bottom: 20rpx;
+	display: flex;justify-content: space-between;
+}
+.lineTxt{
+	font-weight: 500;
+	font-size: 28rpx;
+	color: #000000;
+	line-height: 40rpx;
+}
+.lineRtxt{
+	font-weight: 400;line-height: 40rpx;
+	font-size: 22rpx;
+	color: #646464;
+	padding-right: 10rpx;
+}
+.jtIcon{
+	width: 10rpx;height: 20rpx;margin-top: 10rpx;
+}
+.smIcon{
+  width: 36rpx;height: 36rpx;margin-top: 2rpx;	
+}
+.lineRgiht{
+	display: flex;
+}
+</style>

pages/user/addCar/addCar.vue

@@ -1,8 +1,10 @@
 <template>
 	<view class="content">
-
+        <homenav :iStatusBarHeight="iStatusBarHeight" :title="'我的车库'" :cj="3"></homenav>
 		<!-- 填写车辆信息 -->
-		<view class="carMessage">
+		<!-- <view class="carMessage">
+			
+			
 
 			<view class="mesView">
 				<view class="leftTitle"><span class="stars">*</span> 车牌号</view>
@@ -16,8 +18,7 @@
 			
 			<view class="mesView">
 				<view class="leftTitle">VIN</view>
-				<!-- <input class="vinInput selectColor" type="text" v-model="vin" placeholder="请输入"
-					placeholder-style="color:#999999" /> -->
+				
 					 <view class="vinInput selectColor" @click="aaa">
 						<span v-if="vin">{{vin}}</span>
 						<span v-else style="color:#999999">请输入VIN</span>
@@ -53,13 +54,90 @@
 
 
 		</view>
+		 -->
+		<view class="newBox">
+			<!-- 车辆款型 -->
+			<view class="modelBox">
+				<view class="mbTop">
+					<view class="mbTopTxt1">车辆款型</view>
+					<view class="mbTopTxt2">完善信息为你精准匹配服务</view>
+				</view>
+				<view class="mbCont">
+					<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>
+						    <view class="lineRgiht">
+						    	<view class="lineRtxt">重新选择</view>
+						    	<image src="../../../static/img2/jt1.png" mode="" class="jtIcon"></image>
+						    </view>
+						</view>
+						<view class="carMTxt">{{carModelInfo.value}}</view>
+					</view>
+				</view>
+			</view>
+			<!-- 车辆款型 -->
+			<!-- 基信信息 -->
+			<view class="modelBox" style="margin-top: 20rpx;">
+				<view class="mbTop">
+					<view class="mbTopTxt1">基本信息</view>
+				</view>
+				<view class="plateNumberMs">车牌号*</view>
+				<view class="plateNumberBox" @tap="plateShow=true,bb()">
+					<view class="sheng">鲁</view>
+					<view class="zhimu">A</view>
+					<view class="zhimu"></view>
+					<view class="zhimu"></view>
+					<view class="zhimu"></view>
+					<view class="zhimu"></view>
+					<view class="zhimu"></view>
+					<view class="xny">新能源</view>
+				</view>
+				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
+				<view class="jbLine">
+					<view class="jbLineTitle">VIN</view>
+					<view class="jbLineCont" @click="aaa">
+						<span class="jbLineSpan" v-if="vin">{{vin}}</span>
+						<span v-else style="color:#999999">请输入VIN</span>
+						<!-- <input type="text" v-model="vin" class="jbLineInput" placeholder="请输入VIN"/> -->
+						<image src="../../../static/img2/jt1.png" mode="" class="jtIcon2"></image>
+					</view>
+				</view>
+				<view class="jbLine">
+					<view class="jbLineTitle">当前里程</view>
+					<view class="jbLineCont">
+						<input  type="number" v-model="mileage" class="jbLineInput" placeholder="请输入当前里程"/>
+						<image src="../../../static/img2/jt1.png" mode="" class="jtIcon2"></image>
+					</view>
+				</view>
+				<view class="jbLine">
+					<view class="jbLineTitle">注册登记时间</view>
+					<view class="jbLineCont">
+						<picker class="timeBtn" @change="bindChange" mode="date" :end="currentdate" :value="time">
+							<view class="uni-input selectColor" v-if="time">{{time}}</view>
+							<view class="uni-input noSelectColor" v-else>请选择</view>
+						</picker>
+						<image src="../../../static/img2/jt1.png" mode="" class="jtIcon2"></image>
+					</view>
+				</view>
+				<view class="jbMS">我们绝不会泄漏您的个人信息，仅用于适配商品</view>
+				
+			</view>
+			<!-- 基信信息 -->
+		</view>
+		<view class="complete" @click="saveCar()">完成车辆</view>
+		
+		
+		
 
 
-		<view class="bottomView">
+		<!-- <view class="bottomView">
 
 			<view class="saveCar" :style="{background:'#'+themeColor}" @click="saveCar()">保存</view>
 
-		</view>
+		</view> -->
 		<tki-float-keyboard ref="keyb" :mode="keyMode" :type="keyType"
 		:title="keyTitle" @del="keyDel"
 		 @val="keyVal" @show="keyShow" @hide="keyHide"></tki-float-keyboard>
@@ -71,9 +149,10 @@
 	// 普通引入组件  https://ext.dcloud.net.cn/plugin?id=44
 	import tkiFloatKeyboard from '@/components/tki-float-keyboard/tki-float-keyboard.vue'
 	import plateInput from "@/components/uni-plate-input/uni-plate-input.vue"
+	import homenav from "@/components/homenav/nav.vue"
 	export default {
 		components: {
-			plateInput,tkiFloatKeyboard
+			plateInput,tkiFloatKeyboard,homenav
 
 		},
 
@@ -102,10 +181,16 @@
                 keyMode:'keyboard',
                 keyTitle:'VIN',
                 keyType:'1',
+				iStatusBarHeight:'',
 			}
 		},
 		onLoad(opt) {
-			uni.removeStorageSync('carModelInfo');
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			var carModelInfo = uni.getStorageSync("carModelInfo");
+			if (carModelInfo) {
+				this.carModelInfo = carModelInfo;
+			}
+			//uni.removeStorageSync('carModelInfo');
 			 this.themeColor = uni.getStorageSync("themeColor");
 
 			this.getNowFormatDate();
@@ -123,10 +208,10 @@
 			}
 		},
 		onShow() {
-			var carModelInfo = uni.getStorageSync("carModelInfo");
+			/* var carModelInfo = uni.getStorageSync("carModelInfo");
 			if (carModelInfo) {
 				this.carModelInfo = carModelInfo;
-			}
+			} */
 		},
 		methods: {
 			keyDel(v){
@@ -460,10 +545,148 @@
 <style>
 	.content {
 		min-height: 100vh;
-		background-color: #F4F5F7;
+	    background: linear-gradient( 180deg, #FFF8E2 0%, #F4F4F4 100%);
 		padding-top: 20rpx;
 	}
-
+.logo{
+	width: 125rpx;height: 125rpx;border-radius: 50%;
+}
+.newBox{
+	padding: 24rpx;
+}
+.modelBox{
+	background: #FFFFFF;border-radius: 20rpx;
+	padding: 30rpx;
+}
+.mbTop{
+	display: flex;line-height: 42rpx;
+}
+.mbTopTxt1{
+	font-weight: 500;
+	font-size: 30rpx;color: #090909;
+}
+.mbTopTxt2{
+	font-weight: 400;color: #999999;
+	font-size: 22rpx;padding-left: 25rpx;
+}
+.lineRgiht{
+	display: flex;
+}
+.lineRtxt{
+	font-weight: 400;line-height: 45rpx;
+	font-size: 22rpx;
+	color: #9A9A9A;
+	padding-right: 10rpx;
+}
+.jtIcon{
+	width: 10rpx;height: 20rpx;margin-top: 10rpx;
+}
+.brand{
+	font-weight: 500;
+	font-size: 32rpx;
+	color: #090909;
+	line-height: 45rpx;
+}
+.mbCont{
+	display: flex;
+}
+.mbContBox{
+	width: 480rpx;padding-left: 25rpx;
+}
+.mbCont{
+	padding-top: 25rpx;
+}
+.carMTxt{
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #9E9E9E;
+		line-height: 33rpx;
+		padding-top: 6rpx;
+}
+.plateNumberMs{
+	font-weight: 500;padding-top: 26rpx;
+	font-size: 26rpx;
+	color: #000000;
+}
+.plateNumberBox{
+	display: flex;padding-top: 12rpx;
+	padding-bottom: 20rpx;
+	border-bottom: 1px solid #EEEEEE;
+}
+.sheng{
+	width: 64rpx;
+	height: 68rpx;
+	background: #FACC2D;
+	border-radius: 6rpx;
+	font-size: 32rpx;
+	color: #FFFFFF;
+	text-align: center;
+	line-height: 68rpx;
+	margin-right: 6rpx;
+}
+.zhimu{
+	width: 60rpx;
+	height: 64rpx;
+	border-radius: 6rpx;
+	border: 2rpx solid #FACC2D;
+	font-size: 32rpx;
+	color: #090909;
+	text-align: center;
+	line-height: 68rpx;
+	margin-right: 6rpx;
+}
+.xny{
+	width: 68rpx;
+	height: 64rpx;
+	border-radius: 6rpx;
+	border: 2rpx dashed #FACC2D;
+	font-size: 20rpx;
+	color: #FACC2D;
+	text-align: center;
+	line-height: 68rpx;
+}
+.jbLine{
+	border-bottom: 1px solid #EEEEEE;
+	padding: 12rpx 0;
+}
+.jtIcon2{
+	width: 10rpx;height: 20rpx;margin-top: 8rpx;
+}
+.jbLineTitle{
+	font-weight: 500;
+	font-size: 26rpx;
+	color: #000000;
+	line-height: 37rpx;
+}
+.jbLineCont{
+	display: flex;justify-content: space-between;
+}
+.jbLineInput{
+	font-size: 24rpx;
+	color: #3C3C3C;
+	line-height: 34rpx;
+	height: 34rpx;
+}
+.jbLineCont{
+	font-size: 24rpx;
+	color: #3C3C3C;
+	line-height: 34rpx;
+}
+.jbMS{
+	font-weight: 400;
+	font-size: 24rpx;
+	color: #9A9A9A;padding-top: 20rpx;
+}
+.complete{
+	width: 661rpx;text-align: center;
+	height: 86rpx;line-height: 86rpx;
+	background: #FCD903;
+	border-radius: 43rpx;
+	font-size: 32rpx;
+	color: #110B01;
+	margin: 0 auto;
+	margin-top: 50rpx;
+}
 
 
 	.carMessage {

pages/user/addCar/carModel.vue

@@ -327,8 +327,11 @@ export default {
 				success: function () {
 					
 					
-						uni.navigateBack({
+						/* uni.navigateBack({
 							delta:1
+						}) */
+						uni.navigateTo({
+							url:'addCar'
 						})
 					
 					 

pages/user/user.vue

@@ -30,32 +30,9 @@
 
 		</view>
 		<!-- <view v-if="numList.remindType==0" class="marginTop2"></view>v-if="numList.remindType!=0" -->
-		<view class="marginTop" ></view>
-		<view class="headerBox">
-			<view class="quan" @click="gonavigateTo('../index/discountCard')" v-if="showSetting.isShowCoupon">
-				<view class="numStr">{{numList.count?numList.count:0}}</view>
-				<view class="nameStr">优惠券</view>
-			</view>
-			<view class="quan" v-if="showSetting.isShowIntergral" @click="gonavigateTo('../integral/integral?totalIntegral='+numList.totalIntegral)">
-				<view class="numStr">{{numList.totalIntegral?numList.totalIntegral:0}}</view>
-				<view class="nameStr">积分</view>
-			</view>
-			<view class="quan" v-if="showSetting.isShowCard" @click="gonavigateTo('../index/vipCard')">
-				<view class="numStr">{{numList.cardNum?numList.cardNum:0}}</view>
-				<view class="nameStr">会员卡</view>
-			</view>
 		
-		</view>
-		<view class="remindBox" v-if="numList.remindType!=0&&numList.remindIntegral!=0">
-		  <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>
-			  <span style="padding-left: 10rpx;">您有</span>
-			  <span style="color: #FFFD00;font-weight: 500;">{{numList.remindIntegral}}</span>
-			  <span v-if="numList.remindType==1">积分将于本月过期</span>
-			  <span v-if="numList.remindType==2">积分将于30天内过期</span>
-		  </view>
-		  <view class="useremind" @click="useremind">去使用></view>
-		</view>
+		
+		<view class="marginTop" ></view>
 		
         <!-- 卡制度-->
 		<view v-if="showSetting.isShowCardSystem&&f2csystemlist">
@@ -95,63 +72,46 @@
 			</view>
 			
 		</view>
-      
-
-		<!-- 我的订单 -->
-		<view class="orderBox">
-
-			<view class="orderTitle">我的订单</view>
-
-			<view class="orderLIneBox">
-				<view class="orderLine" @click="goorder(1)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.waitPurchaseSize>0">
-							{{numList.waitPurchaseSize>99?'99+':numList.waitPurchaseSize}}
-						</view>
-						<image src="../../static/img/icon_daifukuan.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">待付款</view>
+		
+	<view class="padingBox">
+		<view class="headerBox2">
+			<view class="headerBox">
+				<view class="quan" @click="gonavigateTo('../index/discountCard')" v-if="showSetting.isShowCoupon">
+					<view class="numStr">{{numList.count?numList.count:0}}</view>
+					<view class="nameStr">优惠券</view>
 				</view>
-				<view class="orderLine" @click="goorder(5)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.waitGroupSize>0">
-							{{numList.waitGroupSize>99?'99+':numList.waitGroupSize}}
-						</view>
-						<image src="../../static/timg/my_icon_4.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">待成团</view>
+				<view class="quan" v-if="showSetting.isShowIntergral" @click="gonavigateTo('../integral/integral?totalIntegral='+numList.totalIntegral)">
+					<view class="numStr">{{numList.totalIntegral?numList.totalIntegral:0}}</view>
+					<view class="nameStr">积分</view>
 				</view>
-				<view class="orderLine" @click="goorder(2)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.waitServiceSize>0">
-							{{numList.waitServiceSize>99?'99+':numList.waitServiceSize}}
-						</view>
-						<image src="../../static/img/icon_daifuwu.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">待服务</view>
+				<view class="quan" v-if="showSetting.isShowCard" @click="gonavigateTo('../index/vipCard')">
+					<view class="numStr">{{numList.cardNum?numList.cardNum:0}}</view>
+					<view class="nameStr">会员卡</view>
 				</view>
 				
-				<view class="orderLine" @click="goorder(3)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.hasOverSize>0">
-							{{numList.hasOverSize>99?'99+':numList.hasOverSize}}
-						</view>
-						<image src="../../static/img/icon_yiwancheng.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">已完成</view>
-				</view>
-
-				<view class="orderLine" @click="goorder(0)">
-					<view class="orderImgBox">
-						<view class="orderNum" v-show="numList.allSize>0">{{numList.allSize>99?'99+':numList.allSize}}
-						</view>
-						<image src="../../static/img/icon_allorder.png" mode="" class="orderLineImg"></image>
-					</view>
-					<view class="orderLineTxt">全部</view>
+			</view>
+			<view style="padding-bottom: 20rpx;">
+				<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>
+					  <span style="padding-left: 10rpx;">您有</span>
+					  <span style="color: #0B0B0B;font-weight: 500;">{{numList.remindIntegral}}</span>
+					  <span v-if="numList.remindType==1">积分将于本月过期</span>
+					  <span v-if="numList.remindType==2">积分将于30天内过期</span>
+				  </view>
+				  <view class="useremind" @click="useremind">去使用></view>
 				</view>
-
 			</view>
+			
 		</view>
+		
+				
+		<!-- v-if="numList.remindType!=0&&numList.remindIntegral!=0" -->
+	
+	</view>
+      
+
+		
 
 		<!-- 店铺信息 -->
 		<view class="shopBox" v-if="userInfo&&showSetting.isShowCardShop">
@@ -202,10 +162,195 @@
 
 
 		</view>
-
+		
+		<!-- 我的订单 -->
+		<view class="orderBox">
+		
+		
+			<view class="orderTitle">
+				<span>我的订单</span>
+				<span class="allOrder" @click="goorder(0)">全部订单
+				  <image src="../../static/img/big_rightArrow.png" mode="" class="allOrderIcon"></image>
+				</span>
+			</view>
+		
+			<view class="orderLIneBox">
+				<view class="orderLine" @click="goorder(1)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.waitPurchaseSize>0">
+							{{numList.waitPurchaseSize>99?'99+':numList.waitPurchaseSize}}
+						</view>
+						<image src="../../static/img2/dzf.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">待支付</view>
+				</view>
+				<view class="orderLine" @click="goorder(5)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.waitGroupSize>0">
+							{{numList.waitGroupSize>99?'99+':numList.waitGroupSize}}
+						</view>
+						<image src="../../static/img2/dct.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">待成团</view>
+				</view>
+				<view class="orderLine" @click="goorder(3)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.hasOverSize>0">
+							{{numList.hasOverSize>99?'99+':numList.hasOverSize}}
+						</view>
+						<image src="../../static/img2/ywc.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">已完成</view>
+				</view>
+				<view class="orderLine" @click="goorder(2)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.waitServiceSize>0">
+							{{numList.waitServiceSize>99?'99+':numList.waitServiceSize}}
+						</view>
+						<image src="../../static/img2/dsy.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">待使用</view>
+				</view>
+				
+				
+		
+				<!-- <view class="orderLine" @click="goorder(0)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.allSize>0">{{numList.allSize>99?'99+':numList.allSize}}
+						</view>
+						<image src="../../static/img/icon_allorder.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">全部</view>
+				</view> -->
+		
+			</view>
+		</view>
+        <view class="kbox">
+			<view class="klineCont">
+				<view class="klineTitle">我的爱车</view>
+				<view class="kline">
+					<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.model}}</span>
+						</view>
+					</view>
+					<view class="klineRow" @click="gonavigateTo('historySpend')">
+						<image class="klineIcon" src="../../static/img2/byjl.png" mode=""></image>
+					    <view class="KlineTxt">保养记录</view>
+					</view>
+					<view class="klineRow" @click="gonavigateTo('checkReport')">
+						<image class="klineIcon" src="../../static/img2/ckbg.png" mode=""></image>
+					    <view class="KlineTxt">车况报告</view>
+					</view>
+					<view class="klineRow" @click="gonavigateTo('../index/rescue')">
+						<image class="klineIcon" src="../../static/img2/24.png" mode=""></image>
+					    <view class="KlineTxt">24小时救援</view>
+					</view>
+				</view>
+			</view>
+			
+			<view class="klineCont">
+				<view class="klineTitle">我的爱车</view>
+				<view class="addCarBox">
+					<view class="addCar">
+						<view class="addCarLeft">
+							<view class="addCarTxt1">开车请注意 安途生来帮您</view>
+							<view class="carBq">
+							  <view class="carBqLine">
+								  <image src="../../static/img2/carDui.png" mode="" class="carDui"></image>
+								  <view class="carTitle">车况报告</view>
+							  </view>
+							  <view class="carBqLine">
+								  <image src="../../static/img2/carDui.png" mode="" class="carDui"></image>
+								  <view class="carTitle">保养记录</view>
+							  </view>
+							  <view class="carBqLine">
+								  <image src="../../static/img2/carDui.png" mode="" class="carDui"></image>
+								  <view class="carTitle">快速救援</view>
+							  </view>
+							</view>
+						</view>
+						<view class="addCarBtn" @click="addCar">添加爱车</view>
+					</view>
+				</view>
+			</view>
+			
+			<view class="klineCont">
+				<view class="klineTitle">更多推荐</view>
+				<view class="kline">
+					<view class="klineRow" @click="gonavigateTo('../user/expertServices')">
+						<image class="klineIcon" src="../../static/img2/icon_fwzj.png" mode=""></image>
+					    <view class="KlineTxt2">服务顾问</view>
+					</view>
+					<view class="klineRow" @click="gonavigateTo('myBespeak')">
+						<image class="klineIcon" src="../../static/img2/huiyuan.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>
+					    <view class="KlineTxt2">救援记录</view>
+					</view>
+					<view class="klineRow">
+						<image class="klineIcon" src="../../static/img2/clsp.png" mode=""></image>
+					    <view class="KlineTxt2">车辆适配</view>
+					</view>
+					<view class="klineRow"  @click="gonavigateTo('../subPack/depositList')">
+						<image class="klineIcon" src="../../static/img2/icon_jydd.png" mode=""></image>
+					    <view class="KlineTxt2">我的寄存</view>
+					</view>
+				</view>
+			</view>
+			
+			
+			<view class="klineCont">
+				<view class="klineTitle">口碑传播</view>
+				<view class="kline">
+					<button open-type="share" class="klineRow">
+					<view class="">
+						<image class="klineIcon" src="../../static/img/icon_me6.png" mode=""></image>
+					    <view class="KlineTxt2">分享好友</view>
+					</view>
+					</button>
+					<view class="klineRow" @click="gonavigateTo('../subPack/luckList')">
+						<image class="klineIcon" src="../../static/timg/icon_jydd.png" mode=""></image>
+					    <view class="KlineTxt2">活动奖品</view>
+					</view>
+					<view class="klineRow" @click="gonavigateTo('../referral/referral')">
+						<image class="klineIcon" src="../../static/img2/kehuzjs.png" mode=""></image>
+					    <view class="KlineTxt2">客户转介绍</view>
+					</view>
+					<view class="klineRow" @click="gonavigateTo('../partner/partner')">
+						<image class="klineIcon" src="../../static/img2/chezhu.png" mode=""></image>
+					    <view class="KlineTxt2">车主合伙人</view>
+					</view>
+					<view class="klineRow" @click="gonavigateTo('myAppraise')">
+						<image class="klineIcon" src="../../static/img2/icon_pingjia.png" mode=""></image>
+					    <view class="KlineTxt2">我的评价</view>
+					</view>
+					<view class="klineRow" @click="gonavigateTo('feedBack')">
+						<image class="klineIcon" src="../../static/img/icon_me7.png" mode=""></image>
+					    <view class="KlineTxt2">建议反馈</view>
+					</view>
+					<view class="klineRow" @click="gomember(showSetting.memberTitle)">
+						<image class="klineIcon" src="../../static/img2/huiyuan.png" mode=""></image>
+					    <view class="KlineTxt2">关于会员</view>
+					</view>
+					<view class="klineRow" @click="gonavigateaboutUS">
+						<image class="klineIcon" src="../../static/img2/gongs.png" mode=""></image>
+					    <view class="KlineTxt2">公司介绍</view>
+					</view>
+					<view class="klineRow" @click="makePhoneCall(showSetting.tel)">
+						<image class="klineIcon" src="../../static/img2/icon_fwzj.png" mode=""></image>
+					    <view class="KlineTxt2">联系客服</view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
 
 		<!-- 我的 相关 -->
-		<view class="rowBoxBg">
+		<!-- <view class="rowBoxBg">
 			<view class="rowBox" @click="gonavigateTo('../user/expertServices')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>
@@ -242,14 +387,14 @@
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 
-		   <!-- <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
+		    <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
 
 				<view class="leftView">
 					<image src="../../static/timg/icon_jydd.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">我的寄存</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view> -->
+			</view> 
 			 <view class="rowBox" @click="gonavigateTo('../subPack/rescueOrder')">
 				<view class="leftView">
 					<image src="../../static/timg/sos.png" mode="" class="liftIcon"></image>
@@ -265,8 +410,8 @@
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
 			
-		</view>
-		<view class="rowBoxBg">
+		</view> -->
+	<!-- 	<view class="rowBoxBg">
 			<view class="rowBox" @click="gonavigateTo('myAppraise')">
 				<view class="leftView">
 					<image src="../../static/img/icon_pingjia.png" mode="" class="liftIcon"></image>
@@ -292,8 +437,8 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-		</view>
-		<view class="rowBoxBg">
+		</view> -->
+	<!-- 	<view class="rowBoxBg">
 			<view class="rowBox" v-if="showSetting.isShowTel">
 				<view class="leftView">
 					<image src="../../static/timg/icon_qingchu.png" mode="" class="liftIcon"></image>
@@ -316,8 +461,8 @@
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view> 
 			
-		</view>
-		<view class="rowBoxBg">
+		</view> -->
+		<!-- <view class="rowBoxBg">
 		
 			<button open-type="share" class="rowBox">
 				<view class="leftView">
@@ -332,7 +477,7 @@
 					<view class="rowTitle">意见反馈</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view>
+			</view> -->
 			
 			
 			<!-- <view class="rowBox" @click="gonavigateTo('../report/working?id=56D5F8C1-9F11-40BA-8937-B4AABD4666B5')">
@@ -359,7 +504,7 @@
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view> -->
 
-		</view>
+		<!-- </view> -->
 		<view class="rowBoxBg">
 			<view class="exit2" @click="exit">切换账号</view>
 			<view class="exit" @click="exit2">退出登录</view>
@@ -431,6 +576,7 @@
 				exitNum:'',
 				f2cIndex:'',
 				customerName:'',
+				carInfo:'',
 			}
 		},
 		onLoad(opt) {
@@ -452,10 +598,10 @@
 				if (this.themeColor == 'D53533') {
 					var backgroundImage = '/static/tabimg/me1.png'
 				}
-				uni.setTabBarStyle({
+				/* uni.setTabBarStyle({
 					// color: '#FF0000',
-					selectedColor: '#' + this.themeColor,
-				})
+					 selectedColor: '#222222',
+				}) */
 				uni.setTabBarItem({
 					index: 3,
 					text: '我的',
@@ -505,10 +651,16 @@
 				this.uid = wxOpenData.loginInfo.uid;
 			}
 			//this.themeColor = uni.getStorageSync("themeColor");
-
+            this.carInfo=this.$store.state.carInfo;
+			console.log(this.carInfo)
 
 		},
 		methods: {
+			addCar(){
+				uni.navigateTo({
+					url:'../subPack/addCarCK'
+				}) 
+			},
 			exit(){
 				var that=this;
 				uni.showModal({
@@ -835,6 +987,91 @@
 </script>
 
 <style scoped>
+.addCarBox{
+	padding: 12rpx;
+}
+.addCar{
+	background: #F8F8F8;
+	border-radius: 9rpx;
+	display: flex;justify-content: space-between;
+	padding: 30rpx 20rpx;
+}
+.carTitle{
+	padding-left: 6rpx;
+}
+.addCarBtn{
+	width: 145rpx;text-align: center;
+	height: 53rpx;line-height: 53rpx;
+	background: #FFDD00;
+	border-radius: 27rpx;
+	font-size: 24rpx;
+	color: #0B0B0B;
+	margin-top: 15rpx;
+}
+.addCarTxt1{
+	font-size: 30rpx;
+	color: #8B8B8B;
+	line-height: 36rpx;
+}
+.carBq{
+	display: flex;
+	border-radius: 10rpx;
+	margin-top: 15rpx;
+}
+.carDui{
+	width: 24rpx;height: 24rpx;
+}
+.carBqLine{
+	display: flex;
+	padding-right: 23rpx;
+	font-size: 22rpx;
+	color: #A26D4F;line-height: 26rpx;
+}
+.kbox{
+	padding:0 24rpx;
+}
+.klineCont{
+	background: #FFFFFF;
+	border-radius: 16rpx;
+	margin-top: 20rpx;
+}
+.klineRow{
+	width: 25%;font-weight: 400;
+font-size: 24rpx;
+color: #0B0B0B;text-align: center;
+margin-top: 30rpx;
+}
+.KlineTxt{
+	padding-top: 10rpx;
+}
+.KlineTxt2{
+	padding-top: 10rpx;font-size: 22rpx;
+}
+.carInfoklineRow{
+	width: calc(25% - 1px);
+	border-right: 1px dashed #DDDDDD;
+}
+.carbrandLogo{
+	width: 50rpx;height: 50rpx;
+}
+.kline{
+	display: flex;
+	padding-bottom: 30rpx;
+	
+	flex-wrap: wrap;
+}
+.klineTitle{
+	font-weight: 500;
+	font-size: 30rpx;
+	color: #0B0B0B;
+	line-height: 42rpx;
+	padding-top: 20rpx;
+	padding-left: 24rpx;
+	
+}
+.klineIcon{
+	width: 50rpx;height: 50rpx;
+}
 .exit{
 	background: #FFFFFF;
 	line-height: 100rpx;
@@ -873,32 +1110,30 @@
 color: #764700;font-size: 22rpx;
 margin-left: 15rpx;
 padding-right: 10rpx;
-
     height: 30rpx;
 
 }
 .remindBox{
 	width: 596rpx;
-	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(153,153,153,0.1);
-	background: rgba(255,255,255,0.1);
+	background: #FEE0B9;
+	border-radius: 8rpx;
 	display: flex;justify-content: space-between;
 	    margin: 0 auto;font-size: 22rpx;
 		padding: 9rpx 20rpx;
-		color: #FFFFFF;
+		color: #666666;
 		line-height: 30rpx;
-		border-radius: 8rpx;
-		margin-bottom: 20rpx;
+	
 }
 .useremind{
 	font-weight: 500;
-	color: #FFFD00;
+	color: #A26D4F;
 }
 .swiper2{
 		min-height: 510rpx;
 	/* 	margin-top: -100rpx; */
 }
 .marginTop{
-	margin-top: -270rpx;
+	margin-top: -240rpx;
 }
 .marginTop2{
 	margin-top: -120rpx;
@@ -1145,14 +1380,23 @@ padding-right: 10rpx;
 		font-size: 24rpx;
 		color: #FFFFFF;
 	}
-
+    .padingBox{
+		padding: 0 20rpx;
+	}
 
 	.headerBox {
 		padding: 16rpx 24rpx;
 		display: flex;
 		justify-content: space-around;
+		
+		
+	}
+    .headerBox2{
+		background: #FFFFFF;
+		border-radius: 16rpx;
+		margin-bottom: 20rpx;
+		margin-top: 20rpx;
 	}
-
 	.quan {
 		display: flex;
 		flex-direction: column;
@@ -1162,7 +1406,7 @@ padding-right: 10rpx;
 	.numStr {
 		font-size: 32rpx;
 		font-weight: bold;
-		color: #FFFFFF;
+		color: #9A9A9A;
 		line-height: 45rpx;
 	}
     .numStr2{
@@ -1173,7 +1417,7 @@ padding-right: 10rpx;
 	}
 	.nameStr {
 		font-size: 24rpx;
-		color: #FFFFFF;
+		color: #222222;
 	}
 
 	.orderBox {
@@ -1188,12 +1432,20 @@ padding-right: 10rpx;
 
 
 	.orderTitle {
+		font-weight: 500;
 		font-size: 30rpx;
-		color: #333333;
-		font-weight: bold;
-
-	}
-
+		color: #0B0B0B;
+        display: flex;justify-content: space-between;
+	}
+   .allOrder{
+	   font-weight: 400;
+	   font-size: 22rpx;
+	   color: #939393;
+	   display: flex;
+   }
+   .allOrderIcon{
+	   width: 20rpx;height: 20rpx;margin-top: 6rpx;
+   }
 	.orderAll {
 		display: flex;
 		justify-content: space-between;

utils/request.js

@@ -8,9 +8,9 @@
 import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
-const baseUrl=extConfig.url+'/'
-
-//const baseUrl='http://dms.66km.com.cn/'
+//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.0.10:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://apidms.66km.com/'