fix

virgo.wzfrontend/console/src/components/common/tag.vue

@@ -15,7 +15,6 @@
 
 <script>
 	import {
-		getTagList,
 		insertTag,
 		updateTag,
 		deleteTag,

virgo.wzfrontend/console/src/components/system/field/edit.vue

@@ -0,0 +1,82 @@
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-form ref="form" :model="form" label-position="top">
+				<el-form-item label="标签名称">
+					<el-input v-model="form.name"></el-input>
+				</el-form-item>
+				<el-form-item label="所属城市">
+					<el-cascader :props="propsOption" :options="mapDatas" separator="-" v-model="address"
+						:placeholder="'请选择地址'">
+					</el-cascader>
+				</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 mapData from '@/uitls/map.js';
+	import {
+		insertTag,
+		updateTag
+	} from '@/httpApi/space'
+	import {
+		findParentLabel
+	} from '@/uitls'
+	export default {
+		props: ['isUpdate', 'detail'],
+		data() {
+			return {
+				propsOption: {
+					label: 'value',
+					value: 'label'
+				},
+				mapDatas: [],
+				form: {
+					name: '',
+					code: ''
+				},
+				address: []
+			}
+		},
+		created() {
+			this.mapDatas = this.getCityName(mapData.data);
+			if (this.isUpdate) {
+				this.form = JSON.parse(JSOn.stringify(this.detail));
+				this.address = findParentLabel(this.mapDatas, this.form.code);
+			}
+		},
+		methods: {
+			getCityName(data) {
+				let result = JSON.parse(JSON.stringify(data));
+				for (let firstLayer of result) {
+					if (firstLayer.children) {
+						for (let secondLayer of firstLayer.children) {
+							delete secondLayer.children;
+						}
+					}
+				}
+				return result;
+			},
+			submit() {
+				this.form['code'] = this.address[this.address.length - 1];
+				this.isUpdate ? updateTag(this.form).then(this.successFunc) : insertTag(this.form).then(this.successFunc);
+			},
+			successFunc(res) {
+				if (res.state) {
+					this.$message.success('操作成功');
+					this.$emit('callback', 'init');
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+</style>

virgo.wzfrontend/console/src/router/modules/system.js

@@ -22,6 +22,13 @@ const system = [{
 		meta: {
 			title: '角色设置'
 		}
+	}, {
+		path: 'field',
+		component: () => import('@/views/system/field'),
+		name: '标签设置',
+		meta: {
+			title: '标签设置'
+		}
 	}]
 }]
 export default system;

virgo.wzfrontend/console/src/uitls/index.js

@@ -300,6 +300,39 @@ export function findParentIds(dataSource, nodeId) {
 	parentIds.push(nodeId);
 	return parentIds; // 返回所有父节点ID的数组
 }
+/**
+ * 根据树子节点ID查找所有父节点ID
+ * @param {array} dataSource 树形结构数据源
+ * @param {number} nodeId 子节点ID
+ * @returns {array} 包含所有父节点ID的数组，按照从根节点到直接父节点的顺序排序
+ */
+export function findParentLabel(dataSource, nodeId) {
+	const parentIds = []; // 用于存储所有父节点ID的数组
+
+	// 定义一个递归函数，用于遍历整棵树并查找子节点的所有父节点
+	function traverse(node, nodeId) {
+		if (node.label === nodeId) { // 如果当前节点的ID等于子节点的ID，则表示已经找到了子节点，可以开始向上查找父节点
+			return true; // 返回true表示已经找到了子节点
+		}
+		if (node.children) { // 如果当前节点有子节点，则继续遍历子节点
+			for (const childNode of node.children) {
+				if (traverse(childNode, nodeId)) { // 如果在子节点中找到了子节点的父节点，则将当前节点的ID添加到父节点ID数组中，并返回true表示已经找到了子节点
+					parentIds.unshift(node.label);
+					return true;
+				}
+			}
+		}
+		return false; // 如果当前节点不是子节点的父节点，则返回false
+	}
+	// 从根节点开始遍历整棵树，并调用递归函数查找子节点的所有父节点
+	for (const node of dataSource) {
+		if (traverse(node, nodeId)) { // 如果在当前节点的子树中找到了子节点的父节点，则直接退出循环
+			break;
+		}
+	}
+	parentIds.push(nodeId);
+	return parentIds; // 返回所有父节点ID的数组
+}
 
 /**
  * 获取所有子集

virgo.wzfrontend/console/src/views/system/field.vue

@@ -0,0 +1,152 @@
+<template>
+	<div class="hui-flex hui-content">
+		<div class="hui-flex-box hui-flex hui-table">
+			<div class="hui-content-insert">
+				<el-button type="primary" size="medium" @click="insertTag">新增标签</el-button>
+			</div>
+			<div class="hui-flex-box">
+				<el-table :data="tableData" row-key="id" border height="100%">
+					<el-table-column label="序号" width="50">
+						<template slot-scope="scope">
+							<div style="text-align: center;">{{scope.$index + 1}}</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="标签名称" prop="name"></el-table-column>
+					<el-table-column label="城市编码" prop="code"></el-table-column>
+					<el-table-column label="操作" width="150">
+						<template slot-scope="scope">
+							<div class="hui-table-operation">
+								<span class="table-operation" @click="updateTag(scope.row)">编辑</span>
+								<span class="table-operation" @click="deleteTag(scope.row)">删除</span>
+							</div>
+						</template>
+					</el-table-column>
+					<template slot="empty">
+						<empty description="暂无数据"></empty>
+					</template>
+				</el-table>
+			</div>
+		</div>
+		<el-dialog :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px" :append-to-body="true">
+			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detail="detail"></edit>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		deleteTag,
+		getTagList
+	} from '@/httpApi/space'
+	import edit from '@/components/system/field/edit'
+	export default {
+		name: 'tag',
+		data() {
+			return {
+				tableData: [],
+				visible: false,
+				map: [],
+				isUpdate: false,
+				detail: {}
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				getTagList(0).then(res => {
+					if (res.state) {
+						this.tableData = res.data;
+					}
+				})
+			},
+			insertTag() {
+				this.visible = true;
+				this.isUpdate = false;
+			},
+			updateTag(item) {
+				this.detail = item;
+				this.visible = true;
+				this.isUpdate = true;
+			},
+			deleteTag(item) {
+				this.$confirm('确定要删除该标签?', () => {
+					deleteTag(item.id).then(res => {
+						if (res.state) {
+							this.init();
+							this.$message.success('操作成功');
+						}
+					})
+				});
+			},
+			callback(type) {
+				if (type === 'init') this.init();
+				this.visible = false;
+			}
+		},
+		components: {
+			edit
+		},
+	}
+</script>
+
+<style lang="scss">
+	.tag-set {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 20px;
+
+		.target-item {
+			display: flex;
+			height: 28px;
+			align-items: center;
+			margin: 5px 0;
+			margin-right: 15px;
+			background: #46577a;
+			border-radius: 15px;
+			padding: 0 15px;
+
+			.label {
+				font-size: 12px;
+			}
+
+			.iconfont {
+				margin-left: 10px;
+				font-size: 12px;
+			}
+
+			.huifont-bianji {
+				font-size: 18px;
+			}
+
+			&.active {
+				background: $--color-primary;
+				color: #fff;
+			}
+
+			&.add {
+				cursor: pointer;
+			}
+		}
+
+		.target-item-insert {
+			cursor: pointer;
+			background: transparent;
+			border: 1px solid #7383ad;
+			color: #7383ad;
+
+			.iconfont {
+				margin-left: 0;
+				margin-right: 10px;
+			}
+		}
+
+		.target-item-insert:hover {
+			border-color: $--color-primary;
+			color: $--color-primary;
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/main.js

@@ -25,7 +25,7 @@ Vue.prototype.$navigateTo = (url) => {
 		url: url
 	})
 }
-
+Vue.prototype.$navigateBack = uni.navigateBack;
 import field from './config/field.js'
 Vue.prototype.$field = field;
 

virgo.wzfrontend/yui_wx/pages.json

@@ -1,10 +1,15 @@
 {
 	"pages": [{
-			"path": "pages/index/index",
+			"path": "pages/highseas/highseas",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTitleText": ""
 			}
+		}, {
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "工作台"
+			}
 		},
 		{
 			"path": "pages/login/login",
@@ -17,8 +22,68 @@
 			"style": {
 				"navigationBarTitleText": "选择城市"
 			}
+		},
+		{
+			"path": "pages/message/message",
+			"style": {
+				"navigationBarTitleText": "消息"
+			}
+		},
+		{
+			"path": "pages/data/data",
+			"style": {
+				"navigationBarTitleText": "数据"
+			}
+		},
+		{
+			"path": "pages/my/my",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		},
+		{
+			"path": "pages/search/search",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
 		}
 	],
+	"tabBar": {
+		"color": "#8c8c8c",
+		"selectedColor": "#08979c",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/image/tabbar/index.png",
+				"selectedIconPath": "static/image/tabbar/index-active.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/message/message",
+				"iconPath": "static/image/tabbar/index.png",
+				"selectedIconPath": "static/image/tabbar/index-active.png",
+				"text": "消息"
+			},
+			{
+				"pagePath": "pages/highseas/highseas",
+				"iconPath": "static/image/tabbar/index.png",
+				"selectedIconPath": "static/image/tabbar/index-active.png",
+				"text": "公海"
+			},
+			{
+				"pagePath": "pages/data/data",
+				"iconPath": "static/image/tabbar/index.png",
+				"selectedIconPath": "static/image/tabbar/index-active.png",
+				"text": "数据"
+			},
+			{
+				"pagePath": "pages/my/my",
+				"iconPath": "static/image/tabbar/index.png",
+				"selectedIconPath": "static/image/tabbar/index-active.png",
+				"text": "我的"
+			}
+		]
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "有极智慧园区",

virgo.wzfrontend/yui_wx/pages/data/data.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/yui_wx/pages/highseas/highseas.vue

@@ -0,0 +1,163 @@
+<template>
+	<view class="high-seas-container">
+		<navbar>
+			<view class="nav">
+				<view class="nav-city" @click="$navigateTo('/pages/city/city?activeCity='+JSON.stringify(activeCity))">
+					<uni-icons class="city-icon" type="location-filled" size="16"></uni-icons>
+					<text class="city-name">{{activeCity.cityName}}</text>
+				</view>
+				<view class="nav-search" @click="$navigateTo('/pages/search/search')"
+					:style="'height:' + boundingClientRect.height + 'px;border-radius:' + boundingClientRect.height + 'px;line-height:'+(boundingClientRect.height-2)+'px'">
+					搜索房源或项目
+				</view>
+				<view class="wx-operation"
+					:style="'width:' + boundingClientRect.width + 'px;height:'+ boundingClientRect.height+'px;'">
+				</view>
+			</view>
+		</navbar>
+		<mescroll-body :top="getNavBarHeight()" bottom="20" @init="mescrollInit" @down="downCallback" @up="upCallback" :option="{ }">
+			<view class="house-list">
+				<house-item v-for="(item,index) in list" :house="item" :key="item.id"></house-item>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import navbar from "@/components/common/navbar.vue";
+	import houseItem from "@/components/house/houseItem.vue";
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import {
+		getOpenHouseListByPage
+	} from '@/request/api/house.js'
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		data() {
+			return {
+				boundingClientRect: {},
+				list: [],
+				activeCity: {
+					cityName: '上海市',
+					cityCode: '310100'
+				},
+			}
+		},
+		onShow() {
+			this.boundingClientRect = wx.getMenuButtonBoundingClientRect();
+		},
+		onLoad() {
+			uni.$on('changeCity', data => {
+				this.activeCity = data;
+			})
+		},
+		methods: {
+			// 获取状态栏高度
+			geStatusBarHeight() {
+				return uni.getSystemInfoSync()['statusBarHeight']
+			},
+			// 获取导航栏高度
+			getNavBarHeight() {
+				// #ifdef MP-WEIXIN
+				let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+				// 导航栏高度 = 胶囊高度 + 上间距 + 下间距 + 微调	（menuButtonInfo.top - uni.getSystemInfoSync()['statusBarHeight'] = 上间距）	        
+				let navbarHeight = menuButtonInfo.height + (menuButtonInfo.top - uni.getSystemInfoSync()[
+					'statusBarHeight']) * 2 + 2
+				// #endif
+				// #ifdef APP-PLUS || H5
+				let navbarHeight = 44
+				// #endif
+				return (navbarHeight + this.geStatusBarHeight()) * 2;
+			},
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback(page) {
+				getOpenHouseListByPage({
+					currPage: page.num,
+					pageSize: 10
+				}).then(res => {
+					if (res.code === 200) {
+						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
+						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(res.data.dataList); //追加新数据
+					} else {
+						this.mescroll.endErr();
+					}
+				}).catch(() => {
+					//联网失败, 结束加载
+					this.mescroll.endErr();
+				})
+			}
+		},
+		components: {
+			navbar,
+			houseItem
+		}
+	}
+</script>
+
+<style lang="scss">
+	.high-seas-container {
+		.nav {
+			height: 100%;
+			background: #fff;
+			width: 100%;
+			display: flex;
+			align-items: center;
+
+			.nav-city {
+				height: 50rpx;
+				max-width: 160rpx;
+				min-width: 120rpx;
+				border-radius: 50rpx;
+				border: 1px solid $uni-primary;
+				margin-left: 30rpx;
+				box-sizing: border-box;
+				display: flex;
+				align-items: center;
+				margin-bottom: 4rpx;
+
+				.city-icon {
+					margin-left: 10rpx;
+					margin-top: 4rpx;
+
+					.uni-icons {
+						color: $uni-primary !important;
+					}
+				}
+
+				.city-name {
+					color: $uni-primary;
+					font-size: 24rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					padding: 0 20rpx 0 6rpx;
+				}
+			}
+
+			.nav-search {
+				flex: 1;
+				width: 0;
+				border: 1px solid $uni-border-1;
+				line-height: 1;
+				padding-left: 30rpx;
+				color: $uni-secondary-color;
+				margin: 0 20rpx;
+				box-sizing: border-box;
+				margin-bottom: 4rpx;
+				font-weight: 200;
+				height: 64rpx;
+				border-radius: 64rpx;
+				line-height: 60rpx;
+			}
+
+			.wx-operation {
+				margin-right: 8px;
+				margin-bottom: 4rpx;
+			}
+		}
+
+		.house-list {
+			padding: 30rpx;
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/pages/index/index.vue

@@ -1,160 +1,13 @@
 <template>
-	<view class="high-seas-container">
-		<navbar>
-			<view class="nav">
-				<view class="nav-city" @click="$navigateTo('/pages/city/city?activeCity='+JSON.stringify(activeCity))">
-					<uni-icons class="city-icon" type="location-filled" size="16"></uni-icons>
-					<text class="city-name">{{activeCity.cityName}}</text>
-				</view>
-				<view class="nav-search"
-					:style="'height:' + boundingClientRect.height + 'px;border-radius:' + boundingClientRect.height + 'px;line-height:'+(boundingClientRect.height-2)+'px'">
-					搜索房源或项目
-				</view>
-				<view class="wx-operation"
-					:style="'width:' + boundingClientRect.width + 'px;height:'+ boundingClientRect.height+'px;'">
-				</view>
-			</view>
-		</navbar>
-		<mescroll-body :top="getNavBarHeight()" bottom="20" @init="mescrollInit" @down="downCallback" @up="upCallback">
-			<view class="house-list">
-				<house-item v-for="(item,index) in list" :house="item" :key="item.id"></house-item>
-			</view>
-		</mescroll-body>
+	<view class="index">
+		
 	</view>
 </template>
 
 <script>
-	import navbar from "@/components/common/navbar.vue";
-	import houseItem from "@/components/house/houseItem.vue";
-	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
-	import {
-		getOpenHouseListByPage
-	} from '@/request/api/house.js'
-	export default {
-		mixins: [MescrollMixin], // 使用mixin
-		data() {
-			return {
-				boundingClientRect: {},
-				list: [],
-				activeCity: {
-					cityName: '上海市',
-					cityCode: '310100'
-				},
-			}
-		},
-		onShow() {
-			this.boundingClientRect = wx.getMenuButtonBoundingClientRect();
-		},
-		onLoad() {
-			uni.$on('changeCity', data => {
-				this.activeCity = data;
-			})
-		},
-		methods: {
-			// 获取状态栏高度
-			geStatusBarHeight() {
-				return uni.getSystemInfoSync()['statusBarHeight']
-			},
-			// 获取导航栏高度
-			getNavBarHeight() {
-				// #ifdef MP-WEIXIN
-				let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-				// 导航栏高度 = 胶囊高度 + 上间距 + 下间距 + 微调	（menuButtonInfo.top - uni.getSystemInfoSync()['statusBarHeight'] = 上间距）	        
-				let navbarHeight = menuButtonInfo.height + (menuButtonInfo.top - uni.getSystemInfoSync()[
-					'statusBarHeight']) * 2 + 2
-				// #endif
-				// #ifdef APP-PLUS || H5
-				let navbarHeight = 44
-				// #endif
-				return (navbarHeight + this.geStatusBarHeight()) * 2;
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback(page) {
-				getOpenHouseListByPage({
-					currPage: page.num,
-					pageSize: 10
-				}).then(res => {
-					if (res.code === 200) {
-						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);
-						if (page.num == 1) this.list = []; //如果是第一页需手动制空列表
-						this.list = this.list.concat(res.data.dataList); //追加新数据
-					} else {
-						this.mescroll.endErr();
-					}
-				}).catch(() => {
-					//联网失败, 结束加载
-					this.mescroll.endErr();
-				})
-			}
-		},
-		components: {
-			navbar,
-			houseItem
-		}
-	}
+	
 </script>
 
 <style lang="scss">
-	.high-seas-container {
-		.nav {
-			height: 100%;
-			background: #fff;
-			width: 100%;
-			display: flex;
-			align-items: center;
-
-			.nav-city {
-				height: 50rpx;
-				max-width: 160rpx;
-				min-width: 120rpx;
-				border-radius: 50rpx;
-				border: 1px solid $uni-primary;
-				margin-left: 30rpx;
-				box-sizing: border-box;
-				display: flex;
-				align-items: center;
-				margin-bottom: 4rpx;
-
-				.city-icon {
-					margin-left: 10rpx;
-					margin-top: 4rpx;
-
-					.uni-icons {
-						color: $uni-primary !important;
-					}
-				}
-
-				.city-name {
-					color: $uni-primary;
-					font-size: 24rpx;
-					overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					padding: 0 20rpx 0 6rpx;
-				}
-			}
-
-			.nav-search {
-				flex: 1;
-				width: 0;
-				border: 1px solid $uni-border-1;
-				line-height: 1;
-				padding-left: 30rpx;
-				color: $uni-secondary-color;
-				margin: 0 20rpx;
-				box-sizing: border-box;
-				margin-bottom: 4rpx;
-				font-weight: 200;
-			}
-
-			.wx-operation {
-				margin-right: 8px;
-				margin-bottom: 4rpx;
-			}
-		}
-
-		.house-list {
-			padding: 30rpx;
-		}
-	}
+	.high-seas-container {}
 </style>

virgo.wzfrontend/yui_wx/pages/message/message.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/yui_wx/pages/my/my.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

virgo.wzfrontend/yui_wx/pages/search/search.vue

@@ -0,0 +1,139 @@
+<template>
+	<view class="search-container">
+		<navbar>
+			<view class="nav">
+				<view class="nav-back" @click="$navigateBack()">
+					<uni-icons type="left" size="20"></uni-icons>
+				</view>
+				<view class="nav-search"
+					:style="'height:' + boundingClientRect.height + 'px;border-radius:' + boundingClientRect.height + 'px;line-height:'+(boundingClientRect.height-2)+'px'">
+					请输入房源名称或项目名称
+				</view>
+				<view class="wx-operation"
+					:style="'width:' + boundingClientRect.width + 'px;height:'+ boundingClientRect.height+'px;'">
+				</view>
+			</view>
+		</navbar>
+		<view class="search-tag" :style="'margin-top: '+getNavBarHeight()+'rpx;'">
+			<view class="tag-title">标签列表</view>
+			<view class="tag-list">
+				<view class="tag-item">
+					标签1
+				</view>
+				<view class="tag-item">
+					标签2
+				</view>
+				<view class="tag-item">
+					标签3
+				</view>
+			</view>
+			<view class="tag-title">历史搜索</view>
+			<view class="tag-list">
+				<view class="tag-item">
+					维绿大厦
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import navbar from "@/components/common/navbar.vue";
+	export default {
+		data() {
+			return {
+				boundingClientRect: {}
+			}
+		},
+		onShow() {
+			this.boundingClientRect = wx.getMenuButtonBoundingClientRect();
+		},
+		methods: {
+			// 获取状态栏高度
+			geStatusBarHeight() {
+				return uni.getSystemInfoSync()['statusBarHeight']
+			},
+			// 获取导航栏高度
+			getNavBarHeight() {
+				// #ifdef MP-WEIXIN
+				let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+				// 导航栏高度 = 胶囊高度 + 上间距 + 下间距 + 微调	（menuButtonInfo.top - uni.getSystemInfoSync()['statusBarHeight'] = 上间距）	        
+				let navbarHeight = menuButtonInfo.height + (menuButtonInfo.top - uni.getSystemInfoSync()[
+					'statusBarHeight']) * 2 + 2
+				// #endif
+				// #ifdef APP-PLUS || H5
+				let navbarHeight = 44
+				// #endif
+				return (navbarHeight + this.geStatusBarHeight() + 15) * 2;
+			}
+		},
+		components: {
+			navbar
+		}
+	}
+</script>
+
+<style lang="scss">
+	.search-container {
+		.nav {
+			height: 100%;
+			background: #fff;
+			width: 100%;
+			display: flex;
+			align-items: center;
+
+			.nav-back {
+				padding-left: 10rpx;
+			}
+
+			.nav-search {
+				flex: 1;
+				width: 0;
+				border: 1px solid $uni-border-1;
+				line-height: 1;
+				padding-left: 30rpx;
+				color: $uni-secondary-color;
+				margin: 0 20rpx;
+				box-sizing: border-box;
+				margin-bottom: 4rpx;
+				font-weight: 200;
+				height: 64rpx;
+				border-radius: 64rpx;
+				line-height: 60rpx;
+			}
+
+			.wx-operation {
+				margin-right: 8px;
+				margin-bottom: 4rpx;
+			}
+		}
+
+		.search-tag {
+			background: #fff;
+			padding: 30rpx 0 0 30rpx;
+
+			.tag-title {
+				font-size: 24rpx;
+				font-weight: bold;
+				color: $uni-base-color;
+				margin-bottom: 20rpx;
+			}
+
+			.tag-list {
+				display: flex;
+				flex-wrap: wrap;
+			}
+
+			.tag-item {
+				background: $uni-background-color;
+				padding: 10rpx 20rpx;
+				color: $uni-base-color;
+				font-weight: 300;
+				margin-right: 30rpx;
+				margin-bottom: 30rpx;
+				font-size: 24rpx;
+				border-radius: 8rpx;
+			}
+		}
+	}
+</style>

virgo.wzfrontend/yui_wx/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body.vue

@@ -51,7 +51,7 @@
 		<view v-if="safearea" class="mescroll-safearea"></view>
 		
 		<!-- 回到顶部按钮 (fixed元素需写在transform外面,防止降级为absolute)-->
-		<mescroll-top v-model="isShowToTop" :option="mescroll.optUp.toTop" @click="toTopClick"></mescroll-top>
+		<!-- <mescroll-top v-model="isShowToTop" :option="mescroll.optUp.toTop" @click="toTopClick"></mescroll-top> -->
 		
 		<!-- #ifdef MP-WEIXIN || MP-QQ || APP-PLUS || H5 -->
 		<!-- renderjs的数据载体,不可写在mescroll-downwarp内部,避免use为false时,载体丢失,无法更新数据 -->

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -1,8 +1,13 @@
 {
   "pages": [
+    "pages/highseas/highseas",
     "pages/index/index",
     "pages/login/login",
-    "pages/city/city"
+    "pages/city/city",
+    "pages/message/message",
+    "pages/data/data",
+    "pages/my/my",
+    "pages/search/search"
   ],
   "subPackages": [],
   "window": {
@@ -11,6 +16,42 @@
     "navigationBarBackgroundColor": "#ffffff",
     "backgroundColor": "#f2f2f2"
   },
+  "tabBar": {
+    "color": "#8c8c8c",
+    "selectedColor": "#08979c",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "static/image/tabbar/index.png",
+        "selectedIconPath": "static/image/tabbar/index-active.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/message/message",
+        "iconPath": "static/image/tabbar/index.png",
+        "selectedIconPath": "static/image/tabbar/index-active.png",
+        "text": "消息"
+      },
+      {
+        "pagePath": "pages/highseas/highseas",
+        "iconPath": "static/image/tabbar/index.png",
+        "selectedIconPath": "static/image/tabbar/index-active.png",
+        "text": "公海"
+      },
+      {
+        "pagePath": "pages/data/data",
+        "iconPath": "static/image/tabbar/index.png",
+        "selectedIconPath": "static/image/tabbar/index-active.png",
+        "text": "数据"
+      },
+      {
+        "pagePath": "pages/my/my",
+        "iconPath": "static/image/tabbar/index.png",
+        "selectedIconPath": "static/image/tabbar/index-active.png",
+        "text": "我的"
+      }
+    ]
+  },
   "permission": {},
   "lazyCodeLoading": "requiredComponents",
   "usingComponents": {}

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/main.js

@@ -42,6 +42,7 @@ _vue.default.prototype.$navigateTo = function (url) {
     url: url
   });
 };
+_vue.default.prototype.$navigateBack = uni.navigateBack;
 _vue.default.prototype.$field = _field.default;
 _vue.default.config.productionTip = false;
 _App.default.mpType = 'app';

virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -780,8 +780,8 @@ function populateParameters(result) {
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "4.23",
-    uniRuntimeVersion: "4.23",
+    uniCompileVersion: "4.24",
+    uniRuntimeVersion: "4.24",
     uniPlatform: undefined || "mp-weixin",
     deviceBrand: deviceBrand,
     deviceModel: model,
@@ -11865,7 +11865,15 @@ function request(options) {
 /* 54 */,
 /* 55 */,
 /* 56 */,
-/* 57 */
+/* 57 */,
+/* 58 */,
+/* 59 */,
+/* 60 */,
+/* 61 */,
+/* 62 */,
+/* 63 */,
+/* 64 */,
+/* 65 */
 /*!*******************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/yui_wx/request/api/login.js ***!
   \*******************************************************************************************/
@@ -11927,7 +11935,7 @@ function getUserInfo(data) {
 }
 
 /***/ }),
-/* 58 */
+/* 66 */
 /*!****************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/yui_wx/uitls/validate.js ***!
   \****************************************************************************************/
@@ -12043,15 +12051,15 @@ function isTel(phone) {
 }
 
 /***/ }),
