修改酒店民宿

pages.json

@@ -129,6 +129,31 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "type/info",
+					"style": {
+						"navigationBarTitleText": "详情"
+					}
+				},
+				{
+					"path": "hotel/index",
+					"style": {
+						"navigationBarTitleText": "酒店民宿",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "hotel/info",
+					"style": {
+						"navigationBarTitleText": "详情"
+					}
+				},
+				{
+					"path": "hotel/detail",
+					"style": {
+						"navigationBarTitleText": "房间信息"
+					}
+				},
 				{
 					"path": "notice/index",
 					"style": {

pagesHome/hotel/detail.vue

@@ -0,0 +1,215 @@
+<template>
+	<view class="main">
+		<view class="one" v-if="info.file.length>0">
+			<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5"
+				indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000">
+				<swiper-item class="list" v-for="(item,index) in info.file" :key="index">
+					<image class="image" :src="item.url" mode="">
+					</image>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="bottom">
+			<view class="two">
+				<view class="two_1">{{info.name||'暂无'}}</view>
+			</view>
+			<view class="thr">
+				<view class="thr_1">
+					<view class="left">价格：</view>
+					<view class="right"><text class="text_1" :user-select='true'>￥{{info.money||'暂无'}}</text></view>
+				</view>
+				<view class="thr_1">
+					<view class="left">数量：</view>
+					<view class="right">
+						<text>{{info.num||'暂无'}}间</text>
+					</view>
+				</view>
+			</view>
+			<view class="four">
+				<view class="four_1">简介</view>
+				<rich-text :nodes="formatRichText(info.brief)"></rich-text>
+			</view>
+			<view class="foot">
+				<view class="button" @click="toBuy"><text>预订</text></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				user: {},
+				info: {
+					file: []
+				},
+				// 字典表
+				typeList: []
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			await that.searchOther();
+			that.searchToken();
+			that.search();
+		},
+		methods: {
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						that.$set(that, `user`, res);
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				if (that.id) {
+					const res = await that.$api(`/room/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						const type = that.typeList.find(i => i.value == res.data.type)
+						if (type) res.data.zhType = type.label
+						that.$set(that, `info`, res.data)
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+						});
+					}
+				}
+			},
+			// 处理富文本
+			formatRichText(html) {
+				// 富文本内容格式化
+				return html && html.replace(/<img[^>]*>/gi, function(match, capture) {
+					// 查找所有的 img 元素
+					return match.replace(/style=".*"/gi, '').replace(/style='.*'/gi,
+						'')
+					// 删除找到的所有 img 元素中的 style 属性
+				}).replace(/\<img/gi, '<img style="width:100%;"') // 对 img 元素增加 style 属性，并设置宽度为 100%
+			},
+			// 预定
+			toBuy() {
+				console.log("预定");
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询类型
+				res = await that.$api(`/dictData`, 'GET', {
+					type: 'project_type',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		.one {
+			.swiper {
+				height: 70vw;
+
+				.list {
+					.image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+
+		.bottom {
+			position: absolute;
+			top: 65vw;
+			left: 0;
+			right: 0;
+			background-color: var(--mainColor);
+			border-radius: 20px;
+			padding: 2vw 0 0 0;
+
+			.two {
+				padding: 4vw 2vw;
+
+				.two_1 {
+					padding: 1vw 0;
+					font-weight: bold;
+					font-size: var(--font16Size);
+				}
+
+				.two_2 {
+					color: var(--f85Color);
+					font-size: var(--font12Size);
+				}
+
+			}
+
+			.thr {
+				padding: 2vw;
+
+				.thr_1 {
+					display: flex;
+					font-size: var(--font14Size);
+					padding: 0 0 1vw 0;
+
+					.left {
+						padding: 0 1vw 0 0;
+						font-weight: bold;
+					}
+
+					.right {
+						color: var(--f85Color);
+
+						.text_1 {
+							font-size: var(--font14Size);
+							color: var(--fF0Color);
+						}
+					}
+				}
+			}
+
+			.four {
+				padding: 2vw;
+				margin: 0 0 15vw 0;
+
+				.four_1 {
+					font-weight: bold;
+					font-size: var(--font16Size);
+					padding: 0 0 1vw 0;
+				}
+			}
+		}
+
+		.foot {
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+
+			.button {
+				display: flex;
+				justify-content: center;
+				background-color: var(--f3CColor);
+				padding: 4vw;
+
+				text {
+					font-size: var(--font16Size);
+					color: var(--mainColor);
+				}
+			}
+		}
+
+	}
+</style>

pagesHome/hotel/index.vue

@@ -0,0 +1,256 @@
+<template>
+	<view class="main">
+		<view class="one">
+			<input type="text" v-model="searchInfo.name" @input="toInput" placeholder="搜索名称">
+		</view>
+		<view class="two">
+			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+				<view class="list-scroll-view">
+					<view class="list" v-for="(item, index) in list" :key="index" @tap="toInfo(item)">
+						<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="aspectFill">
+						</image>
+						<view class="list_1">
+							<view class="name textOne">{{ item.name ||'暂无'}}</view>
+							<view class="other other_2"><text>入离时间：</text>{{ item.start_time||'暂无' }}-{{ item.end_time||'暂无' }}</view>
+							<view class="other other_2"><text>联系电话：</text>{{ item.phone||'暂无' }}</view>
+							<view class="other other_2 textOne">{{ item.address ||'暂无'}}</view>
+						</view>
+					</view>
+					<view class="is_bottom" v-if="is_bottom">
+						<text>{{config.bottom_title}}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type: '',
+				searchInfo: {},
+				config: {},
+				user: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 10,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `type`, e && e.type || '');
+			uni.setNavigationBarTitle({
+				title: e && e.title || '分类'
+			});
+			that.searchConfig();
+			that.searchToken();
+			that.search();
+		},
+		methods: {
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			// 查询
+			async search() {
+				const that = this;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					is_use: '0',
+					status: '1'
+				}
+				const res = await that.$api(`/hotel`, 'GET', {
+					...info,
+					...that.searchInfo
+				})
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					that.$set(that, `list`, list)
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+					});
+				}
+			},
+			// 输入框
+			toInput(e) {
+				const that = this;
+				if (that.searchInfo.name) that.$set(that.searchInfo, `name`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
+			// 详情
+			toInfo(e) {
+				uni.navigateTo({
+					url: `/pagesHome/hotel/info?id=${e.id||e._id}`
+				})
+			},
+			// 分页
+			toPage(e) {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.searchComment();
+					uni.hideLoading();
+				} else that.$set(that, `is_bottom`, true)
+			},
+			// 触底
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				that.$set(that, `scrollTop`, e.detail.scrollTop);
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 10)
+				that.$set(that, `page`, 0)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: 2vw;
+
+			input {
+				width: 100%;
+				padding: 2vw;
+				background-color: var(--f1Color);
+				font-size: var(--font14Size);
+				border-radius: 5px;
+			}
+		}
+
+		.two {
+			position: relative;
+			flex-grow: 1;
+			background-color: var(--f9Color);
+			margin: 2vw 0 0 0;
+
+			.list {
+				display: flex;
+				background-color: var(--mainColor);
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.image {
+					width: 20vw;
+					height: 20vw;
+					border-radius: 5px;
+				}
+
+				.list_1 {
+					width: 68vw;
+					padding: 0 0 0 2vw;
+
+					.name {
+						font-size: var(--font14Size);
+						font-weight: bold;
+						padding: 0 0 1vw 0;
+					}
+
+					.other {
+						font-size: var(--font12Size);
+						padding: 0 0 2px 0;
+
+						text {
+							color: #000;
+						}
+					}
+
+					.other_1 {
+						color: red;
+					}
+
+					.other_2 {
+						color: var(--f85Color);
+
+					}
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
+</style>

pagesHome/hotel/info.vue

@@ -0,0 +1,394 @@
+<template>
+	<view class="main">
+		<view class="one" v-if="info.file.length>0">
+			<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5"
+				indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000">
+				<swiper-item class="list" v-for="(item,index) in info.file" :key="index">
+					<image class="image" :src="item.url" mode="">
+					</image>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="bottom">
+			<view class="two">
+				<view class="two_1">{{info.name||'暂无'}}</view>
+				<view class="two_2">入住时间：{{info.start_time||'暂无'}}</view>
+				<view class="two_2">退房时间：{{info.end_time||'暂无'}}</view>
+			</view>
+			<view class="thr">
+				<view class="thr_1">
+					<view class="left">地址：</view>
+					<view class="right"><text :user-select='true'>{{info.address||'暂无'}}</text></view>
+				</view>
+				<view class="thr_1">
+					<view class="left">总客房数：</view>
+					<view class="right">
+						<text>{{info.num||'暂无'}}间</text>
+					</view>
+				</view>
+				<view class="thr_1">
+					<view class="left">联系电话：</view>
+					<view class="right"><text :user-select='true'>{{info.phone||'暂无'}}</text></view>
+				</view>
+			</view>
+			<view class="four">
+				<uni-collapse>
+					<uni-collapse-item title="酒店民宿简介">
+						<view class="content">
+							<view class="four" v-if="info.prompt">
+								<view class="four_1">接待提示</view>
+								<rich-text :nodes="formatRichText(info.prompt)"></rich-text>
+							</view>
+							<view class="four" v-if="info.children">
+								<view class="four_1">儿童及加床</view>
+								<rich-text :nodes="formatRichText(info.children)"></rich-text>
+							</view>
+							<view class="four">
+								<view class="four_1">简介</view>
+								<rich-text :nodes="formatRichText(info.brief)"></rich-text>
+							</view>
+						</view>
+					</uni-collapse-item>
+				</uni-collapse>
+			</view>
+			<view class="five">
+				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+					<view class="list-scroll-view">
+						<view class="list" v-for="(item, index) in list" :key="index" @tap="toInfo(item)">
+							<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
+								mode="aspectFill">
+							</image>
+							<view class="list_1">
+								<view class="name textOne">{{ item.name ||'暂无'}}</view>
+								<view class="other other_1">￥{{ item.money ||'暂无'}}</view>
+								<view class="other other_2"><text>当天剩余房量：</text>{{ item.num||'暂无' }}间</view>
+								<view class="button">
+									<button @tap.stop="toBuy(item)" size="mini" type="primary">预订</button>
+								</view>
+							</view>
+						</view>
+						<view class="is_bottom" v-if="is_bottom">
+							<text>{{config.bottom_title}}</text>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				user: {},
+				info: {
+					file: []
+				},
+				config: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 10,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			that.searchConfig();
+			that.searchToken();
+			that.search();
+		},
+		methods: {
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						that.$set(that, `user`, res);
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				if (that.id) {
+					const res = await that.$api(`/hotel/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						that.$set(that, `info`, res.data)
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+						});
+					}
+					let info = {
+						skip: that.skip,
+						limit: that.limit,
+						is_use: '0',
+						hotel: res.data._id
+					}
+					const room = await that.$api(`/room`, 'GET', {
+						...info
+					})
+					if (room.errcode == '0') {
+						let list = [...that.list, ...room.data];
+						that.$set(that, `list`, list)
+						that.$set(that, `total`, room.total)
+					} else {
+						uni.showToast({
+							title: room.errmsg,
+						});
+					}
+				}
+			},
+			// 处理富文本
+			formatRichText(html) {
+				// 富文本内容格式化
+				return html && html.replace(/<img[^>]*>/gi, function(match, capture) {
+					// 查找所有的 img 元素
+					return match.replace(/style=".*"/gi, '').replace(/style='.*'/gi,
+						'')
+					// 删除找到的所有 img 元素中的 style 属性
+				}).replace(/\<img/gi, '<img style="width:100%;"') // 对 img 元素增加 style 属性，并设置宽度为 100%
+			},
+			// 详情
+			toInfo(e) {
+				uni.navigateTo({
+					url: `/pagesHome/hotel/detail?id=${e.id||e._id}`
+				})
+			},
+			// 预定
+			toBuy(item) {
+				console.log(item);
+			},
+			// 分页
+			toPage(e) {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.searchComment();
+					uni.hideLoading();
+				} else that.$set(that, `is_bottom`, true)
+			},
+			// 触底
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				that.$set(that, `scrollTop`, e.detail.scrollTop);
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 10)
+				that.$set(that, `page`, 0)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		.one {
+			.swiper {
+				height: 70vw;
+
+				.list {
+					.image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+
+		.bottom {
+			position: absolute;
+			top: 65vw;
+			left: 0;
+			right: 0;
+			background-color: var(--mainColor);
+			border-radius: 20px;
+			padding: 2vw 0 0 0;
+			display: flex;
+			flex-direction: column;
+			width: 100vw;
+			height: 100vh;
+
+			.two {
+				padding: 4vw 2vw;
+
+				.two_1 {
+					padding: 1vw 0;
+					font-weight: bold;
+					font-size: var(--font16Size);
+				}
+
+				.two_2 {
+					color: var(--f85Color);
+					font-size: var(--font12Size);
+				}
+
+			}
+
+
+			.thr {
+				padding: 2vw;
+
+				.thr_1 {
+					display: flex;
+					font-size: var(--font14Size);
+					padding: 0 0 1vw 0;
+
+					.left {
+						padding: 0 1vw 0 0;
+						font-weight: bold;
+					}
+
+					.right {
+						color: var(--f85Color);
+
+						.text_1 {
+							font-size: var(--font14Size);
+							color: var(--f3CColor);
+						}
+					}
+				}
+			}
+
+			.four {
+				padding: 2vw;
+
+				/deep/.uni-collapse-item__title-box {
+					padding: 0 !important;
+				}
+
+				.four_1 {
+					font-weight: bold;
+					font-size: var(--font16Size);
+					padding: 0 0 1vw 0;
+				}
+			}
+
+			.five {
+				position: relative;
+				flex-grow: 1;
+				background-color: var(--f9Color);
+				margin: 2vw 0 0 0;
+
+				.list {
+					display: flex;
+					background-color: var(--mainColor);
+					border: 1px solid var(--f5Color);
+					padding: 2vw;
+					margin: 2vw 2vw 0 2vw;
+					border-radius: 5px;
+
+					.image {
+						width: 25vw;
+						height: 25vw;
+						border-radius: 5px;
+					}
+
+					.list_1 {
+						width: 63vw;
+						padding: 0 0 0 2vw;
+
+						.name {
+							font-size: var(--font14Size);
+							font-weight: bold;
+							padding: 0 0 1vw 0;
+						}
+
+						.other {
+							font-size: var(--font12Size);
+							padding: 0 0 2px 0;
+
+							text {
+								color: #000;
+							}
+						}
+
+						.other_1 {
+							color: red;
+						}
+
+						.other_2 {
+							color: var(--f85Color);
+
+						}
+
+						.button {
+							text-align: right;
+
+							button {
+								font-size: var(--font12Size);
+								background-color: var(--f3CColor);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
+</style>

pagesHome/notice/index.vue

@@ -154,7 +154,7 @@
 			position: relative;
 			flex-grow: 1;
 			background-color: var(--f9Color);
-			margin: 2vw 0 0 0;
+			padding: 2vw 0 0 0;
 
 			.list {
 				background-color: var(--mainColor);

pagesHome/type/index.vue

@@ -10,11 +10,11 @@
 						<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="aspectFill">
 						</image>
 						<view class="list_1">
-							<view class="name textOver">{{ item.name ||'暂无'}}</view>
+							<view class="name textOne">{{ item.name ||'暂无'}}</view>
 							<view class="other other_1"><text>人均消费：</text>￥{{ item.money ||'暂无'}}</view>
 							<view class="other other_2"><text>营业时间：</text>{{ item.open_time||'暂无' }}</view>
 							<view class="other other_2"><text>联系电话：</text>{{ item.phone||'暂无' }}</view>
-							<view class="other other_2">{{ item.address ||'暂无'}}</view>
+							<view class="other other_2 textOne">{{ item.address ||'暂无'}}</view>
 						</view>
 					</view>
 					<view class="is_bottom" v-if="is_bottom">
@@ -112,6 +112,12 @@
 				that.clearPage();
 				that.search();
 			},
+			// 详情
+			toInfo(e) {
+				uni.navigateTo({
+					url: `/pagesHome/type/info?id=${e.id||e._id}`
+				})
+			},
 			// 分页
 			toPage(e) {
 				const that = this;
@@ -217,10 +223,7 @@
 
 					.other_2 {
 						color: var(--f85Color);
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						-o-text-overflow: ellipsis;
+
 					}
 				}
 			}

pagesHome/type/info.vue

@@ -0,0 +1,202 @@
+<template>
+	<view class="main">
+		<view class="one" v-if="info.file.length>0">
+			<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5"
+				indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000">
+				<swiper-item class="list" v-for="(item,index) in info.file" :key="index">
+					<image class="image" :src="item.url" mode="">
+					</image>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="bottom">
+			<view class="two">
+				<view class="two_1">{{info.name||'暂无'}}</view>
+				<view class="two_2">{{info.open_time||'暂无'}}</view>
+			</view>
+			<view class="thr">
+				<view class="thr_1">
+					<view class="left">地址：</view>
+					<view class="right"><text :user-select='true'>{{info.address||'暂无'}}</text></view>
+				</view>
+				<view class="thr_1">
+					<view class="left">类型：</view>
+					<view class="right">
+						<text class="text_1">#{{info.zhType||'暂无'}}</text>
+					</view>
+				</view>
+				<view class="thr_1">
+					<view class="left">人均消费：</view>
+					<view class="right">
+						<text>￥{{info.money||'暂无'}}</text>
+					</view>
+				</view>
+				<view class="thr_1">
+					<view class="left">联系电话：</view>
+					<view class="right"><text :user-select='true'>{{info.phone||'暂无'}}</text></view>
+				</view>
+			</view>
+			<view class="four" v-if="info.ticket">
+				<view class="four_1">票务政策</view>
+				<rich-text :nodes="formatRichText(info.ticket)"></rich-text>
+			</view>
+			<view class="four">
+				<view class="four_1">简介</view>
+				<rich-text :nodes="formatRichText(info.brief)"></rich-text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				user: {},
+				info: {
+					file: []
+				},
+				// 字典表
+				typeList: []
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			await that.searchOther();
+			that.searchToken();
+			that.search();
+		},
+		methods: {
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						that.$set(that, `user`, res);
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				if (that.id) {
+					const res = await that.$api(`/location/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						const type = that.typeList.find(i => i.value == res.data.type)
+						if (type) res.data.zhType = type.label
+						that.$set(that, `info`, res.data)
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+						});
+					}
+				}
+			},
+			// 处理富文本
+			formatRichText(html) {
+				// 富文本内容格式化
+				return html && html.replace(/<img[^>]*>/gi, function(match, capture) {
+					// 查找所有的 img 元素
+					return match.replace(/style=".*"/gi, '').replace(/style='.*'/gi,
+						'')
+					// 删除找到的所有 img 元素中的 style 属性
+				}).replace(/\<img/gi, '<img style="width:100%;"') // 对 img 元素增加 style 属性，并设置宽度为 100%
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询类型
+				res = await that.$api(`/dictData`, 'GET', {
+					type: 'project_type',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		.one {
+			.swiper {
+				height: 70vw;
+
+				.list {
+					.image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+
+		.bottom {
+			position: absolute;
+			top: 65vw;
+			left: 0;
+			right: 0;
+			background-color: var(--mainColor);
+			border-radius: 20px;
+			padding: 2vw 0 0 0;
+
+			.two {
+				padding: 4vw 2vw;
+
+				.two_1 {
+					padding: 1vw 0;
+					font-weight: bold;
+					font-size: var(--font16Size);
+				}
+
+				.two_2 {
+					color: var(--f85Color);
+					font-size: var(--font12Size);
+				}
+
+			}
+
+			.thr {
+				padding: 2vw;
+
+				.thr_1 {
+					display: flex;
+					font-size: var(--font14Size);
+					padding: 0 0 1vw 0;
+
+					.left {
+						padding: 0 1vw 0 0;
+						font-weight: bold;
+					}
+
+					.right {
+						color: var(--f85Color);
+
+						.text_1 {
+							font-size: var(--font14Size);
+							color: var(--f3CColor);
+						}
+					}
+				}
+			}
+
+			.four {
+				padding: 2vw;
+
+				.four_1 {
+					font-weight: bold;
+					font-size: var(--font16Size);
+					padding: 0 0 1vw 0;
+				}
+			}
+		}
+	}
+</style>

unpackage/dist/dev/mp-weixin/app.json

@@ -33,6 +33,10 @@
         "article/index",
         "info/index",
         "type/index",
+        "type/info",
+        "hotel/index",
+        "hotel/info",
+        "hotel/detail",
         "notice/index",
         "notice/detail"
       ]

unpackage/dist/dev/mp-weixin/pages/my/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniBadge: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 350))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 374))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesHome/hotel/detail.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "房间信息",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pagesHome/hotel/detail.wxss

@@ -0,0 +1,76 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main .one .swiper.data-v-38f4bfe6 {
+  height: 70vw;
+}
+.main .one .swiper .list .image.data-v-38f4bfe6 {
+  width: 100%;
+  height: 100%;
+}
+.main .bottom.data-v-38f4bfe6 {
+  position: absolute;
+  top: 65vw;
+  left: 0;
+  right: 0;
+  background-color: var(--mainColor);
+  border-radius: 20px;
+  padding: 2vw 0 0 0;
+}
+.main .bottom .two.data-v-38f4bfe6 {
+  padding: 4vw 2vw;
+}
+.main .bottom .two .two_1.data-v-38f4bfe6 {
+  padding: 1vw 0;
+  font-weight: bold;
+  font-size: var(--font16Size);
+}
+.main .bottom .two .two_2.data-v-38f4bfe6 {
+  color: var(--f85Color);
+  font-size: var(--font12Size);
+}
+.main .bottom .thr.data-v-38f4bfe6 {
+  padding: 2vw;
+}
+.main .bottom .thr .thr_1.data-v-38f4bfe6 {
+  display: flex;
+  font-size: var(--font14Size);
+  padding: 0 0 1vw 0;
+}
+.main .bottom .thr .thr_1 .left.data-v-38f4bfe6 {
+  padding: 0 1vw 0 0;
+  font-weight: bold;
+}
+.main .bottom .thr .thr_1 .right.data-v-38f4bfe6 {
+  color: var(--f85Color);
+}
+.main .bottom .thr .thr_1 .right .text_1.data-v-38f4bfe6 {
+  font-size: var(--font14Size);
+  color: var(--fF0Color);
+}
+.main .bottom .four.data-v-38f4bfe6 {
+  padding: 2vw;
+  margin: 0 0 15vw 0;
+}
+.main .bottom .four .four_1.data-v-38f4bfe6 {
+  font-weight: bold;
+  font-size: var(--font16Size);
+  padding: 0 0 1vw 0;
+}
+.main .foot.data-v-38f4bfe6 {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+.main .foot .button.data-v-38f4bfe6 {
+  display: flex;
+  justify-content: center;
+  background-color: var(--f3CColor);
+  padding: 4vw;
+}
+.main .foot .button text.data-v-38f4bfe6 {
+  font-size: var(--font16Size);
+  color: var(--mainColor);
+}
+

unpackage/dist/dev/mp-weixin/pagesHome/hotel/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "酒店民宿",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pagesHome/hotel/index.wxss

@@ -0,0 +1,85 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main.data-v-fde50d66 {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.main .one.data-v-fde50d66 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 2vw;
+}
+.main .one input.data-v-fde50d66 {
+  width: 100%;
+  padding: 2vw;
+  background-color: var(--f1Color);
+  font-size: var(--font14Size);
+  border-radius: 5px;
+}
+.main .two.data-v-fde50d66 {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+  margin: 2vw 0 0 0;
+}
+.main .two .list.data-v-fde50d66 {
+  display: flex;
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.main .two .list .image.data-v-fde50d66 {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 5px;
+}
+.main .two .list .list_1.data-v-fde50d66 {
+  width: 68vw;
+  padding: 0 0 0 2vw;
+}
+.main .two .list .list_1 .name.data-v-fde50d66 {
+  font-size: var(--font14Size);
+  font-weight: bold;
+  padding: 0 0 1vw 0;
+}
+.main .two .list .list_1 .other.data-v-fde50d66 {
+  font-size: var(--font12Size);
+  padding: 0 0 2px 0;
+}
+.main .two .list .list_1 .other text.data-v-fde50d66 {
+  color: #000;
+}
+.main .two .list .list_1 .other_1.data-v-fde50d66 {
+  color: red;
+}
+.main .two .list .list_1 .other_2.data-v-fde50d66 {
+  color: var(--f85Color);
+}
+.scroll-view.data-v-fde50d66 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view.data-v-fde50d66 {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom.data-v-fde50d66 {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text.data-v-fde50d66 {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pagesHome/hotel/info.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "详情",
+  "usingComponents": {
+    "uni-collapse": "/uni_modules/uni-collapse/components/uni-collapse/uni-collapse",
+    "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item"
+  }
+}

unpackage/dist/dev/mp-weixin/pagesHome/hotel/info.wxss

@@ -0,0 +1,135 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main .one .swiper.data-v-1041d103 {
+  height: 70vw;
+}
+.main .one .swiper .list .image.data-v-1041d103 {
+  width: 100%;
+  height: 100%;
+}
+.main .bottom.data-v-1041d103 {
+  position: absolute;
+  top: 65vw;
+  left: 0;
+  right: 0;
+  background-color: var(--mainColor);
+  border-radius: 20px;
+  padding: 2vw 0 0 0;
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.main .bottom .two.data-v-1041d103 {
+  padding: 4vw 2vw;
+}
+.main .bottom .two .two_1.data-v-1041d103 {
+  padding: 1vw 0;
+  font-weight: bold;
+  font-size: var(--font16Size);
+}
+.main .bottom .two .two_2.data-v-1041d103 {
+  color: var(--f85Color);
+  font-size: var(--font12Size);
+}
+.main .bottom .thr.data-v-1041d103 {
+  padding: 2vw;
+}
+.main .bottom .thr .thr_1.data-v-1041d103 {
+  display: flex;
+  font-size: var(--font14Size);
+  padding: 0 0 1vw 0;
+}
+.main .bottom .thr .thr_1 .left.data-v-1041d103 {
+  padding: 0 1vw 0 0;
+  font-weight: bold;
+}
+.main .bottom .thr .thr_1 .right.data-v-1041d103 {
+  color: var(--f85Color);
+}
+.main .bottom .thr .thr_1 .right .text_1.data-v-1041d103 {
+  font-size: var(--font14Size);
+  color: var(--f3CColor);
+}
+.main .bottom .four.data-v-1041d103 {
+  padding: 2vw;
+}
+.main .bottom .four.data-v-1041d103 .uni-collapse-item__title-box {
+  padding: 0 !important;
+}
+.main .bottom .four .four_1.data-v-1041d103 {
+  font-weight: bold;
+  font-size: var(--font16Size);
+  padding: 0 0 1vw 0;
+}
+.main .bottom .five.data-v-1041d103 {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+  margin: 2vw 0 0 0;
+}
+.main .bottom .five .list.data-v-1041d103 {
+  display: flex;
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.main .bottom .five .list .image.data-v-1041d103 {
+  width: 25vw;
+  height: 25vw;
+  border-radius: 5px;
+}
+.main .bottom .five .list .list_1.data-v-1041d103 {
+  width: 63vw;
+  padding: 0 0 0 2vw;
+}
+.main .bottom .five .list .list_1 .name.data-v-1041d103 {
+  font-size: var(--font14Size);
+  font-weight: bold;
+  padding: 0 0 1vw 0;
+}
+.main .bottom .five .list .list_1 .other.data-v-1041d103 {
+  font-size: var(--font12Size);
+  padding: 0 0 2px 0;
+}
+.main .bottom .five .list .list_1 .other text.data-v-1041d103 {
+  color: #000;
+}
+.main .bottom .five .list .list_1 .other_1.data-v-1041d103 {
+  color: red;
+}
+.main .bottom .five .list .list_1 .other_2.data-v-1041d103 {
+  color: var(--f85Color);
+}
+.main .bottom .five .list .list_1 .button.data-v-1041d103 {
+  text-align: right;
+}
+.main .bottom .five .list .list_1 .button button.data-v-1041d103 {
+  font-size: var(--font12Size);
+  background-color: var(--f3CColor);
+}
+.scroll-view.data-v-1041d103 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view.data-v-1041d103 {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom.data-v-1041d103 {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text.data-v-1041d103 {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pagesHome/notice/index.wxss

@@ -11,7 +11,7 @@
   position: relative;
   flex-grow: 1;
   background-color: var(--f9Color);
-  margin: 2vw 0 0 0;
+  padding: 2vw 0 0 0;
 }
 .main .one .list.data-v-46899e35 {
   background-color: var(--mainColor);

unpackage/dist/dev/mp-weixin/pagesHome/type/index.js

@@ -307,6 +307,12 @@ var _default = {
       that.clearPage();
       that.search();
     },
+    // 详情
+    toInfo: function toInfo(e) {
+      uni.navigateTo({
+        url: "/pagesHome/type/info?id=".concat(e.id || e._id)
+      });
+    },
     // 分页
     toPage: function toPage(e) {
       var that = this;

unpackage/dist/dev/mp-weixin/pagesHome/type/index.wxss

@@ -60,10 +60,6 @@
 }
 .main .two .list .list_1 .other_2.data-v-3031ac97 {
   color: var(--f85Color);
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  -o-text-overflow: ellipsis;
 }
 .scroll-view.data-v-3031ac97 {
   position: absolute;

unpackage/dist/dev/mp-weixin/pagesHome/type/info.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "详情",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pagesHome/type/info.wxss

@@ -0,0 +1,59 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main .one .swiper.data-v-ecf5e70e {
+  height: 70vw;
+}
+.main .one .swiper .list .image.data-v-ecf5e70e {
+  width: 100%;
+  height: 100%;
+}
+.main .bottom.data-v-ecf5e70e {
+  position: absolute;
+  top: 65vw;
+  left: 0;
+  right: 0;
+  background-color: var(--mainColor);
+  border-radius: 20px;
+  padding: 2vw 0 0 0;
+}
+.main .bottom .two.data-v-ecf5e70e {
+  padding: 4vw 2vw;
+}
+.main .bottom .two .two_1.data-v-ecf5e70e {
+  padding: 1vw 0;
+  font-weight: bold;
+  font-size: var(--font16Size);
+}
+.main .bottom .two .two_2.data-v-ecf5e70e {
+  color: var(--f85Color);
+  font-size: var(--font12Size);
+}
+.main .bottom .thr.data-v-ecf5e70e {
+  padding: 2vw;
+}
+.main .bottom .thr .thr_1.data-v-ecf5e70e {
+  display: flex;
+  font-size: var(--font14Size);
+  padding: 0 0 1vw 0;
+}
+.main .bottom .thr .thr_1 .left.data-v-ecf5e70e {
+  padding: 0 1vw 0 0;
+  font-weight: bold;
+}
+.main .bottom .thr .thr_1 .right.data-v-ecf5e70e {
+  color: var(--f85Color);
+}
+.main .bottom .thr .thr_1 .right .text_1.data-v-ecf5e70e {
+  font-size: var(--font14Size);
+  color: var(--f3CColor);
+}
+.main .bottom .four.data-v-ecf5e70e {
+  padding: 2vw;
+}
+.main .bottom .four .four_1.data-v-ecf5e70e {
+  font-weight: bold;
+  font-size: var(--font16Size);
+  padding: 0 0 1vw 0;
+}
+

unpackage/dist/dev/mp-weixin/pagesMy/account/index.js

@@ -146,7 +146,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 396));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 420));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesMy/article/add.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 357))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 381))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 370))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 394))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 377))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 401))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 384))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 408))
     },
   }
 } catch (e) {
@@ -183,7 +183,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 396));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 420));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesMy/opinion/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 357))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 381))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 370))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 394))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 377))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 401))
     },
   }
 } catch (e) {
@@ -176,7 +176,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 396));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 420));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.wxss

@@ -0,0 +1,107 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-collapse-item {
+  box-sizing: border-box;
+}
+.uni-collapse-item__title {
+  display: flex;
+  width: 100%;
+  box-sizing: border-box;
+  flex-direction: row;
+  align-items: center;
+  transition: border-bottom-color .3s;
+}
+.uni-collapse-item__title-wrap {
+  width: 100%;
+  flex: 1;
+}
+.uni-collapse-item__title-box {
+  padding: 0 15px;
+  display: flex;
+  width: 100%;
+  box-sizing: border-box;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 48px;
+  line-height: 48px;
+  background-color: #fff;
+  color: #303133;
+  font-size: 13px;
+  font-weight: 500;
+}
+.uni-collapse-item__title-box.is-disabled .uni-collapse-item__title-text {
+  color: #999;
+}
+.uni-collapse-item__title.uni-collapse-item-border {
+  border-bottom: 1px solid #ebeef5;
+}
+.uni-collapse-item__title.is-open {
+  border-bottom-color: transparent;
+}
+.uni-collapse-item__title-img {
+  height: 22px;
+  width: 22px;
+  margin-right: 10px;
+}
+.uni-collapse-item__title-text {
+  flex: 1;
+  font-size: 14px;
+  white-space: nowrap;
+  color: inherit;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.uni-collapse-item__title-arrow {
+  display: flex;
+  box-sizing: border-box;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  margin-right: 10px;
+  -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+}
+.uni-collapse-item__title-arrow-active {
+  -webkit-transform: rotate(-180deg);
+          transform: rotate(-180deg);
+}
+.uni-collapse-item__wrap {
+  will-change: height;
+  box-sizing: border-box;
+  background-color: #fff;
+  overflow: hidden;
+  position: relative;
+  height: 0;
+}
+.uni-collapse-item__wrap.is--transition {
+  transition-property: height, border-bottom-width;
+  transition-duration: 0.3s;
+  will-change: height;
+}
+.uni-collapse-item__wrap-content {
+  position: absolute;
+  font-size: 13px;
+  color: #303133;
+  border-bottom-color: transparent;
+  border-bottom-style: solid;
+  border-bottom-width: 0;
+}
+.uni-collapse-item__wrap-content.uni-collapse-item--border {
+  border-bottom-width: 1px;
+  border-bottom-color: red;
+  border-bottom-color: #ebeef5;
+}
+.uni-collapse-item__wrap-content.open {
+  position: relative;
+}
+.uni-collapse-item--animation {
+  transition-property: -webkit-transform;
+  transition-property: transform;
+  transition-property: transform, -webkit-transform;
+  transition-duration: 0.3s;
+  transition-timing-function: ease;
+}
+

unpackage/dist/dev/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.wxml

@@ -0,0 +1 @@
+<view class="uni-collapse"><slot></slot></view>

unpackage/dist/dev/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.wxss

@@ -0,0 +1,10 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-collapse {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+}
+