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

pages/restaurant/detail.vue

@@ -15,6 +15,9 @@
 					<u-icon name="arrow-left" size="44"></u-icon>
 				</view>
 				<view style="flex: 1;margin-left: 30rpx; text-align: left;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{details.Name}}</view>
+			</view>
+			<view class="">
+				
 			</view>
 			<view class="restaurant-content">
 				<view class="restaurant-base">
@@ -466,8 +469,7 @@
 	}
 
 	.caledar-btn {
-		margin-top: 20rpx;
-		width: 650rpx;
+		width: 700rpx;
 		height: 80rpx;
 		background-color: #111111;
 		border-radius: 20rpx;
@@ -477,7 +479,7 @@
 		color: #FFFFFF;
 		text-align: center;
 		line-height: 78rpx;
-		margin: 0 auto;
+		margin: 20rpx auto 80rpx;
 	}
 
 	.restaurant-detail {
@@ -507,7 +509,7 @@
 	.restaurant-detail .restaurant-content {
 		position: relative;
 		z-index: 2;
-		top: -110rpx;
+		// top: -110rpx;
 	}
 
 	.restaurant-detail .restaurant-content .date-box {
@@ -666,7 +668,12 @@
 		position: relative;
 		z-index: 2;
 	}
-
+	.restaurant-detail .restaurant-content .restaurant-base{
+		width: 750rpx;
+		position: absolute;
+		top: -110px;
+		z-index: 5;
+	}
 	.restaurant-detail .restaurant-content .restaurant-base .restaurant-room .room-type {
 		/* padding:10rpx 30rpx; */
 		display: flex;

pages/ticketCoupons/components/buyNotice.vue

@@ -347,7 +347,7 @@
 					color: #111111;
 					margin-right: 45rpx;
 					margin-bottom: 20rpx;
-					text-align: center;
+					// text-align: center;
 					line-height: 38rpx;
 					overflow: hidden;
 					
@@ -359,7 +359,7 @@
 					font-family: PingFang SC;
 					font-weight: 800;
 					color: #111111;
-					line-height: 28rpx;
+					line-height: 40rpx;
 					// white-space: nowrap;
 					// overflow: hidden;
 					// text-overflow: ellipsis;

pages/ticketCoupons/detail.vue

@@ -21,7 +21,7 @@
 			</view>
 			<view style="position: relative;z-index: 2;">
 				<view
-					style="position: relative;top: -70px;border-top-left-radius: 30px;border-top-right-radius: 30px;background-color: #FFF;">
+					style="width: 750rpx; position: absolute;top: -70px;border-top-left-radius: 30px;border-top-right-radius: 30px;background-color: #FFF;">
 					<view class="baseinfo">
 						<view class="info1">
 							<view class="name">