-/* 59 */,
-/* 60 */,
-/* 61 */,
-/* 62 */,
-/* 63 */,
-/* 64 */,
-/* 65 */,
-/* 66 */,
-/* 67 */
+/* 67 */,
+/* 68 */,
+/* 69 */,
+/* 70 */,
+/* 71 */,
+/* 72 */,
+/* 73 */,
+/* 74 */,
+/* 75 */
 /*!******************************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/yui_wx/components/city-select/citys.js ***!
   \******************************************************************************************************/
@@ -13092,12 +13100,38 @@ var _default = [{
 exports.default = _default;
 
 /***/ }),
-/* 68 */,
-/* 69 */,
-/* 70 */,
-/* 71 */,
-/* 72 */,
-/* 73 */
+/* 76 */,
+/* 77 */,
+/* 78 */,
+/* 79 */,
+/* 80 */,
+/* 81 */,
+/* 82 */,
+/* 83 */,
+/* 84 */,
+/* 85 */,
+/* 86 */,
+/* 87 */,
+/* 88 */,
+/* 89 */,
+/* 90 */,
+/* 91 */,
+/* 92 */,
+/* 93 */,
+/* 94 */,
+/* 95 */,
+/* 96 */,
+/* 97 */,
+/* 98 */,
+/* 99 */,
+/* 100 */,
+/* 101 */,
+/* 102 */,
+/* 103 */,
+/* 104 */,
+/* 105 */,
+/* 106 */,
+/* 107 */
 /*!**************************************************************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/yui_wx/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js ***!
   \**************************************************************************************************************************************/
