样式修改

pages/activity/jkDetail.vue

@@ -767,10 +767,12 @@
 							 icon:'none',
 							 duration: 2000
 						 });
-						 
-						  	uni.redirectTo({
+						 uni.navigateTo({
+						 	url:'../subPack/paySuccess?id=' + that.orderData.id +"&SheetType=" + that.orderData.sheetType+'&sx=1'+"&orderType=jike"
+						 })
+						  	/* uni.redirectTo({
 						  		url: "../user/myOrder/activityOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType+'&sx=1'
-						  	})
+						  	}) */
 						  
 						
 				    },

pages/index/onlineBooking.vue

@@ -14,13 +14,17 @@
 				</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">
+					<swiper-item v-for="(item,index) in shopInfo.lbShopImgs2.split(',')" v-if="item">
 						<view class="swiper-item">
 							<img mode="aspectFill" :src="item" alt="">
 						</view>
 					</swiper-item>
 				
 				</swiper>
+				<view class="swiper-item" v-else>
+					<img mode="aspectFill" src="../../static/timg/noimg.png" alt="">
+				</view>
+				
 			</view>
 			<!-- 门店详情 -->
 			<view class="newshopNames" v-if="shopInfo">

pages/index/paintShopList.vue

@@ -13,23 +13,30 @@
         </view>
 		<view style="height: 90rpx;"></view>
 		<view class="shopline" v-for="(item,index) in queryShopList" @click="goDetail(item)">
+			<view class="newdistance" v-if="item.distance&&item.distance!= '0.00'">
+				 <image src="../../static/img2/dh.png" mode="" class="dhImg"></image>
+				<view style="padding-top: 6rpx;"><span >{{item.distance}}km</span></view>
+			</view>
 			<view class="shoplineLeft">
 				<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
+				<image :src="item.photoPath2" 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">
-				<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 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 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.provinceName}}{{item.cityName}}{{item.areaName}}{{item.address}}</span>
-					<span v-if="item.distance&&item.distance!= '0.00'">{{item.distance}}km</span>
+					<!-- <span v-if="item.distance&&item.distance!= '0.00'">{{item.distance}}km</span> -->
 				</view>
 			</view>
 
@@ -240,7 +247,7 @@
 		padding: 20rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
-
+        position: relative;
 		display: flex;
 	}
 
@@ -533,4 +540,13 @@
 	.areaCkIcon{
 		width: 38rpx;height: 28rpx;
 	}
+	.dhImg{
+		width: 35rpx;height: 35rpx;border-radius: 6rpx;
+	}
+	.newdistance{
+		position: absolute;top: 22rpx;right: 18rpx;
+		text-align: center;
+		font-size: 22rpx;
+		color: #666666;
+	}
 </style>

pages/index/paintSure.vue

@@ -279,9 +279,10 @@
 								duration: 2000
 							});
 							if (this.orderData.sheetType==5){
-								uni.redirectTo({
+								 uni.redirectTo({
 									url: "../user/myOrder/paintOrderDetail?id=" +this.orderData.id+'&sx=1'
-								})
+								}) 
+								
 							}
 						}
 						
@@ -376,8 +377,11 @@
 									"&SheetType=" + that.orderData.sheetType
 							})
 						}else if (that.orderData.sheetType==5){
-							uni.navigateTo({
+							/* uni.navigateTo({
 								url: "../user/myOrder/paintOrderDetail?id=" +that.orderData.id
+							}) */
+							uni.navigateTo({
+								url:'../subPack/paySuccess?id=' + that.orderData.id +"&orderType=paint"
 							})
 						}
 					}

pages/index/shopList.vue

@@ -523,7 +523,7 @@
 				// })
 				if (this.userInfo) {
 					uni.navigateTo({
-						url:'onlineBooking?naShopId='+item.shopId+'naUnionId='+item.unionId
+						url:'onlineBooking?naShopId='+item.shopId+'&naUnionId='+item.unionId
 					})
 				} else {
 					this.authorizShow = true;

pages/shop/ckshopList.vue

@@ -13,24 +13,31 @@
         </view>
 		<view style="height: 90rpx;"></view>
 		<view class="shopline" v-for="(item,index) in queryShopList" @click="goDetail(item)">
+			<view class="newdistance" v-if="item.distance&&item.distance!= '0.00'">
+				 <image src="../../static/img2/dh.png" mode="" class="dhImg"></image>
+				<view style="padding-top: 6rpx;"><span >{{item.distance}}km</span></view>
+			</view>
 			<view class="shoplineLeft">
 				<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">
-				<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 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 class="shopTime"><span v-if="item.startTime">{{item.startTime}}</span> - <span
+				
+				<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.provinceName}}{{item.cityName}}{{item.areaName}}{{item.address}}</span>
-					<span v-if="item.distance&&item.distance!= '0.00'">{{item.distance}}km</span>
+				<!-- 	<span v-if="item.distance&&item.distance!= '0.00'">{{item.distance}}km</span> -->
 				</view>
 			</view>
 
