2 Achegas 0785072d27 ... 9e3b10cd11

Autor SHA1 Mensaxe Data
  lifanzai 9e3b10cd11 Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx hai 10 meses
  lifanzai 7f569c6e20 房型&房间 hai 10 meses

+ 33 - 0
node_modules/.package-lock.json

@@ -0,0 +1,33 @@
+{
+  "name": "hotelHomestayWx",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "node_modules/@qiun/ucharts": {
+      "version": "2.5.0-20230101",
+      "resolved": "https://registry.npmjs.org/@qiun/ucharts/-/ucharts-2.5.0-20230101.tgz",
+      "integrity": "sha512-C7ccBgfPuGF6dxTRuMW0NPPMSCf1k/kh3I9zkRVBc5PaivudX/rPL+jd2Wty6gn5ya5L3Ob+YmYe09V5xw66Cw=="
+    },
+    "node_modules/debounce": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-2.0.0.tgz",
+      "integrity": "sha512-xRetU6gL1VJbs85Mc4FoEGSjQxzpdxRyFhe3lmWFyy2EzydIcD4xzUvRJMD+NPDfMwKNhxa3PvsIOU32luIWeA==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/uniapp-qrcode": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uniapp-qrcode/-/uniapp-qrcode-1.0.2.tgz",
+      "integrity": "sha512-jcWwWz4yXsO7if/+78MMXj5VUdZTLu2D6L/IKb4mJkIw87oF11pO3WS/jS27SUcPCrX/BKcir5a2R1uvkaoR9g=="
+    },
+    "node_modules/uview-ui": {
+      "version": "2.0.36",
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.36.tgz",
+      "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA==",
+      "engines": {
+        "HBuilderX": "^3.1.0"
+      }
+    }
+  }
+}

+ 19 - 0
node_modules/@qiun/ucharts/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "@qiun/ucharts",
+  "version": "2.5.0-20230101",
+  "description": "【原生uCharts】跨平台图表库,全端全平台支持的图表库,开箱即用。支持PC、H5、微信小程序、支付宝小程序、百度小程序、头条小程序、飞书小程序、QQ小程序、360小程序、快手小程序、钉钉小程序、淘宝小程序、京东小程序、Vue、Taro等更多支持canvas的框架,体积小巧、调用简单方便、性能及体验极佳。",
+  "main": "u-charts.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+      "uCharts","大图","大屏","可视化","图表库","饼图","圆环图","折线图","柱状图","山峰图","区域图","雷达图","圆弧进度图","仪表盘","K线图","条状图","混合图","玫瑰图","漏斗图","词云图","时序图","散点图","气泡图","地图"
+  ],
+  "homepage":"https://www.ucharts.cn",
+  "author": "秋云",
+  "license": "Apache",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  }
+}

node_modules/qiun/ucharts/readme.md → node_modules/@qiun/ucharts/readme.md


node_modules/qiun/ucharts/u-charts.js → node_modules/@qiun/ucharts/u-charts.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 18 - 0
node_modules/@qiun/ucharts/u-charts.min.js


+ 0 - 71
node_modules/qiun/ucharts/package.json

