Merge branch 'dev' into ats2

pages/index/index.vue

@@ -513,7 +513,7 @@
 				})
 			},
 			changeCar(){
-			     /* uni.scanCode({
+			    /* uni.scanCode({
 				 	success: function (res) {
 				 		console.log('条码类型：' + res.scanType);
 						console.log( res);

pages/index/onlineBooking.vue

@@ -7,7 +7,7 @@
 					v-if="shopInfo.imgs">
 					<swiper-item v-for="(item,index) in shopInfo.imgs.split(',')" v-if="item">
 						<view class="swiper-item">
-							<img mode="aspectFit" :src="item" alt="">
+							<img mode="aspectFill" :src="item" alt="">
 						</view>
 					</swiper-item>
 

pages/subPack/chooseCity.vue

@@ -242,7 +242,7 @@
 	
 	.zhimubox{
 		position: fixed;
-		right: 30rpx;
+		right: 25rpx;
 		top: 200rpx;
 		height: 80vh;
 		overflow-y: scroll;
@@ -362,7 +362,7 @@
 		width: 4%;
 		margin: 2rpx 0;
 		text-align: center;
-		padding: 10rpx 10rpx 10rpx 15rpx;
+		padding: 10rpx 20rpx 10rpx 20rpx;
 	}
 
 	.select {