1213

manifest.json

@@ -64,7 +64,8 @@
         "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
         "optimization" : {
             "subPackages" : true
-        }
+        },
+		 "lazyCodeLoading": "requiredComponents"
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -260,7 +260,7 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		{
+		/* {
 			"path": "pages/user/feedBack",
 			"style": {
 				"navigationBarTitleText": "意见反馈",
@@ -268,7 +268,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
+		}, */ {
 			"path": "pages/user/myOrder/paintOrderDetail",
 			"style": {
 				"navigationStyle": "custom",
@@ -497,13 +497,13 @@
             }
             
         },
-		{
+		/* {
 			"path": "pages/index/aboutUS",
 			"style": {
 				"navigationBarTitleText": "公司介绍"
 				
 			}
-		},
+		}, */
 		{
 			"path": "pages/index/receiveCoupon",
 			"style": {
@@ -517,14 +517,6 @@
 				"navigationBarTitleText": "优惠券详情"
 				
 			}
-		},
-		{
-			"path": "pages/shopList/shopList",
-			"style": {
-				"navigationBarTitleText": "门店",
-				"enablePullDownRefresh": true
-			}
-		
 		}
     ],
 	"subPackages": [{
@@ -600,6 +592,18 @@
 							"enablePullDownRefresh": false
 						}
 
+					},
+					{
+						"path": "aboutUS",
+						"style": {
+							"navigationBarTitleText": "公司介绍"
+						}
+					},
+					{
+						"path": "feedBack",
+						"style": {
+							"navigationBarTitleText": "意见反馈"
+						}
 					}
 				]
 				
@@ -629,7 +633,7 @@
 					"text": "活动"
 				},
 				 {
-					"pagePath": "pages/shopList/shopList",
+					"pagePath": "pages/index/shopList",
 					"iconPath": "./static/tabimg/activty2.png",
 					"selectedIconPath": "./static/tabimg/activty2.png",
 					"text": "门店"
@@ -650,4 +654,6 @@
 			"backgroundColor": "#F8F8F8"
 		},
 		"uniIdRouter": {}
+		
+		
 	}

pages/index/index.vue

@@ -10,16 +10,16 @@
 		</view>
 		<view>
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view style="height: 100rpx;"></view>
+			<view style="height: 98rpx;"></view>
 		</view>
 		<view class="topCont" :style="{background:'#'+themeColor}">
 			<!-- 有车 -->
-			<view class="carBox">
+			<view class="carBox" v-if="carInfo">
 				<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="carInfo.brandLogo" mode="" class="carLogo"></image>
