门店相关

pages/index/onlineBooking.vue

@@ -4,14 +4,23 @@
 		<view class="top">
 			<view class="shopTop">
 				<swiper class="swiper" circular :autoplay="true" :interval="interval" :duration="duration"
-					v-if="shopInfo.imgs">
-					<swiper-item v-for="(item,index) in shopInfo.imgs.split(',')" v-if="item">
+					v-if="shopInfo.lbShopImgs1">
+					<swiper-item v-for="(item,index) in shopInfo.lbShopImgs1.split(',')" v-if="item">
 						<view class="swiper-item">
 							<img mode="aspectFill" :src="item" alt="">
 						</view>
 					</swiper-item>
 
 				</swiper>
+				<swiper class="swiper" circular :autoplay="true" :interval="interval" :duration="duration"
+					v-else-if="shopInfo.lbShopImgs2">
+					<swiper-item v-for="(item,index) in shopInfo.lbShopImgs1.split(',')" v-if="item">
+						<view class="swiper-item">
+							<img mode="aspectFill" :src="item" alt="">
+						</view>
+					</swiper-item>
+				
+				</swiper>
 			</view>
 			<!-- 门店详情 -->
 			<view class="newshopNames" v-if="shopInfo">

pages/index/shopList.vue

@@ -41,6 +41,7 @@
 				
 			<view class="shoplineLeft">
 				<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
+				<image :src="item.photoPath" mode="" class="shopImg" v-else-if="item.photoPath2"></image>
 				<image src="../../static/timg/noimg.png" mode="" class="shopImg" v-else></image>
 			</view>
 			<view class="shopright">

pages/shop/ckshopList.vue

@@ -14,7 +14,8 @@
 		<view style="height: 90rpx;"></view>
 		<view class="shopline" v-for="(item,index) in queryShopList" @click="goDetail(item)">
 			<view class="shoplineLeft">
-				<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
+				<image :src="item.doorImg1" mode="" class="shopImg" v-if="item.doorImg1"></image>
+				<image :src="item.doorImg2" mode="" class="shopImg" v-else-if="item.doorImg2"></image>
 				<image src="../../static/timg/noimg.png" mode="" class="shopImg" v-else></image>
 			</view>
 			<view class="shopright">

pages/shop/confirm.vue

@@ -140,15 +140,26 @@
 		},
 		methods: {
 			submit(){
-				if(!this.carInfo.plateNumber){
-					uni.showToast({
-						title: '请选择车牌号',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
+				if(this.carInfo){
+					if(!this.carInfo.plateNumber){
+						uni.showToast({
+							title: '请选择车牌号',
+							icon: 'none',
+							duration: 3000
+						});
+						return false;
+					}
+					
 				}
 				if(!this.carInfo){
+					if(!this.carInfo.plateNumber){
+						uni.showToast({
+							title: '请选择车牌号',
+							icon: 'none',
+							duration: 3000
+						});
+						return false;
+					}
 					uni.showToast({
 						title: '请选择车辆',
 						icon: 'none',
@@ -157,6 +168,7 @@
 					return false;
 				}
 				
+				
 				var jsonArray = [];
 				var obj={
 					itemId:this.goodsInfo.id,

pages/shop/goodsDetail.vue

@@ -179,12 +179,36 @@
 				<view class="buySHop" @click="ckShop">
 					<view>服务门店</view>
 					<view class="buyShopRight" >
-						<view v-if="shopInfo.shopId">{{shopInfo.shopName}}</view>
+						<view v-if="shopInfo.shopId">切换门店</view><!-- {{shopInfo.shopName}} -->
 						<view v-else>请选择</view>
 						<image src="../../static/timg/icon_arrow_right.png" mode="" class="buyShopRightJt"></image>
 					</view>
 				</view>
+			
+			<view class="buyShopBox" v-if="shopInfo.shopId">
+				<view class="buyShop">
+							<view class="buyShopTop">
+								<view class="buyShopTleft">
+									<!-- <view class="shopbq">距离最近</view> -->
+									<view class="buyshopName">{{shopInfo.shopName}}</view>
+								</view>
+								<view class="buyShopTRgiht">
+								
+									<image src="/static/timg/icon_checked@2x.png" mode="" class="duihao"></image>
+								</view>
+							</view>
+							<view class="buyShopCont">
+								<image :src="shopInfo.doorImg1" v-if="shopInfo.doorImg1" mode="" class="buyShopContImg"></image>
+								<image :src="shopInfo.doorImg2" v-else-if="shopInfo.doorImg2" mode="" class="buyShopContImg"></image>
+								<image src="/static/timg/noimg.png" v-else class="buyShopContImg"></image>
+								<view class="buyShopContAdress">{{shopInfo.address}}</view>
+								<view class="buyShopJl" v-if="shopInfo.distance&&shopInfo.distance!= '0.00'">{{shopInfo.distance}}km</view>
+							</view>
+						</view>
 			</view>
+			<view v-else class="nobuyShopBox"></view>
+			</view>
+			
 			
 			<view class="buybtnBox">
 				<!-- 1上家 2下架 GoodsState -->
@@ -739,14 +763,14 @@
 	left: 0;
 	bottom: 0;
 	width: 750rpx;
-	height: 688rpx;
+	height: 850rpx;
 	background: #FFFFFF;
 	border-radius: 26rpx 26rpx 0px 0px;
 }
 .buyNumBox{
 	padding: 30rpx;
     padding-top: 10rpx;
-	padding-bottom: 70rpx;
+	/* padding-bottom: 70rpx; */
 }
 .buyContCh{
 	position: absolute;
@@ -1149,4 +1173,76 @@ button{
 		margin-top: 62rpx;
 		margin-left:71rpx;
 	}
+	
+	.buyShopBox{
+		/* padding: 0 24rpx; */
+		padding-top: 20rpx;
+	}
+	.nobuyShopBox{
+		height: 220rpx;
+	}
+	.duihao{
+		width: 28rpx;height: 28rpx;
+	}
+	.buyShopTRgiht{
+		    display: flex;
+		    align-items: center;
+	}
+	.buyShop{
+		background: #F9F9F9;
+		border-radius:6rpx;
+	}
+	.buyShopTop{
+		display: flex;justify-content: space-between;
+		padding: 16rpx 22rpx;
+		background: #F9EFF0;
+	}
+	.shopbq{
+		color: #FF063A;font-size: 22rpx;
+		border-radius: 6rpx;
+		border: 1rpx solid #FF063A;
+		padding: 0rpx 6rpx;
+		height: 30rpx;line-height: 30rpx;
+	    margin-top: 4rpx;
+	}
+	.buyShopTleft{
+		display: flex;
+	}
+	.buyshopName{
+		font-size: 26rpx;
+		color: #222222;
+		line-height: 37rpx;
+		padding-left: 8rpx;
+	}
+	.buyShopCont{
+		display: flex;
+		padding: 22rpx;
+	}
+	.buyShopContImg{
+		width: 102rpx;
+		height: 102rpx;
+		border-radius: 6rpx;
+	}
+	.buyShopContAdress{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #666E80;
+		line-height: 34rpx;
+		width: 440rpx;
+		padding-left: 12rpx;
+	}
+	.buyShopJl{
+		font-size: 22rpx;
+		color: #666E80;	line-height: 34rpx;
+		    width: 110rpx;
+		    text-align: right;
+	}
+	.buyNumlineActive{
+		border-radius: 25rpx;
+		border: 1rpx solid #FF0035;
+		color: #FF0035;
+		background: #ffffff;
+		height: 48rpx;
+		line-height: 48rpx;width: 147rpx;
+	}
 </style>