Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

pages/restaurant/components/recommed-hotel.vue

@@ -89,9 +89,11 @@
 		border-radius: 20rpx;
 		overflow: hidden;
 		margin-right: 30rpx;
+		box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
 	}
 	.hotel-list-item .img-box image{
 		width: 100%;
+		height: 100%;
 	}
 	.hotel-list-item .hotel-info{
 		width: 1px;

pages/ticketCoupons/components/recommed-hotel.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="hotel-list-item" v-for="(item,index) in scenicArr" :key="index" @click="goHotelDetail(item.ID)">
 			<view class="img-box">
-				<image :src="item.CoverImg" mode="aspectFill" style="height: 100%;"</image>
+				<image :src="item.CoverImg" mode="aspectFill"></image>
 			</view>
 			<view class="hotel-info">
 				<view class="hotel-name">{{item.Name}}</view>
@@ -93,6 +93,7 @@
 	}
 	.hotel-list-item .img-box image{
 		width: 100%;
+		height: 100%;
 	}
 	.hotel-list-item .hotel-info{
 		width: 1px;