+						  <view class="carInfomodel">{{carInfo.brand}}&nbsp;{{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>
@@ -48,7 +48,7 @@
 				  </view>
 				  
 				</view>
-				<view class="carTimeBox">
+				<view class="carTimeBox" v-if="appletHomeSetting.carInsuranceType==2||appletHomeSetting.carInsuranceType==3||appletHomeSetting.carMaintainType==3||appletHomeSetting.carMaintainType==2||appletHomeSetting.carAuditType==2||appletHomeSetting.carAuditType==3||homeCardList.openMCar.showType==1">
 					  <view class="bxBox">
 							  <view class="bxline bxline1" v-if="appletHomeSetting.carInsuranceType==3">
 								  <img src="../../static/timg/car1.png" alt="" class="bxlineIcon">
@@ -59,7 +59,7 @@
 							  <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="bxlineMs1" v-if="carInfo.insuranceExpireDate">{{carInfo.insuranceExpireDate.slice(0,10)}}</view>
 										  <view class="bxlineMs2" v-else>--</view>
 							  </view>
 							  <view class="bxline bxline2" v-if="appletHomeSetting.carMaintainType ==3">
@@ -75,9 +75,9 @@
 							  </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="bxlineTitle" style="width: 140rpx;">下次保养</view>
 								  <view class="bxlineMs1" v-if="carInfo.nextCareDate||carInfo.nextCareMilage">
-									 <span v-if="NextCareDate||NextCareDate===0">{{carInfo.nextCareDate}}</span>
+									 <span v-if="NextCareDate||NextCareDate===0">{{carInfo.nextCareDate.slice(0,10)}}</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>
@@ -93,7 +93,7 @@
 							  <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="bxlineMs1" v-if="carInfo.nextAuditDate">{{carInfo.nextAuditDate.slice(0,10)}}</view>
 								  <view class="bxlineMs2" v-else>--</view>
 							  </view>
 							  <view class="bxline bxline2" v-if="homeCardList.openMCar.showType==1">
@@ -107,8 +107,9 @@
 		
 			<!-- 有车 -->
 			<!-- 无车 -->
-			<view class="nocarBox" v-if="!carInfo">
-				<view style="display: flex;">
+			<view class="nocarBox" v-if="!carInfo" >
+				<image @click="addCar" :src="appletHomeSetting.carAddImage" mode="" style="width: 100%;height: 148rpx;"></image>
+				<!-- <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">
@@ -116,7 +117,7 @@
 						<view class="addCarMs2">车辆有问题,安徒生来帮您!</view>
 					</view>
 				</view>
-				<view class="addCarBtn" @click="addCar">添加爱车</view>
+				<view class="addCarBtn" @click="addCar">添加爱车</view> -->
 				
 			</view>
 			<!-- 无车 -->
@@ -147,7 +148,7 @@
 					</view>
 					
 				</view>
-				<view class="modularLine" style="margin-top: 13rpx;">
+				<view class="modularLine">
 					<view class="modularMk"  @click="goRoter(item)" v-if="index>3"  v-for="(item,index) in homeCardList.application">
 						<view class="modularLogoBox">
 							<image :src="item.icon" mode="" class="modularLogo"></image>
@@ -260,6 +261,24 @@
 		 	</view>
 		 </view>
 		 
+		 <!-- 弹框广告区-->
+		 <view class="qrBox" v-if="activityModulesShow" @click="activityModulesHide">
+			 <view class="tkHdBox" @click.stop="">
+				 <swiper class="swiperTk" 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.activityModules">
+				 		<view class="swiper-itemTk" @click="goRoter(item)">
+				 			<image class="tkHdImg" :src="item.icon" mode="aspectFit"></image>
+				 		</view>	
+				 	</swiper-item>
+				 </swiper>
+				 <view style="text-align: center;padding-top: 30rpx;">
+					 <image @click="activityModulesHide" class="closeTk" src="../../static/img/icon_delete.png" mode=""></image>
+				 </view>
+			 </view>
+		 </view>
+		  <!-- 弹框广告区-->
+		 
  
 		</view> 
 	</view>
@@ -300,9 +319,11 @@
 				customerInfo:'',
 				exitNum:'',
 				appletHomeSetting:'',
+				activityModulesShow:false,
 			}
 		},
 		onLoad(opt) {
+			
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			var that=this;
 			 //this.$common.getExtStoreId()
@@ -392,6 +413,9 @@
 			}, 1000);
 		},
 		methods: {
+			activityModulesHide(){
+				this.activityModulesShow=false
+			},
 			seeQr(){
 				// this.authorizShow = true;
 				// return false;
@@ -474,9 +498,12 @@
 						}
 					
 				}else{
-					uni.navigateTo({
+					/* uni.navigateTo({
 						url:'../user/addCar/addCar?type=1'
-					})
+					}) */
+					uni.navigateTo({
+						url:'../subPack/addCarCK'
+					}) 
 				}
 			},
 			goShopList(){
@@ -748,7 +775,7 @@
 						})
 					}else if(item.bizType==17){ //公司介绍
 						uni.navigateTo({
-							url:'aboutUS?unionID='+this.userInfo.unionId
+							url:'../subPack/aboutUS?unionID='+this.userInfo.unionId
 						})
 					}else if(item.bizType==18){ //领券中心
 						    uni.navigateTo({
@@ -1047,25 +1074,36 @@
 			 	})
 			 },
 			 getCarList(){
-				 this.$http('opencarOwnerHome/queryCarInfoList', {
+				 /* this.$http('opencarOwnerHome/queryCarInfoList', {
 				   
 				  },'GET').then(res => {
 					 if(res.code==401){
-						// this.uniLogin()
 						this.carInfo=''
 						this.$store.commit('mutationscarInfo', '')
 					 }else{
 						 this.carInfo=res.data[0]
-						 //this.carInfo=[]
 						 this.$store.commit('mutationscarInfo', this.carInfo)
-						/* this.carInfo.insuranceExpireDate='2022-11-11';
-						 this.carInfo.nextAuditDate='2022-08-13'; */
-						  //this.carInfo.nextCareDate='2022-08-11';
-						  //this.carInfo.nextCareMilage=11
 						 this.jsTime()
 					 }
 				 	 				
-				  })
+				  }) */
+				  this.$http('opencarOwnerHome/queryDefaultCarInfo', {
+				    
+				   },'GET').then(res => {
+				  		if(res.code==401){
+								this.carInfo=''
+								this.$store.commit('mutationscarInfo', '')
+				  		}else{
+							if(res.data){
+								this.carInfo = res.data
+							}else{
+								this.carInfo=''
+							}
+							 this.$store.commit('mutationscarInfo', this.carInfo)
+							 this.jsTime()
+				  		}
+				  	 				
+				   })
 			 },
 			 jsTime(){
 				 if(this.carInfo.insuranceExpireDate){
@@ -1159,6 +1197,10 @@
 				 		this.homeCardList=res.data;
 						this.appletHomeSetting=res.data.appletHomeSetting;
 						var appletHomeSetting=this.appletHomeSetting
+						if(this.homeCardList.activityModules.length>0){
+							this.activityModulesShow=true
+						}
+						
 						uni.setStorage({
 							key: 'openMCar',
 							data: res.data.openMCar,
@@ -1166,6 +1208,13 @@
 							   that.getCarList()
 							 }
 						}); 
+						uni.setStorage({
+							key: 'carAddImage',
+							data: appletHomeSetting.carAddImage,
+							 success: function () {
+							  
+							 }
+						}); 
 						uni.setTabBarItem({
 						   index: 0,
 						   text: '首页',
@@ -1253,7 +1302,7 @@
 	height: 72rpx;width: 492rpx;
 }
 .logoBox{
-	height: 72rpx;
+	height: 78rpx;
 }
 .logoBox{
 	padding-left: 20rpx;
@@ -1289,6 +1338,7 @@
 	line-height: 42rpx;
 	font-weight: 500;
 	padding-left: 12rpx;
+	    max-width: 270rpx;
 }
 .carTop{
 	display: flex;
@@ -1328,10 +1378,11 @@
 .modular{
 	background: #FFFFFF;
 	border-radius: 17rpx;
-	padding: 34rpx 0;
+	padding: 34rpx 0 4rpx 0;
 }
 .modularMk{
 	width: 25%;text-align: center;
+	padding-bottom: 30rpx;
 }
 .modularLine{
 	display: flex;flex-wrap: wrap;
@@ -1340,12 +1391,12 @@
 	width: 97rpx;height: 97rpx;
 }
 .modularTitle{
-	font-weight: 600;
-	font-size: 28rpx;
+	/* font-weight: 600; */
+	font-size: 24rpx;
 	color: #222222;line-height: 40rpx;
 }
 .modularTitle2{
-	font-size: 28rpx;
+	font-size: 24rpx;
 	color: #222222;line-height: 40rpx;
 }
 .contBox{
@@ -1368,7 +1419,7 @@
 	margin-top: 20rpx;
 	border-radius: 16rpx;
 	height: 200rpx;
-	padding: 12rpx 15rpx;
+	/* padding: 12rpx 15rpx; */
 }
 .activeGoodsIcon{
 	width: 55rpx;height: 19rpx;margin-top: 10rpx;
@@ -1726,4 +1777,20 @@ color: #EC0F0A;margin-right: 10rpx;
 			padding: 0 6rpx;
 			border-radius: 0rpx 4rpx 4rpx 0rpx;
 	}
+	.swiperTk{
+		height: 30vh;
+		width: 100vw;
+	}
+	.swiper-itemTk{
+		height: auto;
+	}
+	.tkHdImg{
+		width: 80vw;
+	}
+	.swiper-itemTk{
+		text-align: center;
+	}
+	.closeTk{
+		width: 60rpx;height: 60rpx;
+	}
 </style>

pages/index/shopList.vue

@@ -19,12 +19,12 @@
 		</view> -->
 		<view class="newTop">
 			<view class="newTopSSbox">
-				<view class="newTopSSLeft">
+				<view class="newTopSSLeft" @click="gocity">
 					<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>
+					<image class="newSImg" src="../../static/img2/ss.png" mode=""></image>
 					<input type="text" v-model="shopName" placeholder="门店名称、地址" class="sstopInput" @confirm="getqueryShopList2">
 				</view>
 				
@@ -81,10 +81,10 @@
 						  <image class="shopcallIcon" src="../../static/img2/call.png" mode=""></image>
 						  <view class="shopcallTxt">电话</view>
 					</view>
-					<view class="shopcall" >
+					<!-- <view class="shopcall" >
 						  <image class="shopcallIcon" src="../../static/img2/wx.png" mode=""></image>
 						  <view class="shopcallTxt">店长微信</view>
-					</view>
+					</view> -->
 				 
 				</view>
 
@@ -570,7 +570,7 @@
 	justify-content: center;
 }
 .newSImg{
-	width: 30rpx;height: 30rpx;
+	width: 28rpx;height: 28rpx;
 	margin-left: 30rpx;margin-top: 10rpx;
 }
 .sstopInput{
@@ -593,7 +593,7 @@
 	  max-width: 150rpx;
 }
 .dhImg{
-	width: 35rpx;height: 35rpx;
+	width: 35rpx;height: 35rpx;border-radius: 6rpx;
 }
 .newdistance{
 	position: absolute;top: 22rpx;right: 18rpx;

pages/shopList/shopList.vue

@@ -1,995 +0,0 @@
-<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

@@ -9,7 +9,7 @@
 					<image src="../../static/img2/jt1.png" mode="" class="jtIcon"></image>
 				</view>
 			</view>
-			<view class="line">
+			<view class="line" @click="scVinIMg">
 				<view class="lineTxt">扫描VIN码</view>
 				<view class="lineRgiht">
 					<image src="../../static/img2/sm.png" mode="" class="smIcon"></image>
@@ -43,7 +43,95 @@
 				uni.navigateTo({
 					url:'../user/addCar/carModel'
 				})
-			}
+			},
+			scVinIMg(){
+				var that = this;
+				uni.chooseImage({
+					sourceType: ['album','camera'],
+					count:1, 
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						that.file=tempFilePaths[0]
+						 uni.uploadFile({
+					            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例，非真实的接口地址
+					            filePath: tempFilePaths[0],
+					            name: 'file',
+					            formData: {
+					                'user': 'test'
+					            },
+					            success: (uploadFileRes) => {
+					                console.log(JSON.parse(uploadFileRes.data).data );
+									//that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
+									that.vinImg=JSON.parse(uploadFileRes.data).data[0];
+									that.vinScanner()
+					            }
+					        });
+				
+						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
+							
+						}) */
+					}
+				});
+			},
+			vinScanner(){
+				uni.showLoading({
+					title:'正在识别中'
+				});
+				/* 
+				this.$http('miniAppMyBMemberCar/vinScanner', {
+				  photo:this.file,
+				
+				 },'POST').then(res => {
+					uni.hideLoading();
+					//this.carGroupList=res.data.carGroupList
+				}) */
+				var that=this;
+				uni.uploadFile({
+				       url: that.$request.baseUrl+'miniAppMyBMemberCar/vinScanner', 
+				       filePath: that.file,
+				       name: 'photo',
+				       formData: {
+				           'user': 'test'
+				       },
+				       success: (uploadFileRes) => {
+						   uni.hideLoading();
+				           console.log(JSON.parse(uploadFileRes.data) );
+						   if(JSON.parse(uploadFileRes.data).code==0){
+							   	that.vin = JSON.parse(uploadFileRes.data).data;
+								that.queryCarModelGroupByVin()
+						   }else{
+							   uni.showToast({
+							   	title: JSON.parse(uploadFileRes.data).msg,
+							   	icon: 'none',
+							   	duration: 2000,
+							   });
+						   }
+						   	
+				       }
+				   });
+			},
+			queryCarModelGroupByVin(){
+				uni.showLoading({ });
+				this.$http('miniAppMyBMemberCar/queryCarModelGroupByVin', {
+				  vin:this.vin,
+				
+				 },'GET').then(res => {
+					uni.hideLoading();
+					if(res.code!=0){
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000,
+						});
+					}else{
+						/* this.vinboxtwoShow=true
+						this.vinSbList=res.data;
+						this.vincarModelInfo=this.vinSbList[0] */
+					}
+					
+				})
+				
+			},
 		
 
 		},

