Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

* 'master' of http://47.98.226.240:3000/twt/wxThird:
  样式修改
  样式修改

components/timeSelect/timeSelect.vue

@@ -104,23 +104,29 @@ export default {
 	.timeBOx{
 		width: 750rpx;
 		height: 55vh;
-		background: #fff;
+		
 		position: fixed;
 		bottom: 0;
 		left: 0;
 	}
 	.time-select-popup .time-select-popup-body .time-select-popup-body-time .time-select-popup-body-time-list .time-select-popup-body-time-ltem .time-select-popup-body-time-ltem-body.select{
 		color: #FF7D30; 
-		 border: 2px solid #FF7D30;
+	
 	}
 	.time-select-popup-header {
 	  position: relative;
-	  text-align: center;
+	  border-bottom: 1px solid #EEEEEE;
 	  padding-top: 10rpx;
-	  height: 60rpx;
-	  line-height: 60rpx;
+	  height: 90rpx;
+	  line-height: 90rpx;
+	  border-radius: 24rpx 24rpx 0px 0px;
+	  overflow: hidden;
+	  background: #fff;
 	  .h4 {
 	    font-size: 32rpx;
+		color: #333333;
+		font-weight: 500;
+		padding-left: 24rpx;
 	  }
 	
 	  .cancle-text {
@@ -134,6 +140,7 @@ export default {
 	}
 	.time-select-popup-body{
 		display: flex;
+		background: #fff;
 	}
 	.time-select-popup-body-left-item{
 	  width: 172rpx;
@@ -177,7 +184,7 @@ export default {
 	    flex-wrap: wrap;
 	    align-items:baseline;
 	    background-color: rgb(255, 255, 255);
-	    height:calc(50vh - 100rpx);
+	    height:calc(50vh - 120rpx);
 		    overflow-y: auto;
 	    .time-select-popup-body-time-ltem{
 	      width: 33.3% ;
@@ -188,7 +195,7 @@ export default {
 	      .time-select-popup-body-time-ltem-body{
 	        padding-top: 12px;
 	        color: rgb(153, 153, 153);
-	        border-radius: 5px;
+	        border-radius: 10rpx;
 	        height: 80rpx;
 	        border: 2rpx solid #DDDDDD;
 	      }

pages.json

@@ -212,7 +212,23 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+		    "path" : "pages/index/rescue",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "紧急救援"
+		    }
+		    
+		},
+		{
+		    "path" : "pages/index/maintain",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "保养"
+		    }
+		    
+		}
     ],
 	"tabBar": {
 		"color": "#8a8a8a",

pages/index/confirmYuyue.vue

@@ -9,7 +9,7 @@
 			  <view class="kklineLeft">
 			  	<span class="stars">*</span> <span>预约门店</span>
 			  </view>
-			  <view class="kklineRight">连锁一号</view>
+			  <view class="kklineRight">{{yyshopInfo.shopName}}</view>
 		  </view>
 		  <view class="kkline">
 			  <view class="kklineLeft">
@@ -44,7 +44,7 @@
 		<view class="contkk" style="margin-top: 20rpx;">
 			<view class="bzline">
 				<view class="beiz">备注</view>
-				<input type="text" v-model="comment" placeholder="请输入备注（选填）" class="beizInput">
+				<input type="text" v-model="comment" placeholder="请输入备注（选填）" class="beizInput" placeholder-style="color:#cccccc;">
 			</view>
 			
 		</view>
@@ -79,6 +79,7 @@
 				billDate:'',
 				yuyueData:'',
 				carInfo:'',
+				yyshopInfo:'',
 			}
 		},
 		onLoad() {
@@ -86,6 +87,7 @@
 			this.yuyueData=this.$store.state.yuyueData;
 			this.carInfo=this.$store.state.carInfo
 			this.userInfo = uni.getStorageSync("userInfo");
+			this.yyshopInfo=uni.getStorageSync("yyshopInfo")
 			//this.getOrderTimes()
 		},
 		
@@ -104,9 +106,10 @@
 				  comment: this.comment,
 				  carID: this.carInfo.id,
 				  orderItem: this.yuyueData.map(item => item.ID).join(),
-				  shopId: this.userInfo.shopId,
+				  shopId: this.yyshopInfo.id,
 				  unionId: this.userInfo.unionId
 				 },'POST').then(res => {
+					    var id=res.data
 						if(res.code==0){
 							uni.showModal({
 							    title: '提示',
@@ -121,6 +124,9 @@
 									   })
 							        } else if (res.cancel) {
 							           // console.log('用户点击取消');
+									   uni.reLaunch({
+										   url:'../user/bespeakDetail?id='+id
+									   })
 							        }
 							    }
 							});