@@ -13600,14 +13634,14 @@ var fontData = [{
 exports.fontData = fontData;
 
 /***/ }),
-/* 74 */,
-/* 75 */,
-/* 76 */,
-/* 77 */,
-/* 78 */,
-/* 79 */,
-/* 80 */,
-/* 81 */
+/* 108 */,
+/* 109 */,
+/* 110 */,
+/* 111 */,
+/* 112 */,
+/* 113 */,
+/* 114 */,
+/* 115 */
 /*!***************************************************************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/yui_wx/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js ***!
   \***************************************************************************************************************************************/
@@ -14508,7 +14542,7 @@ MeScroll.prototype.preventDefault = function (e) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 82 */
+/* 116 */
 /*!**********************************************************************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/yui_wx/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni-option.js ***!
   \**********************************************************************************************************************************************/
@@ -14606,7 +14640,7 @@ var _default = GlobalOption;
 exports.default = _default;
 
 /***/ }),
-/* 83 */
+/* 117 */
 /*!****************************************************************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/yui_wx/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-i18n.js ***!
   \****************************************************************************************************************************************/
@@ -14638,7 +14672,7 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 84 */
+/* 118 */
 /*!*************************************************************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/yui_wx/uni_modules/mescroll-uni/components/mescroll-uni/wxs/mixins.js ***!
   \*************************************************************************************************************************************/
