bug修改

pages.json

@@ -649,32 +649,32 @@
 			"backgroundColor": "#ffffff",
 			"list": [{
 					"pagePath": "pages/index/index",
-					"iconPath": "./static/tabimg/index2.png",
-					"selectedIconPath": "./static/tabimg/index2.png",
+					/* "iconPath": "./static/tabimg/index2.png",
+					"selectedIconPath": "./static/tabimg/index2.png", */
 					"text": "首页"
 				},
 				{
 					"pagePath": "pages/shop/shop",
-					"iconPath": "./static/tabimg/shop2.png",
-					"selectedIconPath": "./static/tabimg/shop2.png",
+					/* "iconPath": "./static/tabimg/shop2.png",
+					"selectedIconPath": "./static/tabimg/shop2.png", */
 					"text": "商城"
 				},
 				{
 					"pagePath": "pages/activity/activity",
-					"iconPath": "./static/tabimg/activty2.png",
-					"selectedIconPath": "./static/tabimg/activty2.png",
+					/* "iconPath": "./static/tabimg/activty2.png",
+					"selectedIconPath": "./static/tabimg/activty2.png", */
 					"text": "活动"
 				},
 				 {
 					"pagePath": "pages/index/shopList",
-					"iconPath": "./static/tabimg/activty2.png",
-					"selectedIconPath": "./static/tabimg/activty2.png",
+					/* "iconPath": "./static/tabimg/activty2.png",
+					"selectedIconPath": "./static/tabimg/activty2.png", */
 					"text": "门店"
 				}, 
 				{
 					"pagePath": "pages/user/user",
-					"iconPath": "./static/tabimg/me2.png",
-					"selectedIconPath": "./static/tabimg/me2.png",
+				/* 	"iconPath": "./static/tabimg/me2.png",
+					"selectedIconPath": "./static/tabimg/me2.png", */
 					"text": "我的"
 				}
 

pages/activity/activity.vue

@@ -24,8 +24,9 @@
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 				<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
+					 <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
-				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+				   
 				</view>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">
@@ -215,7 +216,7 @@
 		text-align: center;
 		margin-left: 56rpx;
 	}