@@ -313,7 +320,7 @@
 		padding: 20rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
-
+        position: relative;
 		display: flex;
 	}
 
@@ -585,4 +592,13 @@
 	.areaCkIcon{
 		width: 38rpx;height: 28rpx;
 	}
+	.dhImg{
+		width: 35rpx;height: 35rpx;border-radius: 6rpx;
+	}
+	.newdistance{
+		position: absolute;top: 22rpx;right: 18rpx;
+		text-align: center;
+		font-size: 22rpx;
+		color: #666666;
+	}
 </style>

pages/shop/confirm.vue

@@ -37,7 +37,7 @@
 						<image src="../../static/timg/icon_arrow_right.png" mode="" class="contlineRightJt"></image>
 					</view>
 					<view class="carModelCK">
-						{{carInfo.carModel?carInfo.carModel:'选择车型'}}
+						{{carInfo.carModel?carInfo.carModel:'暂无'}}
 					</view>
 					
 				</view>
@@ -271,9 +271,12 @@
 							 duration: 2000
 						 });
 						  if((that.orderData.sheetType==1)||(that.orderData.sheetType==2)||(that.orderData.sheetType==3)){
-						  	uni.redirectTo({
+						  	/* uni.redirectTo({
 						  		url: "../user/myOrder/mallOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType+'&sx=1'
-						  	})
+						  	}) */
+							uni.navigateTo({
+								url:'../subPack/paySuccess?id=' + that.orderData.id +"&SheetType=" + that.orderData.sheetType+'&sx=1'+"&orderType=shop"
+							})
 						  }
 						
 				    },
@@ -598,5 +601,9 @@
 	font-weight: 400;
 	font-size: 24rpx;
 	color: #666666;
+	width: 550rpx;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 </style>

pages/shop/goodsDetail.vue

@@ -12,19 +12,35 @@
 		</swiper>
 	</view>
 	<view class="shopCont">
+		<view style="display: flex;padding-left: 24rpx;" v-if="info.saleLabel">
+			<view  class="biaoqian">{{info.saleLabel}}</view>
+		</view>
+		
 		<view class="shopCtop">
 			<view class="goodsPrice">
-				<view class="goodsPrice1" v-if="info.saleLabel">{{info.saleLabel}}</view>
+				<!-- <view class="goodsPrice1" >{{info.saleLabel}}</view> -->
 				<view class="goodsPrice2">￥</view>
 				<view class="goodsPrice3">{{info.salePrice?info.salePrice:info.scribingPrice}}
 				 <span v-if="info.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
 				</view>
 				<view class="goodsPrice4" v-if="info.showLabel&&info.scribingPrice&&info.showLabel.indexOf('1')!=-1">￥{{info.scribingPrice}}</view>
 			</view>
-			<view class="Sold" v-if="info.showLabel&&info.showLabel.indexOf('3')!=-1">已售 {{info.saleQty>0?info.saleQty:0}}</view>
+			<view class="shareBoxNew"  @click="sharewx">
+				<view class="shareTxt">分享</view>
+				<image class="shareIcon" src="../../static/timg/share.png" mode=""></image>
+			</view>
 		</view>
+		
 		<view class="goodsName">{{info.name}}</view>
-		<view class="goodsMd" v-if="info.sellingPoint">{{info.sellingPoint}}</view>
+		<view style="display: flex;justify-content: space-between;padding-right: 24rpx;">
+			<view class="goodsMd" v-if="info.sellingPoint">{{info.sellingPoint}}</view>
+			<view class="Sold" v-if="info.showLabel&&info.showLabel.indexOf('3')!=-1">已售 <span style="color: #FFC107;">{{info.saleQty>0?info.saleQty:0}}</span> </view>
+		</view>
+		<view class="goodsMSBox" v-if="info.detailSellingLabel">
+		
+			<view class="goodsMs" v-for="(item,index) in info.detailSellingLabel.split(',')">{{item}}</view>
+		</view>
+	
 	</view>
 	
 	<view class="modeBox">
@@ -42,7 +58,7 @@
 		</view>
 	</view>
 	<!-- 服务流程 -->
-	<view class="fuwuliucBox" v-if="info.showLabel&&info.showLabel.indexOf('4')!=-1">
+	<!-- <view class="fuwuliucBox" v-if="info.showLabel&&info.showLabel.indexOf('4')!=-1">
 		<view class="fwlcTitle">服务流程</view>
 		<view class="fwlcxian">
 			<view class="fwlcyuan"></view>
@@ -59,6 +75,13 @@
 			<view class="fwTxtline">在线支付</view>
 			<view class="fwTxtline">到店服务</view>
 		</view>
+	</view> -->
+	<!-- 购买流程-->
+	<view class="gmlc">
+		 <view class="gmlcTitle">购买流程</view>
+		 <view>
+			 <image class="gmlcImg" src="http://dmsphoto.66km.com.cn/thFiles/0BF3F1DB-8B56-488A-9BCB-663517985E9A.png" mode="widthFix"></image>
+		 </view>
 	</view>
 	<!-- 套餐内容 -->
 	<view class="mealBox" v-if="info.bizType==3">
@@ -120,10 +143,10 @@
 				<image src="../../static/timg/home.png" mode="" class="bottomImg"></image>
 				<view class="bottomTxt">首页</view>
 			</view>
-			 <view class="bottomImgBox" style="margin-left: 20rpx;" @click="sharewx">
+			<!-- <view class="bottomImgBox" style="margin-left: 20rpx;" @click="sharewx">
 				<image src="../../static/timg/share.png" mode="" class="bottomImg"></image>
 				<view class="bottomTxt">分享</view>
-			</view> 
+			</view> -->
 			<!-- <button open-type="share" class="bottomImgBox shareBtn" >
 				<image src="../../static/timg/share.png" mode="" class="bottomImg"></image>
 				<view class="bottomTxt">分享</view>
@@ -864,7 +887,7 @@
 .bottomImgBox{
 	text-align: center;
 	padding-top: 20rpx;
-	padding-left: 40rpx;
+	padding-left: 60rpx;
 }
 
 button::after{
@@ -893,7 +916,7 @@ button{
 	}
 
 .bottomBtn{
-	width: 450rpx;
+	width: 530rpx;
 	height: 74rpx;
 	background: #EC0F0A;
 	border-radius: 37rpx;
@@ -902,10 +925,10 @@ button{
 	color: #FFFFFF;
 	font-size: 30rpx;
 	margin-top: 23rpx;
-	margin-left: 70rpx;
+	margin-left: 80rpx;
 }
 .bottomBtn2{
-	width: 450rpx;
+	width: 530rpx;
 	height: 74rpx;
 	background: #DDDDDD;
 	border-radius: 37rpx;
@@ -914,7 +937,7 @@ button{
 	color: #FFFFFF;
 	font-size: 30rpx;
 	margin-top: 23rpx;
-	margin-left: 70rpx;
+	margin-left: 80rpx;
 }
 .goodsDetailTitle{
 	color: #333333;
@@ -1031,7 +1054,7 @@ button{
 }
 .shopCtop{
 	display: flex;
-	padding: 20rpx 24rpx;
+	padding: 20rpx 24rpx 10rpx 24rpx;
 	justify-content: space-between;
 	background: #FFFFFF;
 }
@@ -1070,7 +1093,7 @@ button{
 		font-weight: 400;
 		color: #999999;
 		font-size: 24rpx;
-		padding-top: 18rpx;
+		/* padding-top: 18rpx; */
 }
 .goodsName{
 	font-size: 30rpx;
@@ -1079,14 +1102,14 @@ button{
 	color: #333333;
 	padding: 20rpx 24rpx;
 	padding-top: 0;
-	padding-bottom: 16rpx;
+	padding-bottom: 10rpx;
 }
 .goodsMd{
 	font-weight: 400;
 	color: #999999;
 	font-size: 26rpx;
 	padding: 0 24rpx;
-	padding-bottom: 20rpx;
+	padding-bottom: 10rpx;
 }
 .shopCont{
 	background: #FFFFFF;
@@ -1099,6 +1122,7 @@ button{
 .modeline{
 	display: flex;
 	padding: 15rpx 24rpx;
+	justify-content: space-between;
 }
 .modelineLeft{
 	color: #999999;
@@ -1109,6 +1133,7 @@ button{
 	color: #333333;
 	font-size: 26rpx;
 	width: 550rpx;
+	text-align: right;
 }
 .expireNumber{
 	width: 110rpx;
@@ -1246,4 +1271,47 @@ button{
 		height: 48rpx;
 		line-height: 48rpx;width: 147rpx;
 	}
+	.gmlcImg{
+		width: 100%;
+	}
+	.gmlc{
+		background: #ffffff;margin-top: 20rpx;
+		padding: 30rpx 24rpx;
+	}
+	.gmlcTitle{
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #666E80;
+		line-height: 37rpx;
+		padding-bottom: 25rpx;
+	}
+.biaoqian{
+	background: #FF0035;
+	border-radius: 24rpx 24rpx 25rpx 0rpx;
+	padding: 4rpx 16rpx;
+	font-size: 22rpx;
+	color: #FFFFFF;
+	margin-top: 24rpx;
+	margin-bottom: -15rpx;
+}
+.shareIcon{
+	width: 33rpx;height: 33rpx;margin-left: 10rpx;
+}
+.shareBoxNew{
+	display: flex;font-size: 24rpx;
+color: #666666;padding-top: 6rpx;
+line-height: 33rpx;
+}
+.goodsMSBox{
+	display: flex;padding-left: 24rpx;
+	padding-bottom: 24rpx;
+}
+.goodsMs{
+	font-size: 18rpx;
+	color: #FF063A;
+	padding: 2rpx 8rpx;
+	border-radius: 6rpx;
+	border: 1rpx solid #FF063A;
+	margin-right: 16rpx;
+}
 </style>

pages/subPack/paySuccess.vue

@@ -25,9 +25,14 @@
 			return {
 				type:'',
 				orderType:'',
+				id:'',
+				SheetType:'',
+				sx:'',
+				opt:'',
 			}
 		},
 		onLoad(opt) {
+			this.opt=opt
 			this.type=opt.type
 			this.orderType=opt.orderType
 			/* if(this.type==2){
@@ -47,6 +52,19 @@
 					uni.navigateTo({
 						url:'../user/myOrder/myOrder'
 					})
+				}else if(this.orderType=='jike'){
+					 uni.redirectTo({
+						url: "../user/myOrder/activityOrderDetail?id=" + this.opt.id +"&SheetType=" +  this.opt.sheetType+'&sx=1'
+					}) 
+				}else if(this.orderType=='shop'){
+					 uni.redirectTo({
+						url: "../user/myOrder/mallOrderDetail?id=" + this.opt.id +"&SheetType=" +  this.opt.sheetType+'&sx=1'
+					}) 
+				}
+				else if(this.orderType=='paint'){
+					 uni.redirectTo({
+						url: "../user/myOrder/paintOrderDetail?id=" + this.opt.id +'&sx=1'
+					}) 
 				}
 			},
 			goBack(){