@@ -1,71 +0,0 @@
-{
-  "_from": "@qiun/ucharts@^2.5.0-20230101",
-  "_id": "@qiun/ucharts@2.5.0-20230101",
-  "_inBundle": false,
-  "_integrity": "sha512-C7ccBgfPuGF6dxTRuMW0NPPMSCf1k/kh3I9zkRVBc5PaivudX/rPL+jd2Wty6gn5ya5L3Ob+YmYe09V5xw66Cw==",
-  "_location": "/@qiun/ucharts",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "@qiun/ucharts@^2.5.0-20230101",
-    "name": "@qiun/ucharts",
-    "escapedName": "@qiun%2fucharts",
-    "scope": "@qiun",
-    "rawSpec": "^2.5.0-20230101",
-    "saveSpec": null,
-    "fetchSpec": "^2.5.0-20230101"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/@qiun/ucharts/-/ucharts-2.5.0-20230101.tgz",
-  "_shasum": "9ca5d646328ad4a002c745c28001f8916865c4f8",
-  "_spec": "@qiun/ucharts@^2.5.0-20230101",
-  "_where": "C:\\Users\\任春旭\\Desktop\\传秀\\hotelHomestayWx",
-  "author": {
-    "name": "秋云"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "【原生uCharts】跨平台图表库,全端全平台支持的图表库,开箱即用。支持PC、H5、微信小程序、支付宝小程序、百度小程序、头条小程序、飞书小程序、QQ小程序、360小程序、快手小程序、钉钉小程序、淘宝小程序、京东小程序、Vue、Taro等更多支持canvas的框架,体积小巧、调用简单方便、性能及体验极佳。",
-  "homepage": "https://www.ucharts.cn",
-  "keywords": [
-    "uCharts",
-    "大图",
-    "大屏",
-    "可视化",
-    "图表库",
-    "饼图",
-    "圆环图",
-    "折线图",
-    "柱状图",
-    "山峰图",
-    "区域图",
-    "雷达图",
-    "圆弧进度图",
-    "仪表盘",
-    "K线图",
-    "条状图",
-    "混合图",
-    "玫瑰图",
-    "漏斗图",
-    "词云图",
-    "时序图",
-    "散点图",
-    "气泡图",
-    "地图"
-  ],
-  "license": "Apache",
-  "main": "u-charts.js",
-  "name": "@qiun/ucharts",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "version": "2.5.0-20230101"
-}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 7573
node_modules/qiun/ucharts/u-charts.min.js


+ 24 - 9
package-lock.json

@@ -1,26 +1,41 @@
 {
+  "name": "hotelHomestayWx",
+  "lockfileVersion": 3,
   "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@qiun/ucharts": {
+  "packages": {
+    "": {
+      "dependencies": {
+        "@qiun/ucharts": "^2.5.0-20230101",
+        "debounce": "^2.0.0",
+        "uniapp-qrcode": "^1.0.2",
+        "uview-ui": "^2.0.36"
+      }
+    },
+    "node_modules/@qiun/ucharts": {
       "version": "2.5.0-20230101",
       "resolved": "https://registry.npmjs.org/@qiun/ucharts/-/ucharts-2.5.0-20230101.tgz",
       "integrity": "sha512-C7ccBgfPuGF6dxTRuMW0NPPMSCf1k/kh3I9zkRVBc5PaivudX/rPL+jd2Wty6gn5ya5L3Ob+YmYe09V5xw66Cw=="
     },
-    "debounce": {
+    "node_modules/debounce": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/debounce/-/debounce-2.0.0.tgz",
-      "integrity": "sha512-xRetU6gL1VJbs85Mc4FoEGSjQxzpdxRyFhe3lmWFyy2EzydIcD4xzUvRJMD+NPDfMwKNhxa3PvsIOU32luIWeA=="
+      "integrity": "sha512-xRetU6gL1VJbs85Mc4FoEGSjQxzpdxRyFhe3lmWFyy2EzydIcD4xzUvRJMD+NPDfMwKNhxa3PvsIOU32luIWeA==",
+      "engines": {
+        "node": ">=18"
+      }
     },
-    "uniapp-qrcode": {
+    "node_modules/uniapp-qrcode": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uniapp-qrcode/-/uniapp-qrcode-1.0.2.tgz",
       "integrity": "sha512-jcWwWz4yXsO7if/+78MMXj5VUdZTLu2D6L/IKb4mJkIw87oF11pO3WS/jS27SUcPCrX/BKcir5a2R1uvkaoR9g=="
     },
-    "uview-ui": {
+    "node_modules/uview-ui": {
       "version": "2.0.36",
-      "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.36.tgz",
-      "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA=="
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.36.tgz",
+      "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA==",
+      "engines": {
+        "HBuilderX": "^3.1.0"
+      }
     }
   }
 }

+ 15 - 0
pages.json

@@ -87,6 +87,13 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/my/houseList",
+			"style": {
+				"navigationBarTitleText": "房型选择",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/statistics/index",
 			"style": {
@@ -100,7 +107,15 @@
 				"navigationBarTitleText": "我的",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/my/roomType",
+			"style": {
+				"navigationBarTitleText": "房间列表",
+				"navigationStyle": "custom"
+			}
 		}
+		
 	],
 	"subPackages": [{
 			"root": "pagesHouse",

+ 413 - 0
pages/my/houseList.vue

@@ -0,0 +1,413 @@
+<template>
+	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
+			<c-nav-bar title="房间列表" :showIcon="false" :titleStyle="titleStyle"></c-nav-bar>
+		<view class="body">
+			<!-- 房型信息 -->
+			
+			<view class="typeInfo">
+				<view class="titleInfo">
+					<text style="font-size: 32rpx; font-weight: 700;">房型信息</text>
+				</view>
+				<view class="cellBox">
+					<text style="font-size: 30rpx; margin-right: 30rpx;">房型名称</text>
+					<input v-model="form.name" type="text" placeholder="请输入房型"  style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/>
+				</view>
+				<view class="bigRoom">
+					<text style="font-size: 30rpx;color: black; margin-right: 90rpx;">简称</text>
+					<input v-model="form.shortName" type="text" placeholder="请输入简称"  style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/>
+				</view>
+			</view>
+			<view class="shelves">
+				<view style="margin-left: 30rpx;">
+					<text style="font-size: 30rpx; " >是否上架</text>
+				</view>
+				<view style="margin-right: 30rpx;">
+					<u-switch v-model="checked" size="50" @change="change(status)" active-color="#07C160" ></u-switch>
+				</view>
+			</view>
+			<!-- 图片上传
+			 -->
+			 <view class="uploadPic">
+			 	<view style=" margin-left: 30rpx;">
+					<text style="font-size: 32rpx; font-weight: 700; ">封面图片(0/1)</text>
+			 		
+			 	</view>
+				<view style="margin-top: 20rpx; margin-left: 30rpx; color: #777; font-size: 24rpx;">
+					<text>仅能上传1张,需展示房间内容</text>
+				</view>
+				<view class="pic">
+					<!-- 图片 -->
+					<view v-show="false" >
+						<u-upload :action="action" :file-list="fileList" >
+							<!-- <img src="https://img.51miz.com/Element/00/77/24/47/cd39208d_E772447_a1d65d72.png" style="width: 190rpx; height: 120rpx;" /> -->
+						</u-upload>
+						
+					</view>
+				</view>
+				
+			 </view>
+			 <!-- 价格信息 -->
+			 <view class="priceInfo">
+				 <!-- 标题 -->
+			 	<view class="titleInfo">
+			 		<text style="font-size: 32rpx; font-weight: 700; margin-left: 10rpx;">价格信息</text>
+			 	</view>
+				<!-- 周末周日区分 -->
+					<view class="week">
+						<view class="weekend">
+							<view >
+								<text style="font-size: 30rpx; " >区分平日周末</text>
+							</view>
+							<view >
+								<u-switch v-model="weekedChecked" size="50"  active-color="#07C160" ></u-switch>
+							</view>
+						</view>
+					</view>
+					
+				<!-- 每日价格 -->
+					<view class="priceBoxWeek">
+						<view class="weekendBox">
+							<view >
+								<text style="font-size: 30rpx; margin-right: 90rpx; " >周一</text>
+							</view>
+							<view style="display: flex;">
+								<text style="font-size: 30rpx;">¥</text> <input v-model="form.mondayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
+							</view>
+						</view>
+					</view>
+					
+					<view class="priceBoxWeek">
+						<view class="weekendBox">
+							<view >
+								<text style="font-size: 30rpx; margin-right: 90rpx; " >周二</text>
+							</view>
+							<view style="display: flex;">
+								<text style="font-size: 30rpx;">¥</text> <input v-model="form.tuesdayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
+							</view>
+						</view>
+					</view>
+					
+					<view class="priceBoxWeek">
+						<view class="weekendBox">
+							<view >
+								<text style="font-size: 30rpx; margin-right: 90rpx; " >周三</text>
+							</view>
+							<view style="display: flex;">
+								<text style="font-size: 30rpx;">¥</text> <input v-model="form.wednesdayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
+							</view>
+						</view>
+					</view>
+					
+					<view class="priceBoxWeek">
+						<view class="weekendBox">
+							<view >
+								<text style="font-size: 30rpx; margin-right: 90rpx; " >周四</text>
+							</view>
+							<view style="display: flex;">
+								<text style="font-size: 30rpx;">¥</text> <input v-model="form.thursdayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
+							</view>
+						</view>
+					</view>
+					
+					<view class="priceBoxWeek">
+						<view class="weekendBox">
+							<view >
+								<text style="font-size: 30rpx; margin-right: 90rpx; " >周五</text>
+							</view>
+							<view style="display: flex;">
+								<text style="font-size: 30rpx;">¥</text> <input v-model="form.fridayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
+							</view>
+						</view>
+					</view>
+					
+					<view class="priceBoxWeek">
+						<view class="weekendBox">
+							<view >
+								<text style="font-size: 30rpx; margin-right: 90rpx; " >周六</text>
+							</view>
+							<view style="display: flex;">
+								<text style="font-size: 30rpx;">¥</text> <input v-model="form.saturdayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
+							</view>
+						</view>
+					</view>
+					
+					<view class="priceBoxWeek">
+						<view class="weekendBox" style=" border-bottom: 1rpx solid #fff;">
+							<view  style="margin-top: 10rpx;">
+								<text style="font-size: 30rpx; margin-right: 90rpx; " >周日</text>
+							</view>
+							<view style="display: flex; margin-top: 10rpx;">
+								<text style="font-size: 30rpx;">¥</text> <input v-model="form.sundayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;
+								
+								 "/> 
+							</view>
+						</view>
+					</view>
+			 </view>
+			 <!-- 房间列表 -->
+			 <view class="everyHouseList" style="padding-top: 20rpx;">
+			 	 <view class="HouseListTitleInfo" >
+			 	 	<text style="font-size: 32rpx; font-weight: 700;">房间列表</text>
+					<text style="font-size: 24rpx; color: #777;">共8个房间</text>
+			 	 </view>
+				 <!-- 房间号 -->
+				 <view class="priceBoxWeek">
+				 	<view class="weekendBox" style="display: flex; justify-content: space-between;">						
+						<view style="display: flex;">
+							<text> 楼层:</text><input style="width: 50rpx;" v-model="form.roomFloor[0].floor" type="text" />
+						</view>
+						<view style="display: flex;">
+								<text > 房间号:</text><input style="width: 50rpx;"  v-model="form.roomFloor[0].roomNumber" type="text" />
+						</view>
+						
+				 		<view style="display: flex; margin-top: 10rpx;">
+							<u-icon name="trash"></u-icon>
+				 		</view>
+				 	</view>
+				 </view>
+				 
+				
+			 </view>
+			 
+			 <!-- 添加按钮 -->
+			 <view class="submit">
+			 	<u-icon name="plus-circle" color=" #1372FF"></u-icon>
+				<text style="color: #1372FF; font-size: 30rpx;">添加房间</text>
+			 </view>
+			 
+			 <!-- 确定添加按钮 -->
+			 <view class="addSubmit" @click="addNewRoom">
+				 
+			 	<text style="line-height: 96rpx; margin-left:310rpx; font-size: 32rpx; color: #fff;">确定</text>
+			 </view>
+		</view>
+			
+			</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				checked:false,
+				weekedChecked:false,
+				action: '',//图片服务器地址
+							fileList: [
+								{
+									url: '',
+								}
+							],
+				
+				form:{
+					homestayId:'',
+					mondayPrice:'',
+					tuesdayPrice:'',
+					wednesdayPrice:'',
+					thursdayPrice:'',
+					fridayPrice:'',
+					saturdayPrice:'',
+					sundayPrice:'',
+					name:'',
+					shortName:'',
+					roomFloor:[
+					{	floor:'',
+						roomNumber:''}
+					]
+					
+				},
+					
+				
+			}
+			
+		},
+		onLoad({id}){
+			this.form.homestayId=id
+			console.log(this.form.homestayId)
+			
+		},
+		methods:{
+			// change(status) {
+			// 				console.log(status);
+			// 			},
+			addNewRoom(){
+				this.$api.post('/merchant/hotel/mine/addHouseBase',this.form).then(res=>{
+					console.log(res)
+					if(res.data.code===0){
+						this.$showToast('添加成功');
+						setTimeout(()=>{
+							uni.reLaunch({
+								url:'/pages/my/roomType'
+							})
+						},1500)
+					}
+				})
+			}
+		}
+		
+	}
+</script>
+
+<style lang="scss"> 
+	.page {
+		background: #F3F4F4;
+		padding-bottom: 260rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+		overflow-x: auto;
+	}
+	.body {
+		padding-top: 20rpx;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+	}
+	.typeInfo{
+		background-color: #fff;
+		width: 650rpx;
+		height: 290rpx;
+		border-radius: 10rpx;
+		padding-top: 30rpx;
+		padding-left: 15rpx;
+		padding-right: 30rpx;
+	}
+	.titleInfo{
+	// margin-top: 30rpx;
+	margin-left: 20rpx;
+	margin-bottom: 40rpx;
+	}
+	.cellBox{
+		margin-left: 20rpx;
+		display: flex;
+		padding-bottom: 40rpx;
+		border-bottom: 1rpx solid #E1E1E1;
+	}
+	.bigRoom{
+		margin-left: 20rpx;
+		width: 100%;
+		height: 102rpx;
+		display: flex;
+		// justify-content: center;
+		align-items: center;
+		
+	}
+	.shelves{
+		width: 695rpx;
+		height: 102rpx;
+		background-color: #fff;
+		margin-top: 20rpx;
+		border-radius: 10rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		// padding-left: 30rpx;
+		// padding-right: 30rpx;
+	}
+	.uploadPic{
+		padding-top: 28rpx;
+		width: 690rpx;
+		height: 293rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+		margin-top: 20rpx;
+	}
+	.pic{
+		margin-left: 30rpx;
+		margin-top: 20rpx;
+		width: 190rpx;
+		height: 120rpx;
+		background-color: pink;
+	}
+	// .custom-upload-button{
+	// 	width: 190rpx;
+	// 	height: 120rpx;
+	
+	// }
+	.priceInfo{
+		width: 690rpx;
+		height: 908rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+		margin-top: 20rpx;
+		padding-top: 30rpx;
+	}
+	.week{
+		
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		margin-bottom: 20rpx;
+	}
+	.weekend{
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1rpx solid #E1E1E1;
+		padding-bottom: 30rpx;
+	}
+	.everyDay{
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		width: 100%;
+		// background-color: pink;
+		height: 102rpx;
+		display: flex;
+		align-items: center;
+	}
+	.days{
+		display: flex;
+		align-items: center;
+		border-bottom: 1rpx solid #E1E1E1;
+		padding-bottom: 30rpx;
+	}
+	.priceBoxWeek{
+		display: flex;
+		align-items: center;
+		height: 102rpx;
+	   padding-left: 30rpx;
+	  padding-right: 30rpx;
+	}
+	.weekendBox{
+	width: 630rpx;
+	display: flex;
+	margin-top: 20rpx;
+	// margin-right: 90rpx;
+	// justify-content: space-between;
+	border-bottom: 1rpx solid #E1E1E1;
+	padding-bottom: 32rpx;
+	}
+	.everyHouseList{
+		// padding-right: 30rpx;
+		width: 690rpx;
+		// height: 908rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+		margin-top: 20rpx;
+		// padding-top: 30rpx;
+	}
+	.HouseListTitleInfo{
+		margin-right: 30rpx;
+		margin-left: 20rpx;
+		margin-bottom: 40rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+	.submit{
+		margin-top: 20rpx;
+		border-radius: 10rpx;
+		width: 690rpx;
+		height: 102rpx;
+		background-color: #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.addSubmit{
+		  position: fixed;  /* 固定定位 */  
+		    bottom: 20rpx;         /* 底部对齐 */  
+		    left: 0;            /* 可选:左对齐 */  
+		    width: 690rpx;         /* 可选:宽度为 100% */  
+			height: 96rpx;
+			margin-left: 30rpx;
+			// padding-top: 20rpx;
+			margin-top: 30rpx;
+		    background-color: #1372FF;
+			border-radius: 48rpx;
+	}
+</style>

+ 14 - 5
pages/my/index.vue

@@ -27,10 +27,14 @@
 			<text>酒店民宿信息</text>
 			<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
 		</view>
-		<view class="menu box">
-			<text>房型管理</text>
-			<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-		</view>
+		
+		<navigator url="/pages/my/roomType">
+			
+			<view class="menu box">
+				<text>房型管理</text>
+				<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+			</view>
+		</navigator>
 		<view class="menu box">
 			<text>预订二维码</text>
 			<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
@@ -89,7 +93,12 @@
 				uni.navigateTo({
 					url: '/pagesMy/stayInfo/stayInfo'
 				})
-			}
+			},
+			// goRoomType(){
+			// 	uni.navigateTo({
+			// 		url:'/pages/my/roomType'
+			// 	})
+			// }
 		}
 	}
 </script>