-.authorizContbutton{
+	.authorizContbutton{
 		width: 210rpx;
 		height: 66rpx;
 		background: #EC0F0A;
@@ -224,8 +225,7 @@
 		text-align: center;
 		font-size:30rpx;
 		color: #FFFFFF;
-		
-		margin-left:40rpx;
+		margin-right: 40rpx;
 	}
 	.sqRefuse{
 		width: 210rpx;
@@ -235,7 +235,7 @@
 		border-radius: 36rpx;
 		text-align: center;
 		font-size:30rpx;
-		margin-right:40rpx;
+		margin-left:40rpx;
 		color: #999999;
 	}
 	.sqLine{

pages/activity/jkDetail.vue

@@ -295,8 +295,9 @@
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 				<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
+					 <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
-				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+				   
 				</view>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">
@@ -1845,8 +1846,7 @@ color: #FFFFFF;font-size: 26rpx;
 			text-align: center;
 			font-size:30rpx;
 			color: #FFFFFF;
-			
-			margin-left:40rpx;
+			margin-right: 40rpx;
 		}
 		.sqRefuse{
 			width: 210rpx;
@@ -1856,7 +1856,7 @@ color: #FFFFFF;font-size: 26rpx;
 			border-radius: 36rpx;
 			text-align: center;
 			font-size:30rpx;
-			margin-right:40rpx;
+			margin-left:40rpx;
 			color: #999999;
 		}
 		.sqLine{

pages/index/index.vue

@@ -6,6 +6,9 @@
 			<view class="logoBox">
 				<!-- <image src="../../static/img2/indexlogo.png" mode="" class="logoImg"></image> -->
 				 <image v-if="appletHomeSetting.showImageType==0" :src="appletHomeSetting.showImage" mode="" class="logoImg"></image> 
+			    <view class="showTitleBox">
+					{{appletHomeSetting.showTitle}}
+				</view>
 			</view>
 		</view>
 		<view>
@@ -126,7 +129,7 @@
 			<!-- 无车 -->
 
 		</view>
-		<view v-if="!carInfo" style="margin-top: -80rpx;"></view>
+		<!-- <view v-if="!carInfo" style="margin-top: -80rpx;"></view> -->
 		<view class="contBox">
 		<!-- 服务顾问 -->
 		<view v-if="homeCardList.openMUsers">
@@ -203,7 +206,7 @@
 					<scroll-view class="goodsTabBox" scroll-x="true" enable-flex="true" >
 						<view class="goodsTab " :class="{goodsACt:tabIndex==index}" v-for="(item,index) in navigationList">
 							<view @click="tabFn(index,item.showType,item.id)">{{item.title}}</view>
-						    <image v-if="tabIndex==index" class="activeGoodsIcon" src="../../static/img2/tab.svg" mode=""></image>
+						    <image v-if="tabIndex==index" class="activeGoodsIcon" src="../../static/img2/tab.png" mode=""></image>
 							<!-- <image v-if="tabIndex==index" class="activeGoodsIcon" src="http://dmsphoto.66km.com.cn/thFiles/DABE4EFB-5699-4515-A4D4-59AF13F8D2F4.png" mode=""></image> -->
 						</view>
 						
@@ -257,7 +260,7 @@
 			</view>
 			<!-- 商品区 -->
 			<!-- 热门商品 -->
-			<view v-if="OpenMGoods&&tabType==2">
+			<view v-if="OpenMGoods&&tabType==2" class="qiehuanBox">
 				<view class="" v-if="OpenMGoods.goodsList&&OpenMGoods.goodsList.length>0">
 					<view class="Hot" ><!-- v-if="OpenMGoods.showType==1" -->
 						<!-- <view class="hotTop">
@@ -322,7 +325,9 @@
 			</view>
 			
 			<!-- 热门活动 -->
-			<view v-if="openMActivity&&openMActivity.openCollectingList&&tabType==3">
+			<view class="qiehuanBox" v-if="openMActivity&&tabType==3">
+				<view v-if="openMActivity.openCollectingList">
+			
 				<view class="Hot" v-if="openMActivity.openCollectingList.length>0">
 					<!-- <view class="hotTop">
 						<view class="hotLeft">
@@ -350,6 +355,7 @@
 					</view>
 					
 				</view>
+				</view>
 			</view>
 			
 		</view>
@@ -357,13 +363,13 @@
 		
 		<view style="height: 60rpx;"></view>
 		<!-- 手机号授权 -->
-		<view class="authorizBox"  v-if="authorizShow" @click="authorizShowHide"><!--   -->
+		<view class="authorizBox"  v-if="authorizShow"   @click="authorizShowHide"><!--   -->
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
-					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
-				    <view class="sqRefuse"  @click="authorizShowHide">拒绝</view>
+					 <view class="sqRefuse"  @click="authorizShowHide">拒绝</view>
+					 <button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
 				</view>
 				
 			</view>
@@ -534,6 +540,9 @@
 					this.jsTime()
 				}
 			}
+			if(this.userInfo){
+				this.queryManagerInfo()
+			}
 			
 		    
 			
@@ -853,8 +862,8 @@
 				console.log(item)
 				
 				if(!this.userInfo){
-					//this.authorizShow=true;
-					
+					this.authorizShow=true;
+				//if(false){	
 				}else{
 					if(item.bizType==0){
 						if(item.name=='新车'){ //
@@ -992,7 +1001,8 @@
 							 	url:'../user/addCar/cailist'
 							 }) 
 					}else if(item.bizType==20){
-						
+						console.log("做保养")
+						  uni.removeStorageSync('byCar');
 						  uni.navigateTo({
 						 	url:'../subPack/maintain?maintainProjectID='+item.maintainProjectID
 						 }) 
@@ -1175,7 +1185,13 @@
 						this.customerInfo=data.loginInfo.customerInfo
 						this.$store.commit('mutationsuserInfo', this.userInfo);
 						this.$store.commit('mutationswxOpenData', data);
-						
+						uni.setStorage({
+							key: 'customerInfo',
+							data: this.customerInfo,
+							 success: function () {
+								 
+							 }
+						})
 						uni.setStorage({
 							key: 'userInfo',
 							data: data.loginInfo.openUser,
@@ -1214,6 +1230,7 @@
 						if(!this.customerInfo.wxMiniV2OpenID){
 							this.seeQr()
 						}
+						this.queryManagerInfo()
 					}
 				 		
 				  })