pages/user/feedBack.vue

@@ -1,276 +1,276 @@
-<template>
-	<view class="content">
-		<view class="main">
-			<!-- 建议 -->
-			<view class="firstView">
-				<view class="title">您的问题或建议</view>
-				
-				<textarea placeholder-style="color:#999999" placeholder="输入个人意见反馈" v-model="exeContent"
-						class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
-				
-			</view>
-
-			<!-- 图片 -->
-			<view class="secondView">
-				<view class="title">上传图片</view>
-				<view class="imgBox">
-					<view :class="{img4:(imgindex+1)%4==0}" class="imgLine" v-for="(img,imgindex) in imgArr">
-						<image :src="img" mode="" class="itemImg"></image>
-						<image src="../../static/img/icon_del_red.png" mode="" class="delImg" @click="delimg(imgindex)">
-						</image>
-					</view>
-					<view class="img4" @click="uploadImg">
-						<image src="../../static/img/btn_pic.png" mode="" class="itemImg"></image>
-					</view>
-				</view>
-			</view>
-
-
-		</view>
-
-		<view class="bottom">
-			<view class="shoreDz" :style="{background:'#'+themeColor}"  @click="submit">提交</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		
-		data() {
-			return {
-				imgArr: [],
-				exeContent: '',
+<template>
+	<view class="content">
+		<view class="main">
+			<!-- 建议 -->
+			<view class="firstView">
+				<view class="title">您的问题或建议</view>
+				
+				<textarea placeholder-style="color:#999999" placeholder="输入个人意见反馈" v-model="exeContent"
+						class="textareaCont" maxlength="-1" auto-height="true" @confirm="feedDone" />
+				
+			</view>
+
+			<!-- 图片 -->
+			<view class="secondView">
+				<view class="title">上传图片</view>
+				<view class="imgBox">
+					<view :class="{img4:(imgindex+1)%4==0}" class="imgLine" v-for="(img,imgindex) in imgArr">
+						<image :src="img" mode="" class="itemImg"></image>
+						<image src="../../static/img/icon_del_red.png" mode="" class="delImg" @click="delimg(imgindex)">
+						</image>
+					</view>
+					<view class="img4" @click="uploadImg">
+						<image src="../../static/img/btn_pic.png" mode="" class="itemImg"></image>
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+
+		<view class="bottom">
+			<view class="shoreDz" :style="{background:'#'+themeColor}"  @click="submit">提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		
+		data() {
+			return {
+				imgArr: [],
+				exeContent: '',
 				themeColor:'',
-
-			}
+
+			}
 		},
-		
+		
 		onLoad() {
 			 this.themeColor = uni.getStorageSync("themeColor");
 		
-		},
+		},
 		methods: {
-			
-			feedDone(e) {
-				this.exeContent = e.target.value
-
-			},
-			uploadImg() {
-
-				var that = this;
-				var length = this.imgArr.length;
-				var num = 9;
-				if (length > 8) {
-					uni.showToast({
-						title: '最多上传9张',
-						icon: 'none',
-						duration: 2000,
-					});
-					return false;
-				}
-				uni.chooseImage({
-					sourceType: ['album', 'camera'],
-					count: num - length,
-					sizeType:['compressed'],
-					success: (chooseImageRes) => {
-						const tempFilePaths = chooseImageRes.tempFilePaths;
-						/* uni.uploadFile({
-				            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例，非真实的接口地址
-				            filePath: tempFilePaths[0],
-				            name: 'file',
-				            formData: {
-				                'user': 'test'
-				            },
-				            success: (uploadFileRes) => {
-				                console.log(JSON.parse(uploadFileRes.data).data );
-								that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
-								
-				            }
-				        }); */
-						tempFilePaths.forEach(v => {
-							console.log(that.$request.baseUrl + 'tuhuUploadFile');
-							uni.uploadFile({
-								url: that.$request.baseUrl + 'tuhuUploadFile',
-								filePath: v,
-								name: 'file',
-								formData: {
-									'user': 'test'
-								},
-
-								success: (uploadFileRes) => {
-
-									console.log(JSON.parse(uploadFileRes.data).data);
-									that.imgArr = that.imgArr.concat(JSON.parse(
+			
+			feedDone(e) {
+				this.exeContent = e.target.value
+
+			},
+			uploadImg() {
+
+				var that = this;
+				var length = this.imgArr.length;
+				var num = 9;
+				if (length > 8) {
+					uni.showToast({
+						title: '最多上传9张',
+						icon: 'none',
+						duration: 2000,
+					});
+					return false;
+				}
+				uni.chooseImage({
+					sourceType: ['album', 'camera'],
+					count: num - length,
+					sizeType:['compressed'],
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						/* uni.uploadFile({
+				            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例，非真实的接口地址
+				            filePath: tempFilePaths[0],
+				            name: 'file',
+				            formData: {
+				                'user': 'test'
+				            },
+				            success: (uploadFileRes) => {
+				                console.log(JSON.parse(uploadFileRes.data).data );
+								that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
+								
+				            }
+				        }); */
+						tempFilePaths.forEach(v => {
+							console.log(that.$request.baseUrl + 'tuhuUploadFile');
+							uni.uploadFile({
+								url: that.$request.baseUrl + 'tuhuUploadFile',
+								filePath: v,
+								name: 'file',
+								formData: {
+									'user': 'test'
+								},
+
+								success: (uploadFileRes) => {
+
+									console.log(JSON.parse(uploadFileRes.data).data);
+									that.imgArr = that.imgArr.concat(JSON.parse(
 										uploadFileRes.data).data);
-									console.log('imgArr--',that.imgArr);
-								}
-							});
-						})
-						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
-							
-						}) */
-					}
-				});
-			},
-			delimg(index) {
-				this.imgArr.splice(index, 1)
-			},
-			submit() {
-				if (!this.exeContent) {
-					uni.showToast({
-						title: '请输入个人意见反馈',
-						icon: 'none',
-						duration: 2000,
-					});
-					return;
-				}
-				// if (this.imgArr.length == 0) {
-				// 	uni.showToast({
-				// 		title: '请上传图片',
-				// 		icon: 'none',
-				// 		duration: 2000,
-				// 	});
-				// 	return ;
-				// }
-				uni.showLoading({
-					title: '保存中'
-				})
-				var exeImg = this.imgArr.join(',')
-				this.$http('openmy/addTMemberSuggest', {
-
-					contents: this.exeContent,
-					img: exeImg
-				}, 'GET').then(res => {
-					//this.submitSuperCheckSheet()
-					if (res.code == 0) {
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 2000,
-						});
-						setTimeout(function() {
-							uni.navigateBack({
-
-							})
-						}, 2000);
-					} else {
-						uni.showToast({
-							title: '提交失败',
-							icon: 'none',
-							duration: 2000,
-						});
-					}
-
-
-
-				})
-			}
-
-		}
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #F4F5F7;
-		min-height: 100vh;
-
-	}
-
-	/* #ifdef H5 */
-	.content {
-		background: #F4F5F7;
-		min-height: calc(100vh - 44px);
-
-	}
-
-	/* #endif */
-	.main {
-		background: #F4F5F7;
-		padding: 20rpx 24rpx;
-	}
-
-	.firstView,
-	.secondView {
-		background-color: #FFFFFF;
+									console.log('imgArr--',that.imgArr);
+								}
+							});
+						})
+						/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
+							
+						}) */
+					}
+				});
+			},
+			delimg(index) {
+				this.imgArr.splice(index, 1)
+			},
+			submit() {
+				if (!this.exeContent) {
+					uni.showToast({
+						title: '请输入个人意见反馈',
+						icon: 'none',
+						duration: 2000,
+					});
+					return;
+				}
+				// if (this.imgArr.length == 0) {
+				// 	uni.showToast({
+				// 		title: '请上传图片',
+				// 		icon: 'none',
+				// 		duration: 2000,
+				// 	});
+				// 	return ;
+				// }
+				uni.showLoading({
+					title: '保存中'
+				})
+				var exeImg = this.imgArr.join(',')
+				this.$http('openmy/addTMemberSuggest', {
+
+					contents: this.exeContent,
+					img: exeImg
+				}, 'GET').then(res => {
+					//this.submitSuperCheckSheet()
+					if (res.code == 0) {
+						uni.showToast({
+							title: '提交成功',
+							icon: 'none',
+							duration: 2000,
+						});
+						setTimeout(function() {
+							uni.navigateBack({
+
+							})
+						}, 2000);
+					} else {
+						uni.showToast({
+							title: '提交失败',
+							icon: 'none',
+							duration: 2000,
+						});
+					}
+
+
+
+				})
+			}
+
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+
+	/* #ifdef H5 */
+	.content {
+		background: #F4F5F7;
+		min-height: calc(100vh - 44px);
+
+	}
+
+	/* #endif */
+	.main {
+		background: #F4F5F7;
+		padding: 20rpx 24rpx;
+	}
+
+	.firstView,
+	.secondView {
+		background-color: #FFFFFF;
 		border-radius: 10rpx;
-		padding: 20rpx;
-	}
-
-	.firstView {
-		margin-bottom: 20rpx;
-	}
-
-	.title {
-		font-size: 30rpx;
-		color: #3C3C3C;
-		padding-bottom: 20rpx;
-	}
-
-	.textareaCont {
-		min-height: 150rpx;
+		padding: 20rpx;
+	}
+
+	.firstView {
+		margin-bottom: 20rpx;
+	}
+
+	.title {
+		font-size: 30rpx;
+		color: #3C3C3C;
+		padding-bottom: 20rpx;
+	}
+
+	.textareaCont {
+		min-height: 150rpx;
 		width: 100%;
 		color: #3C3C3C;
-		font-size: 28rpx;
-	}
-
-
-	.imgBox {
-		display: flex;
-		flex-wrap: wrap;
-		
-		
-	}
-
-	.imgLine {
-		position: relative;
-		margin-right: 20.6rpx;
+		font-size: 28rpx;
+	}
+
+
+	.imgBox {
+		display: flex;
+		flex-wrap: wrap;
+		
+		
+	}
+
+	.imgLine {
+		position: relative;
+		margin-right: 20.6rpx;
 	}
 	.img4{
 		margin-right: 0rpx;
-	}
-
-	.itemImg {
-		width: 150rpx;
-		height: 150rpx;
-		
-	}
-
-
-	.delImg {
-		width: 32rpx;
-		height: 32rpx;
-		position: absolute;
-		right: 0rpx;
-		top: 0rpx;
-	}
-
-
-	.bottom {
-		width: 750rpx;
-		height: 120rpx;
-		background: #FFFFFF;
-		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: space-around;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-
-	}
-
-	.shoreDz {
-		width: 702rpx;
-		height: 74rpx;
-		background: #D53533;
-		border-radius: 37rpx;
-		text-align: center;
-		line-height: 74rpx;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		margin-top: 24rpx;
-	}
+	}
+
+	.itemImg {
+		width: 150rpx;
+		height: 150rpx;
+		
+	}
+
+
+	.delImg {
+		width: 32rpx;
+		height: 32rpx;
+		position: absolute;
+		right: 0rpx;
+		top: 0rpx;
+	}
+
+
+	.bottom {
+		width: 750rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-around;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+
+	}
+
+	.shoreDz {
+		width: 702rpx;
+		height: 74rpx;
+		background: #D53533;
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 24rpx;
+	}
 </style>