+ 112 - 0
pages/my/roomType.vue

@@ -0,0 +1,112 @@
+<template>
+	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
+			<c-nav-bar title="房型列表" :showIcon="false" :titleStyle="titleStyle"></c-nav-bar>
+			<!-- 房型数量 -->
+			<view class="typeNum">
+					<text style="font-size: 24rpx; color: #777;">共3个房型</text>
+			</view>
+			<!-- 房型选择 -->
+			<view class="type" v-for="item in roomType" :key="item.houseBaseId">
+				<view class="top">
+					<text style="font-size: 30rpx; color: #333;" >{{item.name}}</text>
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+				<view class="under">
+					<text style="font-size: 24rpx; color: #777;">大床房</text>
+					<text style="font-size: 24rpx; color: #777;">{{item.roomCount}}间</text>
+					
+				</view>
+				
+			</view>
+		
+			<!-- 新增按钮 -->
+			<view class="btn" @click="addType(id)">
+				新增			
+			</view>
+		</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				homestayId:this.$store.state.moduleHouse.homestayId,
+				roomType:[]
+			}
+		},
+		onLoad(){
+			// console.log(this.homestayId)
+			this.getHomestayId()
+		},
+		methods:{
+			// 获取房型列表信息
+			getHomestayId(){
+				this.$api.get(`/merchant/hotel/mine/getHouseBaseList/${this.homestayId}`,{
+					homestayId:this.homestayId
+				}).then((res)=>{
+					// console.log(res)
+					this.roomType=res.data.data
+					// let roomSymbleName=this.roomType.name
+					// console.log(roomSymbleName)
+					// console.log(this.roomType)
+				})
+			},
+			// 新增房型
+			addType(id){
+				uni.navigateTo({
+					url:`/pages/my/houseList?id=${this.homestayId}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.page {
+		background: #F3F4F4;
+		padding-bottom: 260rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+		overflow-x: auto;
+	}
+	.typeNum{
+		width: 100%;
+		height: 73rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.type{
+		margin: 0 auto;
+		border-radius: 10rpx 10rpx 10rpx 10rpx;
+		width: 86%;
+		height: 155rpx;
+		background-color: #fff;
+		padding: 30rpx;
+		margin-bottom: 20rpx;
+	}
+	.top{
+		display: flex;
+		justify-content: space-between;
+	}
+	.under{
+		margin-top: 40rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+	.btn{
+		width: 690rpx;
+		height: 96rpx;
+		background-color: #1372FF;
+		color: #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 34rpx;
+		position: fixed;
+		bottom: 40rpx;
+		margin-top: 30rpx;
+		margin-left: 30rpx;
+		border-radius: 48rpx;
+	}
+</style>