fix

virgo.wzfrontend/console/src/App.vue

@@ -26,6 +26,6 @@
 	};
 </script>
 <style lang="scss">
-	@import './assets/scss/index.scss';
+	@import './assets/scss/index.scss';
 	@import './assets/scss/tips.scss';
 </style>

virgo.wzfrontend/console/src/components/website/houseList.vue

@@ -3,8 +3,7 @@
 		<el-empty description="暂无房源" v-if="houseList.length === 0"></el-empty>
 		<div class="house-list-box" v-else>
 			<div class="house-list">
-				<div class="house-item" v-for="house in houseList" :key="house.id"
-					@click="$router.push('/website/homeDetail?id=' + encrypt(house.id))">
+				<div class="house-item" v-for="house in houseList" :key="house.id" @click="clickHouse(house)">
 					<div class="house-item-image">
 						<img :src="imageUrl(house.showPicture)" :alt="house.name" />
 					</div>
@@ -24,7 +23,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="pagination">
+			<div class="pagination" v-if="type === 'highseas'">
 				<el-pagination background layout="prev, pager, next" :page-size="pageSize" :current-page="currPage"
 					:total="totalCount" @current-change="changePage">
 				</el-pagination>
@@ -35,7 +34,8 @@
 
 <script>
 	import {
-		getOpenHouseListByPage
+		getOpenHouseListByPage,
+		search
 	} from '@/httpApi/space';
 	import Crypto from '@/uitls/crypto'
 	export default {
@@ -54,19 +54,28 @@
 		methods: {
 			init() {
 				if (this.type === 'highseas') {
-					if (!this.$store.getters.city || !this.$store.getters.city.cityCode) return;
-					getOpenHouseListByPage({
-						currPage: this.currPage,
-						pageSize: this.pageSize,
-						addressCode: this.$store.getters.city.cityCode
-					}).then(res => {
+					this.initHighSeas();
+				} else if (this.type === 'search') {
+					search(this.$route.query.value).then(res => {
 						if (res.state) {
-							this.houseList = res.data.dataList;
-							this.totalCount = res.data.totalCount;
+							this.houseList = res.data.houseList
 						}
 					})
 				}
 			},
+			initHighSeas() {
+				if (!this.$store.getters.city || !this.$store.getters.city.cityCode) return;
+				getOpenHouseListByPage({
+					currPage: this.currPage,
+					pageSize: this.pageSize,
+					addressCode: this.$store.getters.city.cityCode
+				}).then(res => {
+					if (res.state) {
+						this.houseList = res.data.dataList;
+						this.totalCount = res.data.totalCount;
+					}
+				})
+			},
 			changePage(page) {
 				this.currPage = page;
 				this.init();
@@ -75,8 +84,9 @@
 				if (!data) return 'https://assets.api.uizard.io/api/cdn/stream/c05650d2-192b-4a56-ae97-05638f53804c.png';
 				return JSON.parse(data)[0].url;
 			},
-			encrypt(text) {
-				return Crypto.AES.encrypt(String(text), 'bosshand');
+			clickHouse(item) {
+				let id = Crypto.AES.encrypt(String(item.id), 'bosshand');
+				this.$router.push('/website/homeDetail?id=' + encodeURIComponent(id));
 			}
 		}
 	}

virgo.wzfrontend/console/src/components/website/reservation.vue

@@ -0,0 +1,68 @@
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-form ref="form" label-position="top" :model="form">
+				<el-form-item label="姓名" prop="name" :rules="[{required: true, message: '请输入姓名'}]">
+					<el-input type="text" v-model="form.name" placeholder="请输入姓名" disabled></el-input>
+				</el-form-item>
+				<el-form-item label="联系方式" prop="phone" :rules="[{required: true, message: '请选择联系方式'}]">
+					<el-input type="text" v-model="form.phone" placeholder="请输入联系方式" disabled></el-input>
+				</el-form-item>
+				<el-form-item label="预约时间" prop="date" :rules="[{required: true, message: '请选择预约时间'}]">
+					<el-date-picker v-model="form.date" type="date" placeholder="预约时间">
+					</el-date-picker>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="hui-dialog-submit">
+			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
+			<el-button size="medium" type="primary" @click="submit">保 存</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		insertReservation
+	} from '@/httpApi/space'
+	export default {
+		props: ['houseId'],
+		data() {
+			return {
+				form: {
+					name: '',
+					phone: '',
+					date: ''
+				}
+			}
+		},
+		created() {
+			this.form['date'] = this.$dayjs().format('YYYY-MM-DD');
+			this.form['name'] = this.$store.getters.user.userName;
+			this.form['phone'] = this.$store.getters.user.phone;
+		},
+		methods: {
+			submit() {
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						insertReservation({
+							userId: this.$store.getters.user.userId,
+							projectItemTargetRoomId: this.houseId,
+							date: this.form.date
+						}).then(res => {
+							if (res.state) {
+								this.$message.success('预约成功');
+								this.$emit('callback');
+							}
+						})
+					} else {
+						return false;
+					}
+				});
+			}
+		},
+	}
+</script>
+
+<style>
+</style>