@@ -1525,6 +1542,17 @@
 }
 .logoBox{
 	height: 78rpx;
+	position: relative;
+}
+.showTitleBox{
+	line-height: 78rpx;
+	position: absolute;
+	left: 0;top: 0;
+	width: 100%;
+	text-align: center;
+	font-size: 36rpx;
+	 color: #fff;
+	font-weight: 500;
 }
 .logoBox{
 	padding-left: 20rpx;
@@ -1561,7 +1589,10 @@
 	line-height: 42rpx;
 	font-weight: 500;
 	padding-left: 12rpx;
-	    max-width: 270rpx;
+	max-width: 270rpx;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 .carTop{
 	display: flex;
@@ -1651,11 +1682,11 @@
 	/* padding: 12rpx 15rpx; */
 }
 .activeGoodsIcon{
-	width: 55rpx;height: 19rpx;
+	width: 51rpx;height: 16rpx;
 	margin: 0 auto;
 	margin-top: 8rpx;
-		margin-bottom: 20rpx;
-		    display: block;
+	margin-bottom: 26rpx;
+   display: block;
 }
 .goodsTabBox{
 	display: flex;
@@ -1688,11 +1719,18 @@
 .goodsLine{
 	display: flex;
 }
+.byBox{
+	min-height: 600rpx;
+}
+.qiehuanBox{
+	min-height: 600rpx;
+}
 .byBox .goodsName{
 	font-weight: 600;
 	font-size: 28rpx;
 	color: #222222;
 	line-height: 40rpx;
+	
 }
 .goodsRight{
 	padding-left: 24rpx;
@@ -1861,8 +1899,6 @@ margin-top: 10rpx;
 		text-align: center;
 		font-size:30rpx;
 		color: #FFFFFF;
-		
-		margin-left:40rpx;
 	}
 	.sqRefuse{
 		width: 210rpx;
@@ -1872,7 +1908,7 @@ margin-top: 10rpx;
 		border-radius: 36rpx;
 		text-align: center;
 		font-size:30rpx;
-		margin-right:40rpx;
+		margin-left:40rpx;
 		color: #999999;
 	}
 	.sqLine{
@@ -2154,7 +2190,7 @@ margin-top: 10rpx;
 		height: 280rpx;
 	}
 	.hotLine{
-		margin-top: 20rpx;
+		margin-bottom: 20rpx;
 		border-radius: 10rpx;
 		background: #FFFFFF;
 		overflow: hidden;

pages/index/onlineBooking.vue

@@ -151,8 +151,9 @@
         		<view class="authorizName">{{wxOpenData.miniAppName}}</view>
         		<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
         		<view class="sqLine">
+					<view class="sqRefuse" @click="authorizShowHide">拒绝</view>
         			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
-        		    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+        		   
         		</view>
         	</view>
         	<view style="text-align: center;padding-top: 56rpx;">
@@ -969,8 +970,7 @@
 		text-align: center;
 		font-size:30rpx;
 		color: #FFFFFF;
-		
-		margin-left:40rpx;
+		margin-right: 40rpx;
 	}
 	.sqRefuse{
 		width: 210rpx;
@@ -980,7 +980,7 @@
 		border-radius: 36rpx;
 		text-align: center;
 		font-size:30rpx;
-		margin-right:40rpx;
+		margin-left:40rpx;
 		color: #999999;
 	}
 	.sqLine{

pages/index/paint.vue

@@ -7,7 +7,7 @@
 				<view>
 					<view class="plateNumber">{{carInfo.plateNumber}}</view>
 					<view class="car" v-if="carInfo.carModel">{{carInfo.carModel}}</view>
-					<view class="car" v-else>暂无</view>
+					<view class="car" v-else>暂无车型信息</view>
 				</view>	
 					
 				</image>

pages/index/personalCard.vue

@@ -107,7 +107,7 @@
 				// 	url:'/pages/index/index'
 				// })
 				uni.navigateTo({
-					url:'onlineBooking?naShopId='+this.adInfo.shopID
+					url:'onlineBooking?naShopId='+this.adInfo.shopId
 				})
 			}
 		}

pages/index/rescue.vue

@@ -95,8 +95,9 @@
 		  			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 		  			<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 		  			<view class="sqLine">
+						<view class="sqRefuse" @click="authorizShowHide">拒绝</view>
 		  				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
-		  			    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+		  			    
 		  			</view>
 		  		</view>
 		  		<view style="text-align: center;padding-top: 56rpx;">
@@ -867,8 +868,7 @@
 				text-align: center;
 				font-size:30rpx;
 				color: #FFFFFF;
-				
-				margin-left:40rpx;
+				margin-right: 40rpx;
 			}
 			.sqRefuse{
 				width: 210rpx;
@@ -878,7 +878,7 @@
 				border-radius: 36rpx;
 				text-align: center;
 				font-size:30rpx;
-				margin-right:40rpx;
+				margin-left:40rpx;
 				color: #999999;
 			}
 			.sqLine{

pages/shop/goodsDetail.vue

@@ -128,9 +128,11 @@
 				<image src="../../static/timg/share.png" mode="" class="bottomImg"></image>
 				<view class="bottomTxt">分享</view>
 			</button> -->
-			<view class="bottomBtn commonBtn"   @click="ljbuy" v-if="!activityEnd&&info.goodsDownTime">立即购买</view>
-			<view class="bottomBtn commonBtn"  @click="ljbuy" v-if="activityEnd&&!info.goodsDownTime">立即购买</view>
-			<view class="bottomBtn2"  v-if="activityEnd&&info.goodsDownTime">抢购结束</view>
+			<view class="bottomBtn commonBtn"   @click="ljbuy" v-if="!activityEnd&&info.goodsDownTime&&info.goodsState==1">立即购买</view>
+			<view class="bottomBtn commonBtn"  @click="ljbuy" v-if="activityEnd&&!info.goodsDownTime&&info.goodsState==1">立即购买</view>
+			
+			<view class="bottomBtn2"  v-if="activityEnd&&info.goodsDownTime&&info.goodsState!=2">抢购结束</view>
+			<view class="bottomBtn2"  v-if="info.goodsState==2">商品已下架</view>
 		</view>
 	</view>
 
@@ -185,7 +187,9 @@
 			</view>
 			
 			<view class="buybtnBox">
-				<view class="buyBtn commonBtn" @click="goBuy" >立即购买</view>
+				<!-- 1上家 2下架 GoodsState -->
+				<view v-if="info.goodsState!=2" class="buyBtn commonBtn" @click="goBuy" >立即购买</view>
+				<view v-else class="buyBtn2"  >商品已下架</view>
 			</view>
 			
 		</view>
@@ -643,6 +647,17 @@
 	font-size: 30rpx;
 	margin-left: 30rpx;
 }
