pages/HotelMerchandise/addCommodity.vue

@@ -29,7 +29,7 @@
 					<u-radio-group @change="selectType" size="32" iconSize="24" v-model="fromData.comboType"
 						placement="row" activeColor='#1372FF'>
 						<u-radio labelSize='30' label="包桌" :name='1'></u-radio>
-						<u-radio labelSize='30' label="按人头" :name='2' v-if="tabIndex==0"></u-radio>
+						<u-radio labelSize='30' label="按人均" :name='2' v-if="tabIndex==0"></u-radio>
 					</u-radio-group>
 
 				</view>
@@ -105,7 +105,7 @@
 				covered: [],
 				fromData: {
 					comboName: "", //套餐名称
-					comboType: '1', //套餐类型: 1包桌 2按人头
+					comboType: '1', //套餐类型: 1包桌 2按人均
 					cover: '', //主图/封面
 					introduction: '', //图片 多个以,分割
 					price: '', //价格
@@ -118,7 +118,7 @@
 						disabled: false
 					},
 					{
-						name: '按人头',
+						name: '按人均',
 						disabled: false
 					},
 				],

pages/HotelMerchandise/index.vue

@@ -161,10 +161,10 @@
 				</view>
 				<view class="hander-two">
 					<view class="pop-btn-del" @click="showPricing=false">
-						取消
+						<text>取消</text>
 					</view>
 					<view class="pop-btn-add" @click="GoOndel()">
-						继续提交
+						<text>继续提交</text>
 					</view>
 				</view>
 			</view>
@@ -193,10 +193,12 @@
 				</view>
 				<view class="hander-two">
 					<view class="pop-btn-del" @click="showPricingUnder=false">
-						取消
+						<text>
+							取消
+						</text>
 					</view>
 					<view class="pop-btn-add" @click="GoOnUnder()">
-						继续提交
+						<text> 继续提交</text>
 					</view>
 				</view>
 			</view>
@@ -334,6 +336,7 @@
 			},
 
 			closegaijia() {
+				this.showPricinggaijia = false
 				this.showPricing = false;
 				this.newprice = '';
 			},
@@ -826,23 +829,32 @@
 			margin: 30rpx 0;
 
 			.pop-btn-del {
+				width: 48%;
 				margin: 0 15rpx;
-				padding: 22rpx 136rpx;
+				// padding: 22rpx 136rpx;
 				font-size: 32rpx;
+				height: 88rpx;
+				line-height: 88rpx;
 				color: #111111;
 				font-weight: Regular;
 				background-color: #F0F2F5;
 				border-radius: 50rpx;
+				text-align: center;
+
 			}
 
 			.pop-btn-add {
+				height: 88rpx;
+				line-height: 88rpx;
+				width: 48%;
 				border-radius: 50rpx;
 				margin: 0 15rpx;
 				background-color: #1372FF;
-				padding: 22rpx 100rpx;
+				// padding: 22rpx 100rpx;
 				font-size: 32rpx;
 				color: #FFFFFF;
 				font-weight: Regular;
+				text-align: center;
 			}
 
 

pages/my/roomType.vue

@@ -425,6 +425,10 @@
 </script>
 
 <style lang="scss">
+	.u-calendar scroll-view {
+		height: 600rpx !important;
+	}
+
 	.uicon-close {
 		font-size: 35rpx !important;
 		z-index: 99999 !important;
@@ -454,13 +458,13 @@
 		width: 100% !important;
 	}
 
-	.data-v-b73440ae {
-		height: 500rpx !important;
-	}
+	// .data-v-b73440ae {
+	// 	height: 500rpx !important;
+	// }
 
-	.u-slide-up-enter-active {
-		height: 55vh !important;
-	}
+	// .u-slide-up-enter-active {
+	// 	height: 55vh !important;
+	// }
 
 	.u-time {
 		height: 75vh !important;
@@ -485,7 +489,10 @@
 	}
 
 	.pop-pop {
-		height: 65vh;
+		height: 800rpx;
+		overflow: auto;
+		box-sizing: border-box;
+		padding-bottom: 200rpx;
 
 
 		.hander-one {