virgo.wzfrontend/console/src/httpApi/space.js

@@ -331,7 +331,7 @@ export function getBimViewToken(fileId) {
 		url: `/api/bim/viewToken/${fileId}`,
 		method: 'get',
 	});
-}
+}
 /* 
  * 获取项目列表
  * 
@@ -341,7 +341,7 @@ export function getProjectListByIdentity() {
 		url: `/api/project/projectListIdentity`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 获取空间层级关系
  * 
@@ -352,7 +352,7 @@ export function getProjectTreeList(projectId) {
 		url: `/api/project/getProject/${projectId}`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 获取公海
  * 
@@ -364,4 +364,27 @@ export function getOpenHouseListByPage(data) {
 		method: 'post',
 		data: data
 	})
+}
+/* 
+ * 搜索房源
+ * 
+ * 
+ */
+export function search(keyWord) {
+	return request({
+		url: `/api/projectItemTargetRoom/query/${keyWord}`,
+		method: 'get'
+	})
+}
+/* 
+ * 新增看房预约
+ * 
+ * 
+ */
+export function insertReservation(data) {
+	return request({
+		url: '/api/roomOperation/reservation',
+		method: 'post',
+		data: data
+	})
 }

virgo.wzfrontend/console/src/layout/website.vue

@@ -90,6 +90,10 @@
 						this.$store.dispatch('app/changeEvent', {
 							type: 'homeDetailReload'
 						})
+					} else if (this.$route.path == '/website/search') {
+						this.$store.dispatch('app/changeEvent', {
+							type: 'searchReload'
+						})
 					}
 					this.init();
 				}