@@ -14762,37 +14796,37 @@ var _default = WxsMixin;
 exports.default = _default;
 
 /***/ }),
-/* 85 */,
-/* 86 */,
-/* 87 */,
-/* 88 */,
-/* 89 */,
-/* 90 */,
-/* 91 */,
-/* 92 */,
-/* 93 */,
-/* 94 */,
-/* 95 */,
-/* 96 */,
-/* 97 */,
-/* 98 */,
-/* 99 */,
-/* 100 */,
-/* 101 */,
-/* 102 */,
-/* 103 */,
-/* 104 */,
-/* 105 */,
-/* 106 */,
-/* 107 */,
-/* 108 */,
-/* 109 */,
-/* 110 */,
-/* 111 */,
-/* 112 */,
-/* 113 */,
-/* 114 */,
-/* 115 */
+/* 119 */,
+/* 120 */,
+/* 121 */,
+/* 122 */,
+/* 123 */,
+/* 124 */,
+/* 125 */,
+/* 126 */,
+/* 127 */,
+/* 128 */,
+/* 129 */,
+/* 130 */,
+/* 131 */,
+/* 132 */,
+/* 133 */,
+/* 134 */,
+/* 135 */,
+/* 136 */,
+/* 137 */,
+/* 138 */,
+/* 139 */,
+/* 140 */,
+/* 141 */,
+/* 142 */,
+/* 143 */,
+/* 144 */,
+/* 145 */,
+/* 146 */,
+/* 147 */,
+/* 148 */,
+/* 149 */
 /*!***********************************************************************************************************!*\
   !*** /Users/whx/Documents/yuiProject/realty/virgo.wzfrontend/yui_wx/components/city-select/citySelect.js ***!
   \***********************************************************************************************************/