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

pages/hotel/components/hotel-good.vue

@@ -7,10 +7,10 @@
 		</view>
 		<view class="hotel-info column">
 			<view class="hotel-name row items-center">
-				<img v-if="item.starRating>=3" class="hotel-SubR"
-					:class="[item.starRating==3?'hotel-SubStar3':item.starRating==4?'hotel-SubStar4':item.starRating==5?'hotel-SubStar5':'']"
-					:src="item.starRating==3?StarImgs[0]:item.starRating==4?StarImgs[1]:item.starRating==5?StarImgs[2]:''" />
-				<text v-else class="hotel-Economy">经济型</text>
+				<img class="hotel-SubR"
+					:class="[item.starRating==3?'hotel-SubStar3':item.starRating==4?'hotel-SubStar4':item.starRating==5?'hotel-SubStar5':'hotel-SubStar2']"
+					:src="item.starRating==3?StarImgs[0]:item.starRating==4?StarImgs[1]:item.starRating==5?StarImgs[2]:StarImgs[3]" />
+				<!--<text v-else class="hotel-Economy">经济型</text>-->
 				{{item.name}}
 			</view>
 			<view class="hotel-Subtitle row">
@@ -60,6 +60,7 @@
 					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/hotel3stars.png',
 					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/hotel4stars.png',
 					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/hotel5stars.png',
+					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638809441661552596.png',
 				],
 				myDayObj: null,
 			}
@@ -239,7 +240,9 @@
 		height: 35rpx;
 		display: block;
 	}
-
+	.hotel-SubStar2 img {
+		width: 74rpx;
+	}
 	.hotel-SubStar3 img {
 		width: 74rpx;
 	}

pages/hotel/detail.vue

@@ -66,10 +66,10 @@
 							<view style="flex: 1">
 								<view class="hotel-name">
 									<img class="hotel-Sub"
-										:class="[dataList.starRating==3?'hotel-Sub3':dataList.starRating==4?'hotel-Sub4':'']"
-										v-if="dataList.starRating>=3&&dataList.starRating<6" style=""
-										:src="dataList.starRating==3?StarImgs[0]:dataList.starRating==4?StarImgs[1]:StarImgs[2]" />
-									<text v-else class="hotel-Economy">经济型</text>
+										:class="[dataList.starRating==3?'hotel-Sub3':dataList.starRating==4?'hotel-Sub4':dataList.starRating==5?'hotel-Sub5':'hotel-Sub2']"
+										 style=""
+										:src="dataList.starRating==3?StarImgs[0]:dataList.starRating==4?StarImgs[1]:dataList.starRating==5?StarImgs[2]:StarImgs[3]" />
+									<!--<text v-else class="hotel-Economy">经济型</text>-->
 									{{ dataList.name }}
 								</view>
 								<view class="hotel-brand">
@@ -340,6 +340,7 @@
 					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/hotel3stars.png',
 					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/hotel4stars.png',
 					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/hotel5stars.png',
+					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638809441661552596.png'
 				],
 				openImg: [
 					'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638762717498946531.png',
@@ -1501,7 +1502,9 @@
 		position: relative;
 		top: 10rpx
 	}
-
+	.hotel-Sub.hotel-Sub2 {
+		width: 85rpx;
+	}
 	.hotel-Sub.hotel-Sub3 {
 		width: 85rpx;
 	}
@@ -1509,6 +1512,9 @@
 	.hotel-Sub.hotel-Sub4 {
 		width: 101rpx;
 	}
+	.hotel-Sub.hotel-Sub5 {
+		width: 116rpx;
+	}
 
 	.hotel-Economy {
 		font-weight: 500;