@@ -108,7 +112,8 @@
 		},
 		computed: {
 			key() {
-				if (this.$route.path != '/website/home' && !getToken()) this.login();
+				if ((this.$route.path == '/website/homeDetail' || this.$route.path == '/website/search') && !getToken())
+					this.login();
 				return this.$route.path;
 			},
 			...mapGetters(['event'])
@@ -129,6 +134,7 @@
 <style lang="scss">
 	.website-layout {
 		width: 100%;
+		position: relative;
 
 		.login-toggle {
 			position: fixed;
@@ -141,9 +147,10 @@
 		}
 
 		.layout-title {
-			position: fixed;
+			position: absolute;
+			width: 100%;
+			min-width: 1200px;
 			left: 0;
-			right: 0;
 			top: 0;
 			height: 60px;
 			color: #fff;
@@ -157,6 +164,7 @@
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
+
 			}
 
 			.title-logo {

virgo.wzfrontend/console/src/views/website/city.vue

@@ -83,7 +83,7 @@
 
 <style lang="scss">
 	.city-index {
-		padding-top: 65px;
+		padding-top: 60px;
 		color: #000;
 
 		.container {

virgo.wzfrontend/console/src/views/website/home.vue

@@ -6,8 +6,8 @@
 				<div class="main-title">有极-寻找合适的房源</div>
 				<div class="main-sub-title">方便、快捷、精准</div>
 				<div class="main-input">
-					<input type="text" placeholder="请输入房源名称" />
-					<div class="main-input-button">
+					<input v-model="value" type="text" placeholder="请输入房源名称" />
+					<div class="main-input-button" @click="$router.push('/website/search?value=' + value)">
 						<i class="el-icon-search"></i>
 					</div>
 				</div>
@@ -26,7 +26,9 @@
 	import houseFoot from "@/components/website/houseFoot.vue"
 	export default {
 		data() {
-			return {}
+			return {
+				value: ''
+			}
 		},
 		created() {
 

virgo.wzfrontend/console/src/views/website/homeDetail.vue

@@ -25,7 +25,7 @@
 							<div>
 								<span class="average alibaba">{{detail.price}}</span><span class="unit">元/月</span>
 							</div>
-							<div class="hui-button">预约看房</div>
+							<div class="hui-button" @click="reservation">预约看房</div>
 						</div>
 						<div class="content-title">基本信息</div>
 						<div class="information-list">
@@ -99,6 +99,9 @@
 			</div>
 		</div>
 		<house-foot></house-foot>
+		<el-dialog title="预约看房" :visible.sync="visible" width="900px" :append-to-body="true">
+			<reservation v-if="visible" @callback="visible = false"></reservation>
+		</el-dialog>
 	</div>
 </template>
 
@@ -118,6 +121,7 @@
 	import {
 		mapGetters
 	} from 'vuex';
+	import reservation from '@/components/website/reservation';
 	export default {
 		data() {
 			return {
@@ -125,7 +129,8 @@
 				swiperList: [],
 				detail: {},
 				detailId: '',
-				description: '无房源信息'
+				description: '无房源信息',
+				visible: false
 			};
 		},
 		mounted() {
@@ -135,7 +140,7 @@
 		methods: {
 			init() {
 				if (!getToken()) return this.description = '请登录后查看';
-				this.detailId = Crypto.AES.decrypt(this.$route.query.id, 'bosshand');
+				this.detailId = Crypto.AES.decrypt(decodeURIComponent(this.$route.query.id), 'bosshand');
 				if (!this.detailId) return this.description = '无房源信息';
 				this.getDetail();
 			},
@@ -190,10 +195,14 @@
 				this.$store.dispatch('app/changeEvent', {
 					type: 'login'
 				})
+			},
+			reservation() {
+				this.visible = true;
 			}
 		},
 		components: {
-			houseFoot
+			houseFoot,
+			reservation
 		},
 		computed: {
 			...mapGetters(['event'])
@@ -212,6 +221,19 @@
 		padding-top: 60px;
 		color: #000;
 
+		.login-toggle {
+			position: fixed;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			z-index: 998;
+			background: rgba(0, 0, 0, 0.5);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
 		.title {
 			font-size: 30px;
 			font-weight: bolder;

virgo.wzfrontend/console/src/views/website/search.vue

@@ -1,10 +1,18 @@
 <template>
 	<div class="search-list">
-		<div class="container" style="margin-bottom: 30px;">
-			<div class="title">搜索“aa”结果</div>
-			<div class="search-list-box">
-				<house-list></house-list>
-				<!-- <el-empty description="暂无房源"></el-empty> -->
+		<div class="container">
+			<div class="container-box" v-if="token">
+				<div class="title">搜索“aa”结果</div>
+				<div class="search-list-box">
+					<house-list type="search" :key="reload"></house-list>
+				</div>
+			</div>
+			<div class="skeleton-box" v-else>
+				<el-empty description="请登录后查看">
+					<span class="color-blue" style="cursor: pointer;" @click="login">
+						点击登录>>
+					</span>
+				</el-empty>
 			</div>
 		</div>
 		<house-foot></house-foot>
@@ -14,16 +22,47 @@
 <script>
 	import houseList from "@/components/website/houseList.vue"
 	import houseFoot from "@/components/website/houseFoot.vue"
+	import {
+		getToken
+	} from '@/uitls/auth'
+	import {
+		mapGetters
+	} from 'vuex';
 	export default {
 		data() {
 			return {
-
+				token: '',
+				reload: false
+			}
+		},
+		created() {
+			this.token = getToken();
+			this.init();
+		},
+		methods: {
+			init() {
+				if (!this.token) return;
+				this.reload = !this.reload;
+			},
+			login() {
+				this.$store.dispatch('app/changeEvent', {
+					type: 'login'
+				})
 			}
 		},
 		components: {
 			houseList,
 			houseFoot
 		},
+		computed: {
+			...mapGetters(['event'])
+		},
+		watch: {
+			event() {
+				let event = this.$store.getters.event;
+				if (event.type == 'searchReload') this.init();
+			}
+		}
 	}
 </script>
 
@@ -36,16 +75,13 @@
 			font-size: 30px;
 			font-weight: bolder;
 			line-height: 30px;
-			margin: 20px 0;
+			padding: 20px 0;
 		}
 
 		.container {
 			width: 1200px;
 			margin: 0 auto;
-		}
-
-		.search-list-box {
-			min-height: calc(100vh - 217px);
+			min-height: calc(100vh - 117px);
 		}
 	}
 </style>