@@ -154,7 +160,7 @@
 .yuyuCheckTis{
 	color: #C8841C;
 	line-height: 37rpx;
-	font-size: 26rpx;
+	font-size: 28rpx;
 	background: #FFF7EB;
 	padding: 18rpx 24rpx;
 	font-weight: 400;
@@ -186,7 +192,7 @@
 	color: #FF2400;
 }
 .kklineRight{
-	color: #999999;
+	color: #3c3c3c;
 	font-size: 28rpx;
 	display: flex;
 	justify-content: space-between;

pages/index/index.vue

@@ -21,7 +21,6 @@
 		  </view>
 		</view>
 		<view class="shoptopbox"  v-if="carInfo">
-		
 		  <view class="carinfoBox" >
 		      <view class="carinfoBoxTop">
 		        <img :src="carInfo.brandLogo" alt="" class="carLogo" v-if="carInfo.brandLogo">
@@ -59,7 +58,7 @@
 		</view>
 		
 		<!-- 服务顾问 -->
-		<view class="adviser" v-if="homeCardList.openMUsers" @click="goRoter">
+		<view class="adviser" v-if="homeCardList.openMUsers.showType==1" @click="goMUsers">
 			<view class="adviserLeft">
 				<img src="../../static/timg/pic_def_ava@2x.png" alt="" class="advisertx">
 				<view class="adviserNema">{{homeCardList.openMUsers.operatorName}}</view>
@@ -70,7 +69,7 @@
 		<!-- 中间功能应用模块 -->
 		<view class="modular" v-if="homeCardList.application.length>0">
 					<view class="swiper-item">
-						<view class="itemLine"  @click="goRoter('onlineBooking')"  v-for="(item,index) in homeCardList.application"> 
+						<view class="itemLine"  @click="goRoter(item)"  v-for="(item,index) in homeCardList.application"> 
 							<view><img :src="item.icon" alt="" class="itemImg"></view>
 							<view class="Menusline">{{item.name}}</view>
 						</view>	
@@ -81,11 +80,30 @@
 			<swiper class="swiper2" circular  :autoplay="false" :interval="interval"
 							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
 				<swiper-item v-for="(item,index) in homeCardList.ad1">
-					<view class="swiper-item2" @click="goRoter('paint')">
+					<view class="swiper-item2" @click="goRoter(item)">
+						<image class="swiper-item2Img" :src="item.icon" mode=""></image>
+					</view>	
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="advertisement" v-if="homeCardList.ad2.length>0">
+			<swiper class="swiper2" circular  :autoplay="false" :interval="interval"
+							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+				<swiper-item v-for="(item,index) in homeCardList.ad2">
+					<view class="swiper-item2" @click="goRoter(item)">
+						<image class="swiper-item2Img" :src="item.icon" mode=""></image>
+					</view>	
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="advertisement" v-if="homeCardList.ad3.length>0">
+			<swiper class="swiper2" circular  :autoplay="false" :interval="interval"
+							:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+				<swiper-item v-for="(item,index) in homeCardList.ad3">
+					<view class="swiper-item2" @click="goRoter(item)">
 						<image class="swiper-item2Img" :src="item.icon" mode=""></image>
 					</view>	
 				</swiper-item>
-				
 			</swiper>
 		</view>
 		<!-- 热门活动 -->
@@ -246,13 +264,98 @@
 					url:'../user/addCar/cailist'
 				})
 			},