+.buyBtn2{
+	width: 690rpx;
+	height: 74rpx;
+	background: #EC0F0A;
+	border-radius: 37rpx;
+	text-align: center;
+	line-height: 74rpx;
+	color: #FFFFFF;
+	font-size: 30rpx;
+	margin-left: 30rpx;
+}
 .buyShopRightJt{
 	width: 12rpx;
 	height: 20rpx;

pages/shop/shop.vue

@@ -96,8 +96,9 @@
 			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 			<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 			<view class="sqLine">
+				<view class="sqRefuse" @click="authorizShowHide">拒绝</view>
 				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
-			    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+			   
 			</view>
 		</view>
 		<view style="text-align: center;padding-top: 56rpx;">
@@ -772,29 +773,28 @@ z-index: 11;
 		text-align: center;
 		margin-left: 56rpx;
 	}
-	.authorizContbutton{
-		width: 210rpx;
-		height: 66rpx;
-		background: #EC0F0A;
-		border-radius: 44rpx;
-		line-height: 66rpx;
-		text-align: center;
-		font-size:30rpx;
-		color: #FFFFFF;
-		
-		margin-left:40rpx;
-	}
-	.sqRefuse{
-		width: 210rpx;
-		height: 66rpx;
-		border: 1px solid #eaeaea;
-		line-height: 66rpx;
-		border-radius: 36rpx;
-		text-align: center;
-		font-size:30rpx;
-		margin-right:40rpx;
-		color: #999999;
-	}
+.authorizContbutton{
+			width: 210rpx;
+			height: 66rpx;
+			background: #EC0F0A;
+			border-radius: 44rpx;
+			line-height: 66rpx;
+			text-align: center;
+			font-size:30rpx;
+			color: #FFFFFF;
+			margin-right: 40rpx;
+		}
+		.sqRefuse{
+			width: 210rpx;
+			height: 66rpx;
+			border: 1px solid #eaeaea;
+			line-height: 66rpx;
+			border-radius: 36rpx;
+			text-align: center;
+			font-size:30rpx;
+			margin-left:40rpx;
+			color: #999999;
+		}
 	.sqLine{
 			margin-top: 62rpx;
 		display: flex;

pages/subPack/addCarCK.vue

@@ -40,7 +40,7 @@
 		},
 		methods: {
 			goCarModel(){
-				uni.navigateTo({
+				uni.redirectTo({
 					url:'../user/addCar/carModel'
 				})
 			},

pages/subPack/jkDetail.vue

@@ -289,8 +289,9 @@
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 				<view class="authorizMs">未注册的手机号登录后将自动创建会员账号，如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
+					<view class="sqRefuse" @click="authorizShowHide">拒绝</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
-				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
+				    
 				</view>
 			</view>
 			<view style="text-align: center;padding-top: 56rpx;">
@@ -1882,8 +1883,7 @@ color: #FFFFFF;font-size: 26rpx;
 			text-align: center;
 			font-size:30rpx;
 			color: #FFFFFF;
-			
-			margin-left:40rpx;
+			margin-right: 40rpx;
 		}
 		.sqRefuse{
 			width: 210rpx;
@@ -1893,7 +1893,7 @@ color: #FFFFFF;font-size: 26rpx;
 			border-radius: 36rpx;
 			text-align: center;
 			font-size:30rpx;
-			margin-right:40rpx;
+			margin-left:40rpx;
 			color: #999999;
 		}
 		.sqLine{

pages/subPack/maintain.vue

@@ -233,10 +233,17 @@
 			if(this.carInfo){
 				this.getRecommend()
 			}else{
-				uni.showToast({
-					 title: '请先添加车辆',
-					 icon:'none',
-					 duration: 3000
+				uni.showModal({
+					title: '提示',
+					content: '请先选择车辆',
+					showCancel:false,
+					success: function (res) {
+						if (res.confirm) {
+							uni.navigateTo({
+								url:'../user/addCar/cailist?type=5'
+							})
+						} 
+					}
 				});
 			}
 			
@@ -276,14 +283,17 @@
 					title: '提示',
 					content: '确定清空吗？',
 					success: function(resTK) {
-						that.list.forEach(item=>{
-							item.packageItems.forEach(v=>{
-								v.select=false
+						if (resTK.confirm) {
+							that.list.forEach(item=>{
+								item.packageItems.forEach(v=>{
+									v.select=false
+								})
 							})
-						})
-						 that.itemDefault=''
-						 that.qdNum=0
-						 that.totalPrice=0
+							 that.itemDefault=''
+							 that.qdNum=0
+							 that.totalPrice=0
+						}
+						
 					}
 				});
 				
@@ -294,14 +304,16 @@
 					title: '提示',
 					content: '确定删除吗？',
 					success: function(resTK) {
-						that.list.forEach(item=>{
-							item.packageItems.forEach(v=>{
-								v.select=false
+						if (resTK.confirm) {
+							that.list.forEach(item=>{
+								item.packageItems.forEach(v=>{
+									v.select=false
+								})
 							})
-						})
-						 that.itemDefault=''
-						 that.qdNum=0
-						 that.totalPrice=0
+							 that.itemDefault=''
+							 that.qdNum=0
+							 that.totalPrice=0
+						}
 					}
 				});
 				
@@ -366,6 +378,12 @@
 					bizId:this.maintainProjectID
 				}, 'GET').then(res => {
 					uni.hideLoading();
+					if(!res.data.data){
+						this.list=''
+						this.itemDefault=''
+						this.qdNum=0
+						this.totalPrice=0
+					}
 					res.data.data.forEach(item=>{
 						
 						item.packageItems.forEach(v=>{
@@ -380,6 +398,7 @@
 							this.itemDefault=d
 							this.itemDefault.goodsname=this.lineItem.title
 							this.totalPrice=d.money
+							this.qdNum=1
 						}
 					})
 					

pages/subPack/maintainItem.vue

@@ -59,7 +59,7 @@
 	 <view class="buyLine" @click="ckCar" style="padding-bottom: 10rpx;">
 		 <view class="buyTitle">已选车型</view>
 		 <view class="buyData" style="display: flex;">
-			 <view class="carModelLine">   {{carInfo.carModel?carInfo.carModel:''}}</view>
+			 <view class="carModelLine">   {{carInfo.carModel?carInfo.carModel:'请选择车辆'}}</view>
 		
 		   <image class="jtIcon" src="../../static/img2/byjt.png" mode=""></image>
 		 </view>
@@ -160,23 +160,23 @@
  <view class="tkBox" v-if="tkShow" @click="closeTk">
  	 <view class="tkCont" @click.stop="">
  		 <view class="tkTop">
-			 <image class="tkImg" v-if="itemDefault.mainImgUrl" :src="itemDefault.mainImgUrl" mode="" ></image>
+			 <image class="tkImg" v-if="itemDefaultTk.mainImgUrl" :src="itemDefaultTk.mainImgUrl" mode="" ></image>
  			 <image class="tkImg" v-else src="../../static/timg/noimg.png" mode="" ></image>
  			 <view class="tkNameBox">
  				 <view class="tkName">{{detail.title}}</view>
 				 <view style="display: flex;padding-bottom: 24rpx;">
-				 		<view v-if="itemDefault.salesLabel==1" class="biaoqian">活动价</view>
-				 		<view v-if="itemDefault.salesLabel==2" class="biaoqian">促销价</view>
-				 		<view v-if="itemDefault.salesLabel==3" class="biaoqian">特价</view>
-				 		<view v-if="itemDefault.salesLabel==4" class="biaoqian">限量抢购</view>
-				 		<view v-if="itemDefault.salesLabel==5" class="biaoqian">{{itemDefault.salesLabelCustom}}</view>
+				 		<view v-if="itemDefaultTk.salesLabel==1" class="biaoqian">活动价</view>
+				 		<view v-if="itemDefaultTk.salesLabel==2" class="biaoqian">促销价</view>
+				 		<view v-if="itemDefaultTk.salesLabel==3" class="biaoqian">特价</view>
+				 		<view v-if="itemDefaultTk.salesLabel==4" class="biaoqian">限量抢购</view>
+				 		<view v-if="itemDefaultTk.salesLabel==5" class="biaoqian">{{itemDefaultTk.salesLabelCustom}}</view>
 				 			 
 				 </view>
  				 <view class="goodsPrice">
  				 	<view class="goodsPrice2">￥</view>
- 				 	<view class="goodsPrice3">{{itemDefault.money}}</view>
- 				 	<view class="goodsPrice4" v-if="itemDefault.showCrossedPrice==1">原价：
-					<span class="goodsPrice41">¥{{itemDefault.crossedPrice}}</span>
+ 				 	<view class="goodsPrice3">{{itemDefaultTk.money}}</view>
+ 				 	<view class="goodsPrice4" v-if="itemDefaultTk.showCrossedPrice==1">原价：
+					<span class="goodsPrice41">¥{{itemDefaultTk.crossedPrice}}</span>
 					
 					</view>
  				 </view>
@@ -189,8 +189,8 @@
  		 		 <view class="buyTitle">商品规格</view>
  		 		<view class="guigeBox">
 		 <scroll-view scroll-x="true" enable-flex="true" class="buyData guigeBox2">
-							 <view class="goodsGuige" @click="goodsGuige(item)"
-							 :class="{activeGuige:item.id==itemDefault.id}" v-if="item.isShow==1"
+							 <view class="goodsGuige" @click="goodsGuige2(item)"
+							 :class="{activeGuige:item.id==itemDefaultTk.id}" v-if="item.isShow==1"
 							  v-for="(item,index) in detail.packageItems">{{item.title}}</view>
 			
 		 </scroll-view>
@@ -263,7 +263,8 @@
 				tkShow:false,
 				keyongShow:false,
 				showSetting:'',
-				 iStatusBarHeight:'',
+				iStatusBarHeight:'',
+				itemDefaultTk:'',
 			}
 		},
 		onLoad(opt) {
@@ -319,15 +320,20 @@
 			goodsGuige(item){
 				this.itemDefault=item
 				this.itemDefault.mainImgUrl=this.detail.openMaintainImgUrls[0]
+				this.itemDefaultTk=this.itemDefault
+			},
+			goodsGuige2(item){
+				this.itemDefaultTk=item
+				this.itemDefaultTk.mainImgUrl=this.detail.openMaintainImgUrls[0]
 			},
 			goSubmit(){
-				this.itemDefault.goodsnum=this.goodsnum
-				this.itemDefault.goodsname=this.detail.title
-				this.itemDefault.itemId=this.detail.id
-				this.itemDefault.mainImgUrl=this.detail.openMaintainImgUrls[0]
+				this.itemDefaultTk.goodsnum=this.goodsnum
+				this.itemDefaultTk.goodsname=this.detail.title
+				this.itemDefaultTk.itemId=this.detail.id
+				this.itemDefaultTk.mainImgUrl=this.detail.openMaintainImgUrls[0]
 				uni.setStorage({
 					key: 'itemDefault',
-					data: this.itemDefault,
+					data: this.itemDefaultTk,
 					 success: function () {
 					    uni.navigateTo({
 					    	url:'maintainSubmit'
@@ -345,7 +351,16 @@
 				this.keyongShow=true;
 			},
 			submitFn(){
-				if(this.itemDefault){
+				if(!this.carInfo){
+					uni.showToast({
+						 title: '请先选择车辆',
+						 icon:'none',
+						 duration: 3000
+					});
+					return false
+				}
+				if(this.itemDefaultTk){
+					//this.itemDefaultTk=this.itemDefault
 					this.tkShow=true
 				}else{
 					uni.showToast({
@@ -388,6 +403,9 @@
 						if(item.isDefault==1){
 							 this.itemDefault=item
 							 this.itemDefault.mainImgUrl=this.detail.openMaintainImgUrls[0]
+							 if(item.isShow==1){
+								 this.itemDefaultTk=item
+							 }
 						}
 						if(item.content){
 							item.content=item.content.replace(/\<img/gi, '<img style="max-width:100% !important;height:auto" ');

pages/subPack/maintainSubmit.vue

@@ -76,7 +76,7 @@
 				sheetDetail:[],
 				userInfo:'',
 				carInfo:'',
-				
+				customerInfo:'',
 			}
 		},
 		onLoad(opt) {
@@ -97,6 +97,7 @@
 			this.carInfo=this.$store.state.carInfo;
 			
 			this.userInfo=uni.getStorageSync("wxOpenData");
+			this.customerInfo=uni.getStorageSync("customerInfo")
 			console.log(this.userInfo)
 		},
 		onShow() {
@@ -105,11 +106,22 @@
 		methods: {
 			
 			submitFn(){
+				if(this.userInfo.loginInfo){
+					var customerName=this.userInfo.loginInfo.customerInfo.customerName
+					var mobilePhone=this.userInfo.loginInfo.customerInfo.mobilePhone
+					var shopID=this.userInfo.loginInfo.customerInfo.shopID
+				}else{
+					var customerName=this.customerInfo.customerName
+					var mobilePhone=this.customerInfo.mobilePhone
+					var shopID=this.customerInfo.shopID
+				}
+				
+				
 				var params={
 					sheetType:7,
 					sheetContent:this.itemDefault.goodsname,
-					customerName:this.userInfo.loginInfo.customerInfo.customerName,
-					mobilePhone:this.userInfo.loginInfo.customerInfo.mobilePhone,
+					customerName:customerName,
+					mobilePhone:mobilePhone,
 					plateNumber:this.carInfo.plateNumber,
 					carModel:this.carInfo.carModel,
 					totalMoney:this.totalPrice,
@@ -117,7 +129,7 @@
 					groupType:0,
 					comment:'',
 					shareId:'',
-					shopId:this.userInfo.loginInfo.customerInfo.shopID,
+					shopId:shopID,
 				}
 				uni.showLoading({
 					title: '加载中'

pages/user/user.vue

@@ -247,7 +247,7 @@
 					    <view class="KlineTxt">车况报告</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('../index/rescue')">
-						<image class="klineIcon"  style="width: 58rpx;height: 49rpx;padding-bottom: 4rpx;"
+						<image class="klineIcon"  style="width: 58rpx;height: 49rpx;padding-bottom: 2rpx;"
 						src="../../static/img2/24.png" mode=""></image>
 					    <view class="KlineTxt">24小时救援</view>
 					</view>
@@ -512,6 +512,7 @@
 
 		<!-- </view> -->
 		<view class="rowBoxBg">
+		<!-- 	<view class="exit2" @click="clearStorage">清除缓存</view> -->
 			<view class="exit2" @click="exit">切换账号</view>
 			<view class="exit" @click="exit2">退出登录</view>
 		</view>
@@ -525,8 +526,8 @@
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 				<view class="authorizMs">未注册的手机号登录后将自动创会员账号,如果您不同意授权获取手机号，会影响您使用我们的产品和服务。</view>
 				<view class="sqLine">
+					 <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
 					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
-				    <view class="sqRefuse" @click="authorizShowHide">拒绝</view>
 				</view>
 			</view>
 			<!-- <view style="text-align: center;padding-top: 56rpx;">
@@ -633,6 +634,7 @@
 			console.log(this.userInfo)
 			if (this.userInfo) {
 				this.queryMyDetail();
+				this.getCarList();
 			} else {
 				//console.log("授权")
 				this.exitNum=this.$store.state.exitNum;
@@ -664,6 +666,42 @@
 
 		},
 		methods: {
+			clearStorage(){
+				uni.clearStorageSync();
+				uni.showToast({
+					title: '清除缓存完成',
+					icon: 'none',
+					duration: 3000
+				});
+				uni.setStorage({
+					key: 'themeColor',
+					data: this.themeColor,
+					 success: function () {
+					    
+					 }
+				}); 
+			},
+			getCarList(){
+				this.$http('opencarOwnerHome/queryDefaultCarInfo', {
+				  
+				 },'GET').then(res => {
+						if(res.code==401){
+							this.carInfo=''
+							this.$store.commit('mutationscarInfo', '')
+						}else{
+							if(res.data&&res.data!='null'){
+							
+								this.carInfo = res.data
+							}else{
+								
+								this.carInfo=''
+							}
+							 this.$store.commit('mutationscarInfo', this.carInfo)
+										
+						}
+					 				
+				 })
+			},
 			addCar(){
 				uni.navigateTo({
 					url:'../subPack/addCarCK'
@@ -987,6 +1025,7 @@
 		onPullDownRefresh() {
 
 			this.queryMyDetail()
+			this.getCarList()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
@@ -1284,7 +1323,8 @@ padding-right: 10rpx;
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #666666;
-		padding: 40rpx;
+		padding-top: 10rpx;
+		padding-bottom: 30rpx;
 		text-align: center;
 		
 	}
@@ -1321,7 +1361,7 @@ padding-right: 10rpx;
 		min-height: 100vh;
 
 		background: #F4F5F7;
-		padding-bottom: 60rpx;
+		/* padding-bottom: 60rpx; */
 	}
 
 	.top {
@@ -1714,8 +1754,7 @@ padding-right: 10rpx;
 		text-align: center;
 		margin-left: 56rpx;
 	}
-
-	.authorizContbutton{
+.authorizContbutton{
 		width: 210rpx;
 		height: 66rpx;
 		background: #EC0F0A;
@@ -1724,8 +1763,7 @@ padding-right: 10rpx;
 		text-align: center;
 		font-size:30rpx;
 		color: #FFFFFF;
-		
-		margin-left:40rpx;
+		margin-right: 40rpx;
 	}
 	.sqRefuse{
 		width: 210rpx;
@@ -1735,7 +1773,7 @@ padding-right: 10rpx;
 		border-radius: 36rpx;
 		text-align: center;
 		font-size:30rpx;
-		margin-right:40rpx;
+		margin-left:40rpx;
 		color: #999999;
 	}
 	.sqLine{

static/img2/tab.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="55px" height="19px" viewBox="0 0 55 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>路径 10</title>
-    <g id="首页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="home-有车有牌" transform="translate(-37.000000, -1273.000000)" fill="#FCD903" fill-rule="nonzero">
-            <polygon id="路径-10" points="37.8190408 1273.70688 64.7530563 1291.40192 91.6870718 1273.70688 64.6329033 1279.60293"></polygon>
-        </g>
-    </g>
-</svg>