diff --git a/components/qj-fuzzy-search/index2.vue b/components/qj-fuzzy-search/index2.vue
new file mode 100644
index 0000000..0125723
--- /dev/null
+++ b/components/qj-fuzzy-search/index2.vue
@@ -0,0 +1,109 @@
+<template>
+	<cover-view class="index">
+		<cover-view class="search" v-if="show">
+			<cover-view v-for="item in list" :key="item[valueName]" class="item" :style="[setItemStyle]"
+				hover-class="item-hover" hover-start-time="0" hover-stay-time="100" @click="click(item)">
+				<cover-view class="item" style="padding-left: 10rpx;"
+					@click="click(item)">{{ item[labelName] }}</cover-view>
+			</cover-view>
+			<!-- <cover-view class="empty" v-else>{{ noData }}</cover-view> -->
+		</cover-view>
+	</cover-view>
+</template>
+
+<script>
+	export default {
+		props: {
+			/** 展示整体组件 */
+			show: {
+				type: Boolean,
+				default: false
+			},
+			/** 需要展示的列表 */
+			list: {
+				type: Array,
+				default: () => []
+			},
+			/** 自定义label */
+			labelName: {
+				type: String,
+				default: 'label'
+			},
+			/** 自定义value */
+			valueName: {
+				type: String,
+				default: 'value'
+			},
+			/** 无内容时显示的内容  */
+			noData: {
+				type: String,
+				default: '暂无匹配企业...'
+			},
+			/** item的对齐样式 */
+			align: {
+				type: String,
+				default: 'left',
+				validator: value => {
+					return ['left', 'center', 'right'].includes(value);
+				}
+			},
+			/** 自定义item展示样式 */
+			customStyle: {
+				type: Object,
+				default: () => ({})
+			}
+		},
+		computed: {
+			/** 设置item的样式 */
+			setItemStyle() {
+				const {
+					align,
+					customStyle
+				} = this;
+				return {
+					textAlign: align,
+					...customStyle
+				};
+			}
+		},
+		methods: {
+			/** item点击事件 */
+			click(item) {
+				this.$emit('select', {
+					...item
+				});
+			},
+			/** 触底加载下一页 */
+			scrolltolower() {
+				this.$emit('scrolltolower');
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.index {
+		width: 99%;
+		position: absolute;
+		z-index: 9;
+
+
+	}
+
+	.search {
+		height: 500rpx;
+
+		overflow-x: hidden;
+
+		.item {
+			font-size: 26rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			background-color: #fff;
+
+			&-hover {
+				background-color: #f5f5f5;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/node_modules/.package_versions.json b/node_modules/.package_versions.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/node_modules/.package_versions.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 2d894ef..5ef7c45 100644
--- a/pages.json
+++ b/pages.json
@@ -4,7 +4,7 @@
 		"^ncc-(.*)": "@/components/ncc/ncc-$1/index.vue"
 	},
 	"pages": [
-		
+
 		{
 			"path": "pages/home/home",
 			"style": {
@@ -34,33 +34,33 @@
 				"navigationBarTitleText": "需求详情",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		}, 
+		},
 		{
 			"path": "pages/supply/supply",
 			"style": {
 				"navigationBarTitleText": "供应中心",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		}, 
+		},
 		{
 			"path": "pages/datain/datain",
 			"style": {
 				"navigationBarTitleText": "数据填报",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/policy/policy",
 			"style": {
 				"navigationBarTitleText": "政策法规",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/notice/notice",
 			"style": {
 				"navigationBarTitleText": "公示公告",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/construct/construct",
 			"style": {
 				"navigationBarTitleText": "党的建设",
@@ -73,49 +73,49 @@
 				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/data/data",
 			"style": {
 				"navigationBarTitleText": "数据填报",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/Feedback/Feedback",
 			"style": {
 				"navigationBarTitleText": "我要办事",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/map/map",
 			"style": {
 				"navigationBarTitleText": "企业地图",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/demand/demand",
 			"style": {
 				"navigationBarTitleText": "需求中心",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/official/official",
 			"style": {
 				"navigationBarTitleText": "公文办理",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/neighbor/neighbor",
 			"style": {
 				"navigationBarTitleText": "邻居计划",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/talent/talent",
 			"style": {
 				"navigationBarTitleText": "人才服务",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},{
+		}, {
 			"path": "pages/equip/equip",
 			"style": {
 				"navigationBarTitleText": "机构",
@@ -239,158 +239,139 @@
 			"path": "pages/form/index"
 		},
 		{
-			"path" : "pages/policyDetail/policyDetail",
-			"style" : 
-			{
-				"navigationBarTitleText" : "政策详情",
-				"enablePullDownRefresh" : false
+			"path": "pages/policyDetail/policyDetail",
+			"style": {
+				"navigationBarTitleText": "政策详情",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/newsDetail/newsDetail",
-			"style" : 
-			{
-				"navigationBarTitleText" : "新闻详情",
-				"enablePullDownRefresh" : false
+			"path": "pages/newsDetail/newsDetail",
+			"style": {
+				"navigationBarTitleText": "新闻详情",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/talentDetail/talentDetail",
-			"style" : 
-			{
-				"navigationBarTitleText" : "职位详情",
-				"enablePullDownRefresh" : false
+			"path": "pages/talentDetail/talentDetail",
+			"style": {
+				"navigationBarTitleText": "职位详情",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/allCompany/allCompany",
-			"style" : 
-			{
-				"navigationBarTitleText" : "企业",
-				"enablePullDownRefresh" : false
+			"path": "pages/allCompany/allCompany",
+			"style": {
+				"navigationBarTitleText": "企业",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/companyDetail/companyDetail",
-			"style" : 
-			{
-				"navigationBarTitleText" : "企业详情",
-				"enablePullDownRefresh" : false
+			"path": "pages/companyDetail/companyDetail",
+			"style": {
+				"navigationBarTitleText": "企业详情",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/postTalent/postTalent",
-			"style" : 
-			{
-				"navigationBarTitleText" : "人才招聘发布",
-				"enablePullDownRefresh" : false
+			"path": "pages/postTalent/postTalent",
+			"style": {
+				"navigationBarTitleText": "人才招聘发布",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/fileLook/fileLook",
-			"style" : 
-			{
-				"navigationBarTitleText" : "信息回执",
-				"enablePullDownRefresh" : false
+			"path": "pages/fileLook/fileLook",
+			"style": {
+				"navigationBarTitleText": "信息回执",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/postProduct/postProduct",
-			"style" : 
-			{
-				"navigationBarTitleText" : "发布产品",
-				"enablePullDownRefresh" : false
+			"path": "pages/postProduct/postProduct",
+			"style": {
+				"navigationBarTitleText": "发布产品",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/postDemand/postDemand",
-			"style" : 
-			{
-				"navigationBarTitleText" : "发布需求",
-				"enablePullDownRefresh" : false
+			"path": "pages/postDemand/postDemand",
+			"style": {
+				"navigationBarTitleText": "发布需求",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/postCon/postCon",
-			"style" : 
-			{
-				"navigationBarTitleText" : "党的建设发布",
-				"enablePullDownRefresh" : false
+			"path": "pages/postCon/postCon",
+			"style": {
+				"navigationBarTitleText": "党的建设发布",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/my/myPro/myPro",
-			"style" : 
-			{
-				"navigationBarTitleText" : "发布产品列表",
-				"enablePullDownRefresh" : false
+			"path": "pages/my/myPro/myPro",
+			"style": {
+				"navigationBarTitleText": "发布产品列表",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/my/myDemand/myDemand",
-			"style" : 
-			{
-				"navigationBarTitleText" : "发布需求列表",
-				"enablePullDownRefresh" : false
+			"path": "pages/my/myDemand/myDemand",
+			"style": {
+				"navigationBarTitleText": "发布需求列表",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/my/myZhao/myZhao",
-			"style" : 
-			{
-				"navigationBarTitleText" : "发布招聘列表",
-				"enablePullDownRefresh" : false
+			"path": "pages/my/myZhao/myZhao",
+			"style": {
+				"navigationBarTitleText": "发布招聘列表",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/postNotice/postNotice",
-			"style" : 
-			{
-				"navigationBarTitleText" : "公式公告发布",
-				"enablePullDownRefresh" : false
+			"path": "pages/postNotice/postNotice",
+			"style": {
+				"navigationBarTitleText": "公式公告发布",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/postNews/postNews",
-			"style" : 
-			{
-				"navigationBarTitleText" : "新闻发布",
-				"enablePullDownRefresh" : false
+			"path": "pages/postNews/postNews",
+			"style": {
+				"navigationBarTitleText": "新闻发布",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/postPolicy/postPolicy",
-			"style" : 
-			{
-				"navigationBarTitleText" : "政策发布",
-				"enablePullDownRefresh" : false
+			"path": "pages/postPolicy/postPolicy",
+			"style": {
+				"navigationBarTitleText": "政策发布",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/recommend/recommend",
-			"style" : 
-			{
-				"navigationBarTitleText" : "人才推介",
-				"enablePullDownRefresh" : false
+			"path": "pages/recommend/recommend",
+			"style": {
+				"navigationBarTitleText": "人才推介",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/recommend/postRecommend/postRecommend",
-			"style" : 
-			{
-				"navigationBarTitleText" : "人才推介发布",
-				"enablePullDownRefresh" : false
+			"path": "pages/recommend/postRecommend/postRecommend",
+			"style": {
+				"navigationBarTitleText": "人才推介发布",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/recommend/recommendInfo/recommendInfo",
-			"style" : 
-			{
-				"navigationBarTitleText" : "人才信息",
-				"enablePullDownRefresh" : false
+			"path": "pages/recommend/recommendInfo/recommendInfo",
+			"style": {
+				"navigationBarTitleText": "人才信息",
+				"enablePullDownRefresh": false
 			}
 		}
-		
+
 		// {
 		// 	"path" : "apis/supply/supply",
 		// 	"style" : 
@@ -584,14 +565,12 @@
 			"ly-tree-node": "/components/ly-tree/ly-tree-node"
 		}
 	},
-	"condition" : { //模式配置，仅开发期间生效
+	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
 	}
-}
+}
\ No newline at end of file
diff --git a/pages/map/map copy.vue b/pages/map/map copy.vue
new file mode 100644
index 0000000..a547e82
--- /dev/null
+++ b/pages/map/map copy.vue
@@ -0,0 +1,299 @@
+<template>
+	<view class="page">
+		<view class="content">
+			<cover-view></cover-view>
+			<view class="bg">
+				<!-- <web-view src="../../static/html/map.html" style="width: 100%;height: 100%; position: absolute; z-index: 0;"></web-view> -->
+				<map style="width: 100%;height: 70%;position: relative;top: 190rpx;" :latitude="latitude"
+					:longitude="longitude" :markers="covers" :show-location="true"></map>
+			</view>
+			<view class="map-content" style="position: relative;z-index: 1000;">
+				<!-- 搜索 -->
+				<view class="search-head">
+					<view class="search">
+						<image src="../../static/fdj1.png"></image>
+						<text></text>
+						<input type="text" v-model="selectName" placeholder="搜索关键词" @input="getCompanyList" />
+					</view>
+					<!-- 显示公司选项 -->
+					<view class="btn" @click="getCompanyDetail">
+						<text>搜索</text>
+					</view>
+				</view>
+				<mo-hu-search :show="selectShow" :list="comList" @select="select" label-name="name"
+					value-name="id"></mo-hu-search>
+			</view>
+
+			<view class="bottom">
+				<view class="invitation-data">
+					<view class="invitation-show">
+						<view class="icon" v-show="show">
+							<image :src=" baseUrl + logo.url"></image>
+						</view>
+						<view class="item">
+							<view class="title-btn">
+								<view class="title">
+									<text class="bt">{{this.companyName}}</text>
+								</view>
+							</view>
+							<view class="describe">
+								<text>{{this.dizhi}}</text>
+							</view>
+							<view class="describe">
+								<text>电话：{{getData.fuzerendianhua}}</text>
+								<image src="../../static/map1.png"></image>
+							</view>
+							<view class="describe">
+								<text>营业时间：10:00-20:00</text>
+							</view>
+						</view>
+						<view class="right">
+							<view class="red-btn" @click.stop="handleNavigation">
+								<image src="../../static/dh.png"></image>
+								<text>导航</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import request from '@/utils/request.js'
+	// import moHuSearch from '../../components/qj-fuzzy-search/index.vue'
+	import moHuSearch from '../../components/qj-fuzzy-search/index.vue'
+	export default {
+		components: {
+			moHuSearch
+		},
+		data() {
+			return {
+				keyword: '',
+				id: 0, // 使用 marker点击事件 需要填写id
+				title: 'map',
+				// latitude: 30.602494,
+				// longitude: 104.073004,
+				latitude: 30.926786,
+				longitude: 104.294514,
+				covers: [{
+						latitude: 30.926786,
+						longitude: 104.294514,
+						iconPath: '../../static/map_red.png',
+						// width:20,
+						// height:26,
+					},
+					// {
+					// 	latitude: 39.90,
+					// 	longitude: 116.39,
+					// 	iconPath: '../../../static/wuganda.png'
+					// },
+				],
+				getData: {},
+				show: false,
+				selectShow: false,
+				selectName: '',
+				selectId: '',
+				logo: {},
+				baseUrl: 'http://deyanggaoxin.fengshiyun.com',
+				comList: [],
+				companyName: '德阳高新区管委会',
+				dizhi: '广汉市聆湖西路一段一号',
+				// 我自己的位置经纬度（百度地图需要传入自己的经纬度进行导航）
+				selfLocation: {
+					latitude: '',
+					longitude: ''
+				}
+			}
+		},
+		onLoad() {
+			// this.getCompanyDetail()
+		},
+		methods: {
+			// 获取公司列表
+			getCompanyList() {
+				this.selectShow = true
+				// this.$refs.sou.open()
+				request({
+					url: '/api/permission/organize/GetSelectList',
+					method: 'get',
+					data: {
+						keyword: this.selectName
+					}
+				}).then(res => {
+					if (res.code === 200) {
+						// console.log(res)
+						this.comList = res.data.list.map(it => {
+							return {
+								id: it.id,
+								name: it.fullName
+							}
+						})
+						// console.log(this.comList)
+						this.comList = JSON.parse(JSON.stringify(this.comList))
+					}
+				})
+			},
+			select(item) {
+				this.selectShow = false;
+				this.selectName = item.name;
+				this.selectId = item.id
+			},
+			// 查询公司
+			getCompanyDetail() {
+				request({
+					url: `/api/permission/organize/${this.selectId}`,
+					method: 'get',
+					data: {}
+				}).then(res => {
+					if (res.code === 200) {
+						console.log(res)
+						// console.log(res.data.list)
+						if (res.data.latlong !== null) {
+							let position = res.data.latlong.split(',')
+							this.latitude = position[1]
+							this.longitude = position[0]
+							this.covers[0].latitude = position[1]
+							this.covers[0].longitude = position[0]
+							console.log(position)
+						}
+
+						this.getData = res.data
+						this.companyName = this.getData.fullName
+						this.dizhi = this.getData.dizhi
+						// console.log(this.getData.F_Logo.length)
+						if (this.getData.logo.length > 0) {
+							this.show = true
+							this.logo = this.getData.logo[0]
+							console.log(this.logo)
+
+						}
+					}
+				})
+			},
+
+			// 点击跳转到本机地图软件
+			handleNavigation() {
+				// console.log('导航')
+				const _this = this
+				if (!this.latitude || !this.longitude || !this.companyName) return
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(res) {
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						this.selfLocation.longitude = res.longitude
+						this.selfLocation.latitude = res.latitude
+					}
+				});
+				// 微信
+				// #ifdef MP-WEIXIN
+				let _obj = {
+					latitude: parseFloat(this.latitude),
+					longitude: parseFloat(this.longitude),
+					name: this.companyName,
+				}
+				if (this.dizhi) {
+					_obj['dizhi'] = this.dizhi
+				}
+				uni.openLocation({
+					..._obj,
+					success: function(res) {
+						console.log('打开系统位置地图成功')
+					},
+					fail: function(error) {
+						console.log(error)
+					}
+				})
+				// #endif
+
+				// #ifdef APP-PLUS
+				// 判断系统安装的地图应用有哪些, 并生成菜单按钮
+				let _mapName = [{
+						title: '高德地图',
+						name: 'amap',
+						androidName: 'com.autonavi.minimap',
+						iosName: 'iosamap://'
+					},
+					{
+						title: '百度地图',
+						name: 'baidumap',
+						androidName: 'com.baidu.BaiduMap',
+						iosName: 'baidumap://'
+					},
+					{
+						title: '腾讯地图',
+						name: 'qqmap',
+						androidName: 'com.tencent.map',
+						iosName: 'qqmap://'
+					},
+				]
+				// 根据真机有的地图软件 生成的 操作菜单
+				let buttons = []
+				let platform = uni.getSystemInfoSync().platform
+				platform === 'android' && _mapName.forEach(item => {
+					if (plus.runtime.isApplicationExist({
+							pname: item.androidName
+						})) {
+						buttons.push(item)
+					}
+				})
+				platform === 'ios' && _mapName.forEach(item => {
+					console.log(item.iosName)
+					if (plus.runtime.isApplicationExist({
+							action: item.iosName
+						})) {
+						buttons.push(item)
+					}
+				})
+				if (buttons.length) {
+					plus.nativeUI.actionSheet({ //选择菜单
+						title: "选择地图应用",
+						cancel: "取消",
+						buttons: buttons
+					}, function(e) {
+						let _map = buttons[e.index - 1]
+						_this.openURL(_map, platform)
+					})
+				} else {
+					uni.showToast({
+						title: '请安装地图软件',
+						icon: 'none'
+					})
+					return
+				}
+				// #endif
+			},
+
+			// 打开第三方程序实际应用
+			openURL(map, platform) {
+				let _defaultUrl = {
+					android: {
+						"amap": `amapuri://route/plan/?sid=&did=&dlat=${this.latitude}&dlon=${this.longitude}&dname=${this.companyName}&dev=0&t=0`,
+						'qqmap': `qqmap://map/routeplan?type=drive&to=${this.companyName}&tocoord=${this.latitude},${this.longitude}&referer=fuxishan_uni_client`,
+						'baidumap': `baidumap://map/direction?origin=${this.selfLocation.latitude},${this.selfLocation.longitude}&destination=name:${this.companyName}|latlng:${this.latitude},${this.longitude}&coord_type=wgs84&mode=driving&src=andr.baidu.openAPIdemo"`
+					},
+					ios: {
+						"amap": `iosamap://path?sourceApplication=fuxishan_uni_client&dlat=${this.latitude}&dlon=${this.longitude}&dname=${this.companyName}&dev=0&t=0`,
+						'qqmap': `qqmap://map/routeplan?type=drive&to=${this.companyName}&tocoord=${this.latitude},${this.longitude}&referer=fuxishan_uni_client`,
+						'baidumap': `baidumap://map/direction?origin=${this.selfLocation.latitude},${this.selfLocation.longitude}&destination=name:${this.companyName}|latlng:${this.latitude},${this.longitude}&mode=driving&src=ios.baidu.openAPIdemo`
+					}
+				}
+				let newurl = encodeURI(_defaultUrl[platform][map.name]);
+				console.log(newurl)
+				plus.runtime.openURL(newurl, function(res) {
+					console.log(res)
+					uni.showModal({
+						content: res.message
+					})
+				}, map.androidName ? map.androidName : '');
+			}
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'map.scss';
+</style>
\ No newline at end of file
diff --git a/pages/map/map.nvue b/pages/map/map.nvue
new file mode 100644
index 0000000..8bf11e1
--- /dev/null
+++ b/pages/map/map.nvue
@@ -0,0 +1,299 @@
+<template>
+	<view class="page">
+		<view class="content">
+			<cover-view></cover-view>
+			<view class="bg">
+				<!-- <web-view src="../../static/html/map.html" style="width: 100%;height: 100%; position: absolute; z-index: 0;"></web-view> -->
+				<map style="width: 100%;height: 70%;position: relative;top: 190rpx;" :latitude="latitude"
+					:longitude="longitude" :markers="covers" :show-location="true"></map>
+			</view>
+			<view class="map-content" style="position: relative;z-index: 1000;">
+				<!-- 搜索 -->
+				<view class="search-head">
+					<view class="search">
+						<image src="../../static/fdj1.png"></image>
+						<text></text>
+						<input type="text" v-model="selectName" placeholder="搜索关键词" @input="getCompanyList" />
+					</view>
+					<!-- 显示公司选项 -->
+					<view class="btn" @click="getCompanyDetail">
+						<text>搜索11</text>
+					</view>
+				</view>
+				<mo-hu-search :show="selectShow" :list="comList" @select="select" label-name="name"
+					value-name="id"></mo-hu-search>
+			</view>
+
+			<view class="bottom">
+				<view class="invitation-data">
+					<view class="invitation-show">
+						<view class="icon" v-show="show">
+							<image :src=" baseUrl + logo.url"></image>
+						</view>
+						<view class="item">
+							<view class="title-btn">
+								<view class="title">
+									<text class="bt">{{this.companyName}}</text>
+								</view>
+							</view>
+							<view class="describe">
+								<text>{{this.dizhi}}</text>
+							</view>
+							<view class="describe">
+								<text>电话：{{getData.fuzerendianhua}}</text>
+								<image src="../../static/map1.png"></image>
+							</view>
+							<view class="describe">
+								<text>营业时间：10:00-20:00</text>
+							</view>
+						</view>
+						<view class="right">
+							<view class="red-btn" @click.stop="handleNavigation">
+								<image src="../../static/dh.png"></image>
+								<text>导航</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import request from '@/utils/request.js'
+	// import moHuSearch from '../../components/qj-fuzzy-search/index.vue'
+	import moHuSearch from '../../components/qj-fuzzy-search/index.vue'
+	export default {
+		components: {
+			moHuSearch
+		},
+		data() {
+			return {
+				keyword: '',
+				id: 0, // 使用 marker点击事件 需要填写id
+				title: 'map',
+				// latitude: 30.602494,
+				// longitude: 104.073004,
+				latitude: 30.926786,
+				longitude: 104.294514,
+				covers: [{
+						latitude: 30.926786,
+						longitude: 104.294514,
+						iconPath: '../../static/map_red.png',
+						// width:20,
+						// height:26,
+					},
+					// {
+					// 	latitude: 39.90,
+					// 	longitude: 116.39,
+					// 	iconPath: '../../../static/wuganda.png'
+					// },
+				],
+				getData: {},
+				show: false,
+				selectShow: false,
+				selectName: '',
+				selectId: '',
+				logo: {},
+				baseUrl: 'http://deyanggaoxin.fengshiyun.com',
+				comList: [],
+				companyName: '德阳高新区管委会',
+				dizhi: '广汉市聆湖西路一段一号',
+				// 我自己的位置经纬度（百度地图需要传入自己的经纬度进行导航）
+				selfLocation: {
+					latitude: '',
+					longitude: ''
+				}
+			}
+		},
+		onLoad() {
+			// this.getCompanyDetail()
+		},
+		methods: {
+			// 获取公司列表
+			getCompanyList() {
+				this.selectShow = true
+				// this.$refs.sou.open()
+				request({
+					url: '/api/permission/organize/GetSelectList',
+					method: 'get',
+					data: {
+						keyword: this.selectName
+					}
+				}).then(res => {
+					if (res.code === 200) {
+						// console.log(res)
+						this.comList = res.data.list.map(it => {
+							return {
+								id: it.id,
+								name: it.fullName
+							}
+						})
+						// console.log(this.comList)
+						this.comList = JSON.parse(JSON.stringify(this.comList))
+					}
+				})
+			},
+			select(item) {
+				this.selectShow = false;
+				this.selectName = item.name;
+				this.selectId = item.id
+			},
+			// 查询公司
+			getCompanyDetail() {
+				request({
+					url: `/api/permission/organize/${this.selectId}`,
+					method: 'get',
+					data: {}
+				}).then(res => {
+					if (res.code === 200) {
+						console.log(res)
+						// console.log(res.data.list)
+						if (res.data.latlong !== null) {
+							let position = res.data.latlong.split(',')
+							this.latitude = position[1]
+							this.longitude = position[0]
+							this.covers[0].latitude = position[1]
+							this.covers[0].longitude = position[0]
+							console.log(position)
+						}
+
+						this.getData = res.data
+						this.companyName = this.getData.fullName
+						this.dizhi = this.getData.dizhi
+						// console.log(this.getData.F_Logo.length)
+						if (this.getData.logo.length > 0) {
+							this.show = true
+							this.logo = this.getData.logo[0]
+							console.log(this.logo)
+
+						}
+					}
+				})
+			},
+
+			// 点击跳转到本机地图软件
+			handleNavigation() {
+				// console.log('导航')
+				const _this = this
+				if (!this.latitude || !this.longitude || !this.companyName) return
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(res) {
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						this.selfLocation.longitude = res.longitude
+						this.selfLocation.latitude = res.latitude
+					}
+				});
+				// 微信
+				// #ifdef MP-WEIXIN
+				let _obj = {
+					latitude: parseFloat(this.latitude),
+					longitude: parseFloat(this.longitude),
+					name: this.companyName,
+				}
+				if (this.dizhi) {
+					_obj['dizhi'] = this.dizhi
+				}
+				uni.openLocation({
+					..._obj,
+					success: function(res) {
+						console.log('打开系统位置地图成功')
+					},
+					fail: function(error) {
+						console.log(error)
+					}
+				})
+				// #endif
+
+				// #ifdef APP-PLUS
+				// 判断系统安装的地图应用有哪些, 并生成菜单按钮
+				let _mapName = [{
+						title: '高德地图',
+						name: 'amap',
+						androidName: 'com.autonavi.minimap',
+						iosName: 'iosamap://'
+					},
+					{
+						title: '百度地图',
+						name: 'baidumap',
+						androidName: 'com.baidu.BaiduMap',
+						iosName: 'baidumap://'
+					},
+					{
+						title: '腾讯地图',
+						name: 'qqmap',
+						androidName: 'com.tencent.map',
+						iosName: 'qqmap://'
+					},
+				]
+				// 根据真机有的地图软件 生成的 操作菜单
+				let buttons = []
+				let platform = uni.getSystemInfoSync().platform
+				platform === 'android' && _mapName.forEach(item => {
+					if (plus.runtime.isApplicationExist({
+							pname: item.androidName
+						})) {
+						buttons.push(item)
+					}
+				})
+				platform === 'ios' && _mapName.forEach(item => {
+					console.log(item.iosName)
+					if (plus.runtime.isApplicationExist({
+							action: item.iosName
+						})) {
+						buttons.push(item)
+					}
+				})
+				if (buttons.length) {
+					plus.nativeUI.actionSheet({ //选择菜单
+						title: "选择地图应用",
+						cancel: "取消",
+						buttons: buttons
+					}, function(e) {
+						let _map = buttons[e.index - 1]
+						_this.openURL(_map, platform)
+					})
+				} else {
+					uni.showToast({
+						title: '请安装地图软件',
+						icon: 'none'
+					})
+					return
+				}
+				// #endif
+			},
+
+			// 打开第三方程序实际应用
+			openURL(map, platform) {
+				let _defaultUrl = {
+					android: {
+						"amap": `amapuri://route/plan/?sid=&did=&dlat=${this.latitude}&dlon=${this.longitude}&dname=${this.companyName}&dev=0&t=0`,
+						'qqmap': `qqmap://map/routeplan?type=drive&to=${this.companyName}&tocoord=${this.latitude},${this.longitude}&referer=fuxishan_uni_client`,
+						'baidumap': `baidumap://map/direction?origin=${this.selfLocation.latitude},${this.selfLocation.longitude}&destination=name:${this.companyName}|latlng:${this.latitude},${this.longitude}&coord_type=wgs84&mode=driving&src=andr.baidu.openAPIdemo"`
+					},
+					ios: {
+						"amap": `iosamap://path?sourceApplication=fuxishan_uni_client&dlat=${this.latitude}&dlon=${this.longitude}&dname=${this.companyName}&dev=0&t=0`,
+						'qqmap': `qqmap://map/routeplan?type=drive&to=${this.companyName}&tocoord=${this.latitude},${this.longitude}&referer=fuxishan_uni_client`,
+						'baidumap': `baidumap://map/direction?origin=${this.selfLocation.latitude},${this.selfLocation.longitude}&destination=name:${this.companyName}|latlng:${this.latitude},${this.longitude}&mode=driving&src=ios.baidu.openAPIdemo`
+					}
+				}
+				let newurl = encodeURI(_defaultUrl[platform][map.name]);
+				console.log(newurl)
+				plus.runtime.openURL(newurl, function(res) {
+					console.log(res)
+					uni.showModal({
+						content: res.message
+					})
+				}, map.androidName ? map.androidName : '');
+			}
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'map.scss';
+</style>
\ No newline at end of file
diff --git a/pages/map/map.scss b/pages/map/map.scss
index 2ccdbe2..6334884 100644
--- a/pages/map/map.scss
+++ b/pages/map/map.scss
@@ -9,21 +9,22 @@
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	width: 90%;
+	width: 100%;
+	height: 84rpx;
 	margin: 0 auto;
 	// #ifdef APP-PLUS */
 	// height: calc(120rpx + var(--status-bar-height));
 	// /* #endif
 	// padding: 20rpx;
-	box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
-	margin-top:8rpx;
-	border-radius: 100rpx;
+	//box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
+	border: 6rpx solid #efefef;
+	margin-top:20rpx;
 	background-color: #FFFFFF;
 	.search {
 		display: flex;
 		align-items: center;
 		width: 100%;
-		height: 80rpx;
+		height: 78rpx;
 		// background: rgba(255, 255, 255, 1);
 		border: 0;
 		margin-left: 30rpx;
@@ -55,10 +56,11 @@
 		align-items: center;
 		justify-content: center;
 		position: absolute;
-		right: 60rpx;
+		right: 20rpx;
 		background-color: #D32D25;
-		border-radius: 100rpx;
-		padding: 12rpx 25rpx;
+		border-radius: 10rpx;
+		width: 120rpx;;
+		padding: 12rpx;
 		text {
 			font-size: 28rpx;
 			color: #fff;
@@ -128,16 +130,20 @@
 		margin: 0;
 	}
 }
-.invitation-data{
+
 	.invitation-show{
+		position: absolute;
+		bottom: 60px;
 		display: flex;
 		align-items: center;
-		width: 100%;
-		margin: 20rpx auto;
+		width: 95%;
 		background-color: #FFFFFF;
 		box-shadow: 0 0 10rpx rgba(0,0,0,0.1);
 		border-radius: 20rpx;
+		left: 50%;
+		transform: translateX(-50%);
 		padding: 20rpx;
+		height: 230rpx;
 		.icon{
 			display: flex;
 			justify-content: center;
@@ -149,7 +155,7 @@
 			}
 		}
 		.item{
-			width: 60%;
+			width: 70%;
 			height: 80%;
 			padding-left: 20rpx;
 			padding-right: 20rpx;
@@ -170,7 +176,8 @@
 			.describe{
 				display: flex;
 				align-items: center;
-				margin-bottom: 6rpx;
+				height: 46rpx;
+				line-height: 46rpx;
 				text{
 					font-size: 24rpx;
 					color: #959595;
@@ -183,7 +190,7 @@
 			}
 		}
 	}
-}
+
 // .amap-marker{
 // 	margin-top: -5px !important;
 // }
@@ -197,7 +204,7 @@
 					}
 				}
 .right {
-	width: 20%;
+	width: 30%;
 	text-align: right;
 	color: #878787;
 }
@@ -207,10 +214,12 @@
 					justify-content: center;
 					width: 160rpx;
 					height: 50rpx;
-					background: linear-gradient(to bottom,#E60012,#E60012);
+					background: #D32D25 !important;
 					border-radius: 60rpx;
 					float: right;
-					margin-top: 90rpx;
+					margin-top: 126rpx;
+					margin-right: 10rpx;
+					z-index: 999;
 					image {
 						width: 24rpx;
 						height: 24rpx;
diff --git a/pages/map/map.vue b/pages/map/map.vue
index a547e82..7584b57 100644
--- a/pages/map/map.vue
+++ b/pages/map/map.vue
@@ -1,61 +1,66 @@
 <template>
 	<view class="page">
+		<view class="map-content" style="position: relative;z-index: 1000;">
+			<!-- 搜索 -->
+			<view class="search-head">
+				<view class="search">
+					<image src="../../static/fdj1.png"></image>
+					<text></text>
+					<input type="text" v-model="selectName" placeholder="搜索关键词" @input="getCompanyList" />
+				</view>
+				<!-- 显示公司选项 -->
+				<view class="btn" @click="getCompanyDetail">
+					<text>搜索</text>
+				</view>
+			</view>
+			<mo-hu-search :show="selectShow" :list="comList" @select="select" label-name="name"
+				value-name="id"></mo-hu-search>
+		</view>
 		<view class="content">
-			<cover-view></cover-view>
-			<view class="bg">
+			<view class="bg" style="z-index: 9;">
 				<!-- <web-view src="../../static/html/map.html" style="width: 100%;height: 100%; position: absolute; z-index: 0;"></web-view> -->
-				<map style="width: 100%;height: 70%;position: relative;top: 190rpx;" :latitude="latitude"
-					:longitude="longitude" :markers="covers" :show-location="true"></map>
+				<map style="width: 100%;height: 100%" :latitude="latitude" :longitude="longitude" :markers="covers"
+					:show-location="true">
+
+
+					<cover-view class="invitation-show">
+						<cover-view class="icon" v-show="show">
+							<cover-image :src=" baseUrl + logo.url"></cover-image>
+						</cover-view>
+						<cover-view class="item">
+							<cover-view class="title-btn">
+								<cover-view class="title">
+									<cover-view class="bt">{{this.companyName}}</cover-view>
+								</cover-view>
+							</cover-view>
+							<cover-view class="describe">
+								{{this.dizhi}}
+							</cover-view>
+							<cover-view class="describe">
+								<cover-view>电话：{{getData.fuzerendianhua}}</cover-view>
+								<cover-image style="width: 30rpx;height: 30rpx;;" src="../../static/map1.png"
+									@click.stop="callPhone(getData.fuzerendianhua)"></cover-image>
+							</cover-view>
+							<cover-view class="describe">
+								营业时间：10:00-20:00
+							</cover-view>
+						</cover-view>
+						<cover-view class="right">
+							<cover-view class="red-btn" @click.stop="handleNavigation">
+								<cover-image style="width: 24rpx;height: 24rpx;" src="../../static/dh.png"
+									@click.stop="handleNavigation"></cover-image>
+								<cover-view style="color: #fff;" @click.stop="handleNavigation">导航</cover-view>
+							</cover-view>
+						</cover-view>
+					</cover-view>
+
+				</map>
 			</view>
 			<view class="map-content" style="position: relative;z-index: 1000;">
 				<!-- 搜索 -->
-				<view class="search-head">
-					<view class="search">
-						<image src="../../static/fdj1.png"></image>
-						<text></text>
-						<input type="text" v-model="selectName" placeholder="搜索关键词" @input="getCompanyList" />
-					</view>
-					<!-- 显示公司选项 -->
-					<view class="btn" @click="getCompanyDetail">
-						<text>搜索</text>
-					</view>
-				</view>
-				<mo-hu-search :show="selectShow" :list="comList" @select="select" label-name="name"
-					value-name="id"></mo-hu-search>
-			</view>
 
-			<view class="bottom">
-				<view class="invitation-data">
-					<view class="invitation-show">
-						<view class="icon" v-show="show">
-							<image :src=" baseUrl + logo.url"></image>
-						</view>
-						<view class="item">
-							<view class="title-btn">
-								<view class="title">
-									<text class="bt">{{this.companyName}}</text>
-								</view>
-							</view>
-							<view class="describe">
-								<text>{{this.dizhi}}</text>
-							</view>
-							<view class="describe">
-								<text>电话：{{getData.fuzerendianhua}}</text>
-								<image src="../../static/map1.png"></image>
-							</view>
-							<view class="describe">
-								<text>营业时间：10:00-20:00</text>
-							</view>
-						</view>
-						<view class="right">
-							<view class="red-btn" @click.stop="handleNavigation">
-								<image src="../../static/dh.png"></image>
-								<text>导航</text>
-							</view>
-						</view>
-					</view>
-				</view>
 			</view>
+
 		</view>
 	</view>
 </template>
@@ -63,7 +68,7 @@
 <script>
 	import request from '@/utils/request.js'
 	// import moHuSearch from '../../components/qj-fuzzy-search/index.vue'
-	import moHuSearch from '../../components/qj-fuzzy-search/index.vue'
+	import moHuSearch from '../../components/qj-fuzzy-search/index2.vue'
 	export default {
 		components: {
 			moHuSearch
@@ -111,6 +116,11 @@
 			// this.getCompanyDetail()
 		},
 		methods: {
+			callPhone(phoneNum) {
+				uni.makePhoneCall({
+					phoneNumber: phoneNum //仅为示例
+				});
+			},
 			// 获取公司列表
 			getCompanyList() {
 				this.selectShow = true
@@ -119,7 +129,9 @@
 					url: '/api/permission/organize/GetSelectList',
 					method: 'get',
 					data: {
-						keyword: this.selectName
+						keyword: this.selectName,
+						currentPage: 1,
+						pageSize: 8
 					}
 				}).then(res => {
 					if (res.code === 200) {