pages/user/addCar/addCar.vue

@@ -86,14 +86,15 @@
 				</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 class="sheng">{{plateNoArr.length?plateNoArr[0]:''}}</view>
+					<view class="zhimu">{{plateNoArr.length?plateNoArr[1]:''}}</view>
+					<view class="zhimu">{{plateNoArr.length?plateNoArr[2]:''}}</view>
+					<view class="zhimu">{{plateNoArr.length?plateNoArr[3]:''}}</view>
+					<view class="zhimu">{{plateNoArr.length?plateNoArr[4]:''}}</view>
+					<view class="zhimu">{{plateNoArr.length?plateNoArr[5]:''}}</view>
+					<view class="zhimu">{{plateNoArr.length?plateNoArr[6]:''}}</view>
+					<view class="zhimu" v-if="plateNoArr.length==8">{{plateNoArr.length==8?plateNoArr[7]:''}}</view>
+					<view class="xny" v-if="plateNoArr.length!=8">新能源</view>
 				</view>
 				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
 				<view class="jbLine">
@@ -182,6 +183,7 @@
                 keyTitle:'VIN',
                 keyType:'1',
 				iStatusBarHeight:'',
+				plateNoArr:[],
 			}
 		},
 		onLoad(opt) {
@@ -288,6 +290,7 @@
 
 					// 展示时
 					this.plateNo = res.data.plateNumber;
+					this.plateNoArr=[ ...this.plateNo ];
 					carModelInfo.value = res.data.carModel;
 					if (res.data.buyDate) {
 						this.time = res.data.buyDate.slice(0,10);
@@ -315,6 +318,8 @@
 				} else {
 					this.plate_type = 52
 				}
+				this.plateNoArr=[ ...plate ];
+				console.log(this.plateNoArr)
 				// this.queryCarmodelByPlateNumber()
 			},
 			queryCarmodelByPlateNumber() {
@@ -366,14 +371,14 @@
 					});
 					return false;
 				}