-			goRoter(url){
+			goMUsers(){
 				if(!this.userInfo){
 					this.authorizShow=true;
 				}else{
-					uni.navigateTo({
-						url:url
-					})
+					
+				}
+			},
+			goRoter(item){
+				console.log(item)
+				if(!this.userInfo){
+					this.authorizShow=true;
+				}else{
+					if(item.bizType==0){
+						
+					}else if(item.bizType==1){ //紧急救援
+						uni.navigateTo({
+							url:'rescue'
+						})
+					}else if(item.bizType==2){ //钣金喷漆
+						uni.navigateTo({
+							url:'paint'
+						})
+					}else if(item.bizType==3){ //保养
+						uni.navigateTo({
+							url:'maintain'
+						})
+					}else if(item.bizType==4){ //在线预约
+						uni.navigateTo({
+							url:'onlineBooking'
+						})
+					}else if(item.bizType==5){ //导航
+						uni.openLocation({
+							latitude:'36.671541' ,
+							longitude:'117.138777',
+							name: '',
+							address: '',
+							success: function() {
+								console.log('success');
+							},
+							fail(err) {
+								console.log(err)
+							}
+						});
+					}else if(item.bizType==6){ //联系本店
+						uni.makePhoneCall({
+							phoneNumber: 10086
+						});
+					}else if(item.bizType==7){ //7门店列表
+						uni.navigateTo({
+							url:'shopList'
+						})
+					}else if(item.bizType==8){ //我的会员卡
+						uni.navigateTo({
+							url:'vipCard'
+						})
+					}else if(item.bizType==9){ //我的优惠券
+						uni.navigateTo({
+							url:'discountCard'
+						})
+					}else if(item.bizType==10){ //我的订单
+						uni.navigateTo({
+							url:'../user/myOrder/myOrder'
+						})
+					}else if(item.bizType==11){ //我的预约
+						uni.navigateTo({
+							url:'../user/myBespeak'
+						})
+					}else if(item.bizType==12){ //历史消费
+						uni.navigateTo({
+							url:'../user/historySpend'
+						})
+					}else if(item.bizType==12){ //历史消费
+						uni.navigateTo({
+							url:'../user/historySpend'
+						})
+					}else if(item.bizType==13){ //车检报告
+						uni.navigateTo({
+							url:'../user/checkReport'
+						})
+					}else if(item.bizType==14){ //指定商品分类
+						uni.navigateTo({
+							url:'../shop/shop'
+						})
+					}else if(item.bizType==15){ //商品详情
+						uni.navigateTo({
+							url:'../shop/goodsDetail?id=CD2D70DC-706C-4441-9864-33BD19457CAE'
+						})
+					}
+					
+					// uni.navigateTo({
+					// 	url:url
+					// })
 				}
 				
 			},
@@ -466,7 +569,7 @@
 	}
 	.topBox{
 		width: 750rpx;
-		height: 200rpx;
+		height: 150rpx;
 		background: #D53533;
 	}
 	.yuanhu{
@@ -588,7 +691,7 @@
 			padding-left: 24rpx;
 	}
 	.shoptopbox{
-		margin-top: -200rpx;
+		margin-top: -170rpx;
 	}
 	.shoptopbox2{
 		margin-top: -170rpx;

pages/index/onlineBooking.vue

@@ -22,7 +22,7 @@
 				</swiper>
 			</view>
 			<!-- 门店详情 -->
-			<view class="newshopNames">
+			<view class="newshopNames" v-if="shopInfo">
 			  <view class="newshopDstop">
 			    <view class="newshopDname">{{shopInfo.shopName}}</view>
 			    <view class="newshopDtime">
@@ -36,9 +36,9 @@
 			    <view class="newshopDaleft">
 			      <view class="newshopDaleftTop">
 			        <img src="../../static/timg/icon_coordinate@2x.png" alt="" class="shopaddressIcon">
-			        <span class="shopDdistance" v-if="Number(shopInfo.distance)>1">距离{{shopInfo.distance}}km</span>
+			       <!-- <span class="shopDdistance" v-if="Number(shopInfo.distance)>1">距离{{shopInfo.distance}}km</span>
 			        <span class="shopDdistance" v-else-if="Number(shopInfo.distance)">距离{{shopInfo.distance*1000}}m</span>
-			        <span class="shopDdistance" v-else>距离--km</span>
+			        <span class="shopDdistance" v-else>距离--km</span> -->
 			      </view>
 			      <view class="newshopDadressName">{{shopInfo.address}}</view>
 			    </view>
@@ -64,7 +64,7 @@
 	  	</view>
 		<view class="yuyueRight">
 			<view class="yuyueRightTitle">{{rightTitle}}</view>
-			<view v-for="(item,index) in rightData" @click="checkItem(item)">
+			<view v-for="(item,index) in rightData" @click="checkItem(item)" style="padding-top: 10rpx;padding-left: 24rpx;padding-right: 24rpx;">
 				<view class="yrTop">
 					 <view class="ItemName">{{item.ItemName}}</view>
 					 <image src="../../static/timg/ickno.png" v-if="selectedItems.findIndex(i=>i.ID===item.ID)==-1" mode="" class="yrTopImg"></image>
@@ -97,7 +97,7 @@
 	    <view href="javascript:;" class=" newbottom-container-button" @click="yuyue">立即预约</view>
 	  </view>
 	  
-	  <view class="yydetailBox" v-show="yydetailShow" @click="yydetailShow=false">
+	  <view class="yydetailBox" v-if="yydetailShow" @click="yydetailShow=false">
 	    <view class="yyDetailTop" @click.stop="">
 	      <view class="yyDetailTopleft">清单</view>
 	      <view class="yyDetailTopRight">
@@ -229,10 +229,32 @@
 			  }
 			},
 			goLocation(){
-				
+				var that = this;
+				if (!that.shopInfo.lat || !that.shopInfo.lng) {
+					uni.showToast({
+						title: '该店铺未设置定位',
+						icon: 'none',
+						duration: 3000
+					});
+				} else {
+					uni.openLocation({
+						latitude: Number(that.shopInfo.lat),
+						longitude: Number(that.shopInfo.lng),
+						name: that.shopInfo.shopName,
+						address: that.shopInfo.provinceName+that.shopInfo.cityName+that.shopInfo.areaName+that.shopInfo.address,
+						success: function() {
+							console.log('success');
+						},
+						fail(err) {
+							console.log(err)
+						}
+					});
+				}
 			},
 			phones(){
-				
+				uni.makePhoneCall({
+					phoneNumber: this.shopInfo.contactorPhone
+				});
 			},
 			listItemWxInfo(item,index){
 				console.log(item)
@@ -321,9 +343,9 @@
 	line-height: 30rpx;
 	height: 30rpx;
 	border-radius: 4rpx;
-	border: 1px solid #FF7D30;
-	color: #FF7D30;
-	font-size: 22rpx;
+	border: 1px solid #F19D01;
+	color: #f19D01;
+	font-size: 24rpx;
 	padding: 0 8rpx;
 	margin-right: 16rpx;
 	margin-top: 10rpx;
@@ -359,7 +381,7 @@
 }
 .newshopDrlineTxt{
 	color: #999999;
-	font-size: 22rpx;
+	font-size: 24rpx;
 	text-align: center;
 	padding-top: 7rpx;
 	font-weight: 400;
@@ -394,10 +416,10 @@
 	
 }
 .yuyueRight{
-	width: 548rpx;
+	width: 572rpx;
 	background: #FFFFFF;
-	padding-left: 24rpx;
-	padding-right: 24rpx;
+
+	
 }
 .yuyueleftLine{
 	font-size: 26rpx;
@@ -411,7 +433,8 @@
 }
 .yuyueRightTitle{
 	color: #999999;font-size: 26rpx;
-	padding: 30rpx 0;
+	padding: 30rpx 0;background: #F9F9F9;
+		padding-left: 24rpx;
 }
 .yrTop{
 	display: flex;
@@ -517,7 +540,7 @@
 	background: #F0F0F0;
 	position: absolute;
 	left: 0;
-	bottom: 120rpx;
+	bottom: 119rpx;
 }
 .yyDetailTop{
 	width: 750rpx;
@@ -535,6 +558,7 @@
 	font-size: 30rpx;
 	line-height: 90rpx;
 	padding-left: 24rpx;
+	font-weight: 500;
 }
 .yyDetailTopRight{
 	display: flex;
@@ -548,7 +572,7 @@
 .yydetalqk{
 	width: 86rpx;
 	height: 41rpx;
-	background: #EEEEEE;
+	background: #F4F5F7;
 	border-radius: 21rpx;
 	text-align: center;
 	line-height: 41rpx;
@@ -561,7 +585,7 @@
 	width: 702rpx;
 	background: #FFFFFF;
 	border-radius: 10rpx;
-	border: 1px solid #DDDDDD;
+	
 	margin-top: 20rpx;
 	margin-left: 24rpx;
 	padding: 24rpx 0px;

pages/shop/shop.vue

@@ -48,7 +48,8 @@
 	   		<view class="goodsBox">
 	   			<view class="hotGoodsLine" v-for="(item,index) in list" @click="goDetail(item)">
 	   				<view>
-	   					<image :src="item.url" mode="" @error="defImg()" class="hotGoodsLineImg"></image>
+	   					<image :src="item.url" v-if="item.url" mode="" @error="defImg()" class="hotGoodsLineImg"></image>
+						<image v-else src="../../static/timg/noimg.png" mode="" class="hotGoodsLineImg"></image>
 	   				</view>
 	   				<view class="hotGoodsLineRIght">
 	   					<view class="goodsName">{{item.name}}</view>

pages/user/addCar/addCar.vue

@@ -311,7 +311,7 @@
 								    	uni.navigateBack({
 								    
 								    	})
-								    }, 3000);
+								    }, 1000);
 								 
 								 }
 							}); 

pages/user/addCar/cailist.vue

@@ -15,8 +15,8 @@
 					</view>
 				</view>
 				<view class="lineBottom">
-					<view class="lineDel" @click.stop="maintain(item.id)">编辑</view>
-					<view class="lineDel" @click.stop="delCar(item.id)">保养信息</view>
+					<view class="lineDel" @click.stop="editCar(item.id)">编辑</view>
+					<view class="lineDel" @click.stop="maintain(item.id)">保养信息</view>
 					<!-- <view class="Default" v-show="item.isDefault!=1" @click.stop="defaultCar(item)">设为默认</view>
 					<view class="DefaultYES" v-show="item.isDefault==1">已设为默认</view> -->
 				</view>

pages/user/user.vue

@@ -253,7 +253,7 @@
 			},
 			call() {
 				uni.makePhoneCall({
-					phoneNumber: this.userInfo.mobilePhone
+					phoneNumber: this.numList.shopInfo.contactorPhone
 				});
 			},
 			goorder(num) {