-				if(!this.mileage){
+				/* if(!this.mileage){
 					uni.showToast({
 						title: '请填写里程',
 						icon: 'none',
 						duration: 3000
 					});
 					return false;
-				}
+				} */
 				if(!this.carModelInfo.value){
 					uni.showToast({
 						title: '请选择车型',

pages/user/addCar/cailist.vue

@@ -53,6 +53,7 @@
 					</view>
 				</view>
 				<view class="lineBottom">
+					 <view class="lineDel" v-show="item.isDefault!=1" @click.stop="defaultCar(item)">设为默认</view>
 					 <view class="lineDel" @click.stop="editCar(item.id)">编辑</view>
 					<view class="lineDel"  @click.stop="maintain(item)">保养信息</view>
 				</view>
@@ -185,9 +186,23 @@
 					this.loding = true;
 				})
 			},
+			defaultCar(item){
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.loding = false;
+				this.$http('opencarOwnerHome/setDefaultCar', {
+				   carId:item.id
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					 this.$store.commit('mutationscarInfo', item)
+					this.loding = true;
+					this.getqueryMyBMemberCar();
+				})
+			},
 			addBtn() {
 				uni.navigateTo({
-					url: 'addCar'
+					url: '../../subPack/addCarCK'
 				})
 				
 				
@@ -421,14 +436,15 @@
 		position: absolute;
 		top: 0;
 		left: 0;
-		width: 109rpx;
+		width: 74rpx;
 		height: 40rpx;
-		background: linear-gradient(131deg, #FFA72C 0%, #FF450F 100%);
+		/* background: linear-gradient(131deg, #FFA72C 0%, #FF450F 100%); */
 		border-radius: 10px 0rpx 10px 0rpx;
 		text-align: center;
 		line-height: 40rpx;
-		color: #FFFFFF;
+		color: #222222;
 		font-size: 22rpx;
+		background: #FCD903;
 	}
 	
 	.authorizBox{

pages/user/addCar/carModel.vue

@@ -330,7 +330,7 @@ export default {
 						/* uni.navigateBack({
 							delta:1
 						}) */
-						uni.navigateTo({
+						uni.redirectTo({
 							url:'addCar'
 						})
 					
@@ -392,6 +392,15 @@ export default {
 			this.$http('opencarInfoOwner/queryCarModelGroupPackage', {
 			  
 			 },'POST').then(res => {
+				// debugger
+				//console.log(res.code)
+				if(res.code!=0){
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 2000,
+					});
+				}
 				uni.hideLoading();
 				this.carModelList=res.data.brands
 			})

pages/user/user.vue

@@ -3,7 +3,7 @@
 
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="customerMes">
-				<image @click="updateUserInfo" v-if="headImg" :src="headImg" mode=""
+				<image @click="updateUserInfo" v-if="showSetting.showImageType==0" :src="showSetting.showImage" mode=""
 					style="width: 88rpx;height: 88rpx;border-radius: 44rpx;"></image>
 				<image @click="updateUserInfo" v-else src="http://dmsphoto.66km.com.cn/thFiles/64CD12A3-588E-4201-90F6-5428F6ACD9F9.png" mode=""
 					style="width: 88rpx;height: 88rpx;border-radius: 44rpx;"></image>
@@ -226,13 +226,13 @@
 			</view>
 		</view>
         <view class="kbox">
-			<view class="klineCont">
+			<view class="klineCont" v-if="carInfo">
 				<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>
+							<span>{{carInfo.brand}}{{carInfo.series}}</span>
 						</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('historySpend')">
@@ -250,8 +250,9 @@
 				</view>
 			</view>
 			
-			<view class="klineCont">
-				<view class="klineTitle">我的爱车</view>
+			<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">
 					<view class="addCar">
 						<view class="addCarLeft">
@@ -273,7 +274,7 @@
 						</view>
 						<view class="addCarBtn" @click="addCar">添加爱车</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			
 			<view class="klineCont">
@@ -291,7 +292,7 @@
 						<image class="klineIcon" src="../../static/timg/sos.png" mode=""></image>
 					    <view class="KlineTxt2">救援记录</view>
 					</view>
-					<view class="klineRow">
+					<view class="klineRow" @click="gonavigateTo('../index/onlineBooking')">
 						<image class="klineIcon" src="../../static/img2/clsp.png" mode=""></image>
 					    <view class="KlineTxt2">车辆适配</view>
 					</view>
@@ -312,15 +313,15 @@
 					    <view class="KlineTxt2">分享好友</view>
 					</view>
 					</button>
-					<view class="klineRow" @click="gonavigateTo('../subPack/luckList')">
+					<view class="klineRow" @click="gonavigateTo('../subPack/luckList')" v-if="numList.shopSettings.luckdrawDisabled">
 						<image class="klineIcon" src="../../static/timg/icon_jydd.png" mode=""></image>
 					    <view class="KlineTxt2">活动奖品</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('../referral/referral')">
+					<view class="klineRow" @click="gonavigateTo('../referral/referral')" v-if="numList.customerInfo.rebateState==1&&numList.shopSettings.introductionDisabled">
 						<image class="klineIcon" src="../../static/img2/kehuzjs.png" mode=""></image>
 					    <view class="KlineTxt2">客户转介绍</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('../partner/partner')">
+					<view class="klineRow" @click="gonavigateTo('../partner/partner')" v-if="numList.customerInfo.pState==1&&numList.shopSettings.partnerDisabled">
 						<image class="klineIcon" src="../../static/img2/chezhu.png" mode=""></image>
 					    <view class="KlineTxt2">车主合伙人</view>
 					</view>
@@ -328,7 +329,7 @@
 						<image class="klineIcon" src="../../static/img2/icon_pingjia.png" mode=""></image>
 					    <view class="KlineTxt2">我的评价</view>
 					</view>
-					<view class="klineRow" @click="gonavigateTo('feedBack')">
+					<view class="klineRow" @click="gonavigateTo('../subPack/feedBack')">
 						<image class="klineIcon" src="../../static/img/icon_me7.png" mode=""></image>
 					    <view class="KlineTxt2">建议反馈</view>
 					</view>
@@ -577,6 +578,7 @@
 				f2cIndex:'',
 				customerName:'',
 				carInfo:'',
+				carAddImage:'',
 			}
 		},
 		onLoad(opt) {
@@ -616,6 +618,7 @@
 			// const accountInfo = wx.getAccountInfoSync();
 			// var version_number = accountInfo.miniProgram.version;
 			// console.log(version_number)
+			this.carAddImage=uni.getStorageSync("carAddImage")
 		},
 		onShow() {
 			const wxOpenData = this.$store.state.wxOpenData;
@@ -756,13 +759,13 @@
 			},
 			gonavigateaboutUS(){
 				uni.navigateTo({
-					url: '../index/aboutUS?unionID='+this.numList.customerInfo.unionID
+					url: '../subPack/aboutUS?unionID='+this.numList.customerInfo.unionID
 				})
 				
 			},
 			gomember(memberTitle){
 				uni.navigateTo({
-					url: '../index/aboutUS?unionID='+this.numList.customerInfo.unionID+'&memberTitle='+memberTitle
+					url: '../subPack/aboutUS?unionID='+this.numList.customerInfo.unionID+'&memberTitle='+memberTitle
 				})
 			},
 			getVersionInfo() {
@@ -1488,8 +1491,8 @@ padding-right: 10rpx;
 		color: #FFFFFF;
 		font-size: 20rpx;
 		position: absolute;
-
-		left: 82rpx;
+        top: -10rpx;
+		left: 90rpx;
 		z-index: 11;
 	}