From e6b161aef1f2568f4af9f2d6284c27303634966d Mon Sep 17 00:00:00 2001
From: 易尊强 <306277016@qq.com>
Date: Fri, 23 Feb 2024 15:09:16 +0800
Subject: [PATCH] 2/23

---
 components/TabBar/TabBar.scss                   |   2 +-
 components/TabBar/TabBar.vue                    |  79 +++++++++++++++++++++++++++++++++++++++----------------------------------------
 pages/conDetail/conDetail.vue                   |  10 +++++-----
 pages/construct/construct.scss                  |   2 +-
 pages/datain/datain.vue                         |   4 ++--
 pages/demand/demand.vue                         | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 pages/equip/equip.vue                           |   2 +-
 pages/home/home.scss                            |   3 ++-
 pages/home/home.vue                             |   2 +-
 pages/map/map.nvue                              | 299 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/my/my.vue                                 |  14 +++++++++-----
 pages/my/myCom/myCom.vue                        |   2 +-
 pages/my/myComdetail/myComdetail.vue            |   4 ++--
 pages/news/news.vue                             |  22 ++++++++++++----------
 pages/notice/notice.vue                         |  28 ++++++++++++++++------------
 pages/policy/policy.vue                         |  27 ++++++++++++++++++---------
 pages/postCon/postCon.vue                       |   4 ++++
 pages/postDemand/postDemand.vue                 |   4 ++++
 pages/postNews/postNews.vue                     |  33 +++++++++++++++++++++++++++++++--
 pages/postNotice/postNotice.vue                 |  35 +++++++++++++++++++++++++++++++++--
 pages/postProduct/postProduct.vue               |   4 ++++
 pages/postTalent/postTalent.vue                 |   5 +++++
 pages/recommend/postRecommend/postRecommend.vue |  27 +++++++++++++++++++++++++++
 pages/talentDetail/talentDetail.vue             |   4 ++--
 24 files changed, 278 insertions(+), 444 deletions(-)
 delete mode 100644 pages/map/map.nvue

diff --git a/components/TabBar/TabBar.scss b/components/TabBar/TabBar.scss
index af12d36..6673f26 100644
--- a/components/TabBar/TabBar.scss
+++ b/components/TabBar/TabBar.scss
@@ -4,7 +4,7 @@
 	width: 100%;
 	padding-bottom: constant(safe-area-inset-bottom);
 	padding-bottom: env(safe-area-inset-bottom);
-	z-index: 999;
+	z-index: 2;
 	background-color: rgba(255, 255, 255, .5);
 }
 .page-total{
diff --git a/components/TabBar/TabBar.vue b/components/TabBar/TabBar.vue
index 11e29ed..694011d 100644
--- a/components/TabBar/TabBar.vue
+++ b/components/TabBar/TabBar.vue
@@ -1,26 +1,25 @@
 <template>
 	<view class="page-total-content">
-	<view style="position: absolute; bottom: -6rpx; width: 100%;z-index: 0;"><image src="../../static/bottom.png" style="width: 100%; height: 264rpx;"></image></view>
-	<view class="page-total">
-		<view class="tab-list">
-			<view class="list" v-for="(item,index) in TabBarList" 
-			@click="onTabBar(item,index)"
-			:key="index">
-				<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === index"></image>
-				<image :src="item.img" mode="widthFix" v-show="tabBarShow != index"></image>
-				<text :class="{'action':tabBarShow===index}">{{item.name}}</text>
+		<view>
+			<image src="../../static/bottom.png" style="width: 100%; height: 264rpx;"></image>
+		</view>
+		<view class="page-total">
+			<view class="tab-list">
+				<view class="list" v-for="(item,index) in TabBarList" @click="onTabBar(item,index)" :key="index">
+					<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === index"></image>
+					<image :src="item.img" mode="widthFix" v-show="tabBarShow != index"></image>
+					<text :class="{'action':tabBarShow===index}">{{item.name}}</text>
+				</view>
 			</view>
 		</view>
 	</view>
-	</view>
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				TabBarList:[
-					{
+				TabBarList: [{
 						index: 0,
 						name: '首页',
 						img: '/static/tabBar/tab_01.png',
@@ -38,7 +37,7 @@
 				phoneModel: '',
 			};
 		},
-		props:{
+		props: {
 			tabBarShow: {
 				type: Number,
 				default: 0,
@@ -46,47 +45,47 @@
 		},
 		mounted() {
 			try {
-			    const res = uni.getSystemInfoSync();
-					let that = this;
-			    // 获取系统信息
-			    uni.getSystemInfo({
-			    	success(res) {
-			    		console.log(res.brand) //手机牌子
-			    		console.log(res.model) //手机型号
-			    		console.log(res.screenWidth) //屏幕宽度
-			    		console.log(res.screenHeight) //屏幕高度
-							that.codeheight = Math.round(res.screenHeight);
-							that.phoneModel =res.model
-							if(res.model.search('iPhone')){
-								that.isOverall = 0;
-							}else if(Math.round(res.screenHeight)>740){
-							 that.isOverall = 1;
-							}
-							console.log(that.isOverall);
-			    	}
-			    });
+				const res = uni.getSystemInfoSync();
+				let that = this;
+				// 获取系统信息
+				uni.getSystemInfo({
+					success(res) {
+						console.log(res.brand) //手机牌子
+						console.log(res.model) //手机型号
+						console.log(res.screenWidth) //屏幕宽度
+						console.log(res.screenHeight) //屏幕高度
+						that.codeheight = Math.round(res.screenHeight);
+						that.phoneModel = res.model
+						if (res.model.search('iPhone')) {
+							that.isOverall = 0;
+						} else if (Math.round(res.screenHeight) > 740) {
+							that.isOverall = 1;
+						}
+						console.log(that.isOverall);
+					}
+				});
 			} catch (e) {
-			    // error
+				// error
 			}
 		},
-		methods:{
+		methods: {
 			/**
 			 * @param {Object} item
 			 * @param {Number} index
 			 */
-			onTabBar(item,index){
+			onTabBar(item, index) {
 				// this.tabBarShow = index;
-				switch (index){
+				switch (index) {
 					case 0:
 						wx.switchTab({
-							url:'/pages/home/home'
+							url: '/pages/home/home'
 						})
 						break;
 					case 1:
 						wx.switchTab({
-							url:'/pages/my/my'
+							url: '/pages/my/my'
 						})
-						break;	
+						break;
 				}
 			}
 		}
@@ -95,4 +94,4 @@
 
 <style scoped lang="scss">
 	@import 'TabBar.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/conDetail/conDetail.vue b/pages/conDetail/conDetail.vue
index eb68bab..e39a334 100644
--- a/pages/conDetail/conDetail.vue
+++ b/pages/conDetail/conDetail.vue
@@ -104,11 +104,11 @@
 						title: '请登录',
 						icon: 'none'
 					})
-					setTimeout(() => {
-						uni.reLaunch({
-							url: '/pages/login/index'
-						})
-					})
+					// setTimeout(() => {
+					// 	uni.reLaunch({
+					// 		url: '/pages/login/index'
+					// 	})
+					// })
 				}
 			},
 			// 获取需求详情数据
diff --git a/pages/construct/construct.scss b/pages/construct/construct.scss
index 3c10c8f..09e57f0 100644
--- a/pages/construct/construct.scss
+++ b/pages/construct/construct.scss
@@ -61,7 +61,7 @@
 	/* #ifdef APP-PLUS */
 	// margin-top: calc(150rpx + var(--status-bar-height));
 	/* #endif */
-	margin-top: 60rpx;
+	margin-top: 150rpx;
 	.article-list{
 		padding: 0 4%;
 		margin: 30rpx auto;
diff --git a/pages/datain/datain.vue b/pages/datain/datain.vue
index 9ca9285..6fee793 100644
--- a/pages/datain/datain.vue
+++ b/pages/datain/datain.vue
@@ -16,8 +16,8 @@
 					</view>
 				</view>
 				<view class="user-list">
-					<view class="list" @click="toPostCom()" style="background-color:#D32D25;">
-						<view class="title" style="color:white">
+					<view class="list" @click="toPostCom()" >
+						<view class="title" >
 							<text>企业信息采集</text>
 						</view>
 						<view class="more-content">
diff --git a/pages/demand/demand.vue b/pages/demand/demand.vue
index 634eea2..96be04c 100644
--- a/pages/demand/demand.vue
+++ b/pages/demand/demand.vue
@@ -1,37 +1,41 @@
 <template>
 	<view class="page">
 		<view class="main">
-			<view class="top"><image src="../../static/img/supply2.png" @click="toPostDemand()" mode="widthFix"></image></view>
+			<view class="top">
+				<image src="../../static/img/supply2.png" @click="toPostDemand()" mode="widthFix"></image>
+			</view>
 			<view class="titleall-box">
 				<view class="title-screen">
 					<scroll-view scroll-x="true" class="scrollview-box">
 						<!-- 下方的红线 -->
-					<!-- <view ref="line" class="line" ></view> -->
-					<view :class="['title-screen-box',{'red_line':nowShow === 1}]" @click="allPro(1,'全部')">
-						<view>全部</view>
-					</view>
-					<view :class="['title-screen-box',{'red_line':nowShow === 2}]" @click="metalPro(2,'金属')">
-						<view>金属</view>
-					</view>
-					<view :class="['title-screen-box',{'red_line':nowShow === 3}]" @click="devicePro(3,'专用设备')">
-						<view>专用设备</view>
-					</view>
-					<view :class="['title-screen-box',{'red_line':nowShow === 4}]" @click="tranPro(4,'交通运输')">
-						<view>交通运输</view>
-					</view>
-					<view :class="['title-screen-box',{'red_line':nowShow === 5}]" @click="elecPro(5,'电气机械')">
-						<view>电气机械</view>
-					</view>
-					<view :class="['title-screen-box',{'red_line':nowShow === 6}]" @click="commuPro(6,'电子及通讯')">
-						<view>电子及通讯</view>
-					</view>
+						<!-- <view ref="line" class="line" ></view> -->
+						<view :class="['title-screen-box',{'red_line':nowShow === 1}]" @click="allPro(1,'全部')">
+							<view>全部</view>
+						</view>
+						<view :class="['title-screen-box',{'red_line':nowShow === 2}]" @click="metalPro(2,'金属')">
+							<view>金属</view>
+						</view>
+						<view :class="['title-screen-box',{'red_line':nowShow === 3}]" @click="devicePro(3,'专用设备')">
+							<view>专用设备</view>
+						</view>
+						<view :class="['title-screen-box',{'red_line':nowShow === 4}]" @click="tranPro(4,'交通运输')">
+							<view>交通运输</view>
+						</view>
+						<view :class="['title-screen-box',{'red_line':nowShow === 5}]" @click="elecPro(5,'电气机械')">
+							<view>电气机械</view>
+						</view>
+						<view :class="['title-screen-box',{'red_line':nowShow === 6}]" @click="commuPro(6,'电子及通讯')">
+							<view>电子及通讯</view>
+						</view>
 					</scroll-view>
 					<view class="title-screen-box" style="background-color: #fff;margin-right: 0;text-align: center;">
-						<view class="title-screen-box-btn"><image src="../../static/supply.png"></image></view>
+						<view class="title-screen-box-btn">
+							<image src="../../static/supply.png"></image>
+						</view>
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="recommend-info">
 				<view class="goods-list">
 					<view class="list" @click="ArticleDetails(item)" v-for="(item,index) in demandList" :key="index">
@@ -45,17 +49,21 @@
 						</view>
 						<view class="price-info">
 							<view class="user-price">
-								<view class="goods-city"><image src="../../static/image/default_logo.jpg"></image>{{item.comanyName}}</view>
-								<view class="goods-city-img"><image src="../../static/right2.png"></image></view>
+								<view class="goods-city">
+									<image src="../../static/image/default_logo.jpg"></image>{{item.comanyName}}
+								</view>
+								<view class="goods-city-img">
+									<image src="../../static/right2.png"></image>
+								</view>
 							</view>
 							<view class="vip-price">
 							</view>
 						</view>
 					</view>
-					
+
 				</view>
 			</view>
-			
+
 		</view>
 	</view>
 </template>
@@ -64,9 +72,9 @@
 	export default {
 		data() {
 			return {
-				demandList:[],
-				nowShow:1
-				}
+				demandList: [],
+				nowShow: 1
+			}
 		},
 		onLoad() {
 			let that = this
@@ -75,65 +83,67 @@
 		},
 		methods: {
 			// 点击全部
-			allPro(index,name){
+			allPro(index, name) {
 				let that = this
 				this.nowShow = index
-				
+
 				console.log(name)
-			
+
 			},
 			// 点击金属
-			metalPro(index,name){
+			metalPro(index, name) {
 				let that = this
 				that.nowShow = index
 				console.log(name)
-			
+
 			},
 			// 点击专用设备
-			devicePro(index,name){
+			devicePro(index, name) {
 				let that = this
 				that.nowShow = index
 				console.log(name)
-			
+
 			},
 			// 点击交通运输
-			tranPro(index,name){
+			tranPro(index, name) {
 				let that = this
 				that.nowShow = index
 				console.log(name)
-			
+
 			},
 			// 点击电气机械
-			elecPro(index,name){
+			elecPro(index, name) {
 				let that = this
 				that.nowShow = index
 				console.log(name)
-			
+
 			},
 			// 点击电子及通讯
-			commuPro(index,name){
+			commuPro(index, name) {
 				let that = this
 				that.nowShow = index
 				console.log(name)
-			
+
 			},
 			// 获取全部需求数据
-			getDemandList(){
+			getDemandList() {
 				let that = this
-				that.API.getDemandList({pageSize:50}).then(res => {
+				that.API.getDemandList({
+					pageSize: 50,
+				}).then(res => {
 					console.log(res)
 					that.demandList = res.data.list
 				})
 			},
-			ArticleDetails(it){
+			ArticleDetails(it) {
 				uni.navigateTo({
 					url: `/pages/ArticleDetails/ArticleDetails?data=${JSON.stringify(it)}`
 				})
 			},
 			// 去需求发布页面
-			toPostDemand(){
+			toPostDemand() {
 				uni.navigateTo({
-					url:'/pages/postDemand/postDemand'
+					url: '/pages/postDemand/postDemand'
 				})
 			}
 		}
@@ -142,4 +152,4 @@
 
 <style scoped lang="scss">
 	@import 'demand.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/equip/equip.vue b/pages/equip/equip.vue
index b1d42cd..5d053dc 100644
--- a/pages/equip/equip.vue
+++ b/pages/equip/equip.vue
@@ -30,7 +30,7 @@
 					</view>
 					<p @click="toAllCompany()">查看更多 <image src="../../static/right.png"></image></p>
 				</view>
-				<view class="item_box" v-for="(item,index) in twentyList">
+				<view class="item_box" v-for="(item,index) in twentyList" @click="onCompany(item.id)">
 					<image :src="baseUrl + item.logo" mode="" v-if="item.logo"></image>
 					<image src="../../static/image/default_logo.jpg" v-else mode=""></image>
 					<view class="right">
diff --git a/pages/home/home.scss b/pages/home/home.scss
index 40851a8..c6c9531 100644
--- a/pages/home/home.scss
+++ b/pages/home/home.scss
@@ -6,7 +6,8 @@
 	padding: 0 30rpx;
 	position: absolute;
 	z-index: 1;
-	padding-bottom: 120rpx;
+	// padding-bottom: 120rpx;
+	padding-bottom: 250rpx;
 	width: 100%;
 }
 .logo {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index f16385e..ae00694 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -186,7 +186,7 @@
 			getNewsList() {
 				let that = this
 				that.API.getNewsList({
-					categoryId: '360233879019193605'
+					categoryId: '530363088214426885'
 				}).then(res => {
 					console.log("新闻", res)
 					that.newsList = res.data.list
diff --git a/pages/map/map.nvue b/pages/map/map.nvue
deleted file mode 100644
index 8bf11e1..0000000
--- a/pages/map/map.nvue
+++ /dev/null
@@ -1,299 +0,0 @@
-<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/my/my.vue b/pages/my/my.vue
index 75f912f..9d09dec 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -66,7 +66,7 @@
 								<text>招聘</text>
 							</view>
 						</view>
-						<view class="line"></view>
+						<!-- <view class="line"></view>
 						<view class="list" @click="toMyCom()">
 							<view class="thumb">
 								{{com}}
@@ -74,7 +74,7 @@
 							<view class="name">
 								<text>企业</text>
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 
@@ -169,7 +169,7 @@
 							<text class="iconfont icon-more"></text>
 						</view>
 					</view>
-					<!-- <view class="list" @click="toMyCom">
+					<view class="list" @click="toMyCom" v-show="isAdmin">
 						<view class="icon-data">
 							<view class="icon">
 								<image src="/static/my-icon5.png" mode=""></image>
@@ -183,7 +183,7 @@
 						<view class="more">
 							<text class="iconfont icon-more"></text>
 						</view>
-					</view> -->
+					</view>
 					<!-- <view class="list">
 					<view class="icon-data">
 						<view class="icon">
@@ -237,7 +237,8 @@
 				// 招聘数量
 				zhaoPCount: '',
 				// 企业数量
-				com:''
+				com:'',
+				isAdmin:false
 			};
 		},
 		onLoad() {
@@ -257,6 +258,9 @@
 					let userCode = uni.getStorageSync('user')
 					// console.log("用户的code", this.userCode)
 					this.userId = userCode.userInfo.userId
+					if(this.userId === 'admin'){
+						this.isAdmin = true
+					}
 					this.userName = userCode.userInfo.userAccount
 					this.userIcon = userCode.userInfo.headIcon
 					this.organizeName = userCode.userInfo.organizeName
diff --git a/pages/my/myCom/myCom.vue b/pages/my/myCom/myCom.vue
index 14427ed..729b0e1 100644
--- a/pages/my/myCom/myCom.vue
+++ b/pages/my/myCom/myCom.vue
@@ -18,7 +18,7 @@
 			</view>
 			<view class="bottom">
 				<button type="primary" @click="GoodsDetails(it.id)">详情</button>
-				<button type="warn" @click="deletePro(it.id)">删除</button>
+				<!-- <button type="warn" @click="deletePro(it.id)">删除</button> -->
 			</view>
 		</view>
 	</view>
diff --git a/pages/my/myComdetail/myComdetail.vue b/pages/my/myComdetail/myComdetail.vue
index 31e01b9..ec53846 100644
--- a/pages/my/myComdetail/myComdetail.vue
+++ b/pages/my/myComdetail/myComdetail.vue
@@ -19,10 +19,10 @@
 			<!-- <u-cell-item title="手机号" :value="userInfo.mobilePhone" :arrow="false"></u-cell-item> -->
 			<!-- <u-cell-item title="邮箱" :value="userInfo.email" :arrow="false"></u-cell-item> -->
 		</u-cell-group>
-		<button type="primary"
+		<!-- <button type="primary"
 			@click="toUpdate()"
 			style="margin: 0 auto; margin-top: 30rpx; width: 90%;margin-bottom: 40rpx;"
-			>修改</button>
+			>修改</button> -->
 	</view>
 </template>
 
diff --git a/pages/news/news.vue b/pages/news/news.vue
index 2d34df3..5a523f1 100644
--- a/pages/news/news.vue
+++ b/pages/news/news.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="page">
 		<view class="coupon-tab">
-			<view class="tab" :class="{'action':TabShow===0}" @click="onCouponTab(0)">
+			<view class="tab" :class="{'action':TabShow===0}" @click="onCouponTab(0,'360233879019193605')">
 				<text>热点要闻</text>
 			</view>
-			<view class="tab" :class="{'action':TabShow===1}" @click="onCouponTab(1)">
+			<view class="tab" :class="{'action':TabShow===1}" @click="onCouponTab(1,'530363088214426885')">
 				<text>园区快讯</text>
 			</view>
 		</view>
@@ -48,7 +48,7 @@
 								</view>
 							</view>
 							<view class="thumb" v-if="item.isImg">
-								<image :src="baseUrl + item.imgUrl[0]"></image>
+								<image :src="baseUrl + item.imgUrl[0].url"></image>
 							</view>
 							<view class="thumb" v-else>
 								<image src="../../static/img/img3.jpg"></image>
@@ -87,7 +87,7 @@
 								</view>
 							</view>
 							<view class="thumb" v-if="item.isImg">
-								<image :src="baseUrl + item.imgUrl[0]"></image>
+								<image :src="baseUrl + item.imgUrl[0].url"></image>
 							</view>
 							<view class="thumb" v-else>
 								<image src="../../static/img/img3.jpg"></image>
@@ -113,13 +113,15 @@
 				baseUrl: "http://deyanggaoxin.fengshiyun.com",
 				keyword: '',
 				isAdmin: false,
-				categoryId: '360234116366468357'
+				// 判断你是否有图片
+				isImg:false,
+				// categoryId: '360234116366468357'
 			};
 		},
 		onLoad() {
 			let that = this
 			this.getUser()
-			this.getNewsList()
+			this.getNewsList('360233879019193605')
 		},
 		methods: {
 			// 获取用户信息
@@ -144,10 +146,10 @@
 				}
 			},
 			// 获取新闻列表
-			getNewsList() {
+			getNewsList(id) {
 				let that = this
 				that.API.getNewsList({
-						categoryId:this.categorrId,
+						categoryId:id,
 						// keyword:this.keyword,
 						pageSize:500
 					}
@@ -169,9 +171,9 @@
 					console.log(that.newsList)
 				})
 			},
-			onCouponTab(type) {
+			onCouponTab(type,id) {
 				this.TabShow = type;
-				this.getNewsList()
+				this.getNewsList(id)
 			},
 			onArticle(item) {
 				uni.navigateTo({
diff --git a/pages/notice/notice.vue b/pages/notice/notice.vue
index 284ae87..8a32f1c 100644
--- a/pages/notice/notice.vue
+++ b/pages/notice/notice.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="page">
 		<view class="coupon-tab">
-			<view class="tab" :class="{'action':TabShow===0}" @click="onCouponTab(0,'')">
+			<view class="tab" :class="{'action':TabShow===0}" @click="onCouponTab(0,'360234116366468357')">
 				<text>公示</text>
 			</view>
-			<view class="tab" :class="{'action':TabShow===1}" @click="onCouponTab(1)">
+			<view class="tab" :class="{'action':TabShow===1}" @click="onCouponTab(1,'530362479830631685')">
 				<text>通知</text>
 			</view>
 		</view>
@@ -43,8 +43,8 @@
 									</view>
 								</view>
 							</view>
-							<view class="thumb" v-if="item.imgUrl">
-								<image src="../../static/img/img3.jpg"></image>
+							<view class="thumb" v-if="item.isImg">
+								<image :src="baseUrl + item.imgUrl[0].url"></image>
 							</view>
 							<view class="thumb" v-else>
 								<image src="../../static/img/img3.jpg"></image>
@@ -77,8 +77,8 @@
 									</view>
 								</view>
 							</view>
-							<view class="thumb" v-if="item.imgUrl">
-								<image src="../../static/img/img3.jpg"></image>
+							<view class="thumb" v-if="item.isImg">
+								<image :src="baseUrl + item.imgUrl[0].url"></image>
 							</view>
 							<view class="thumb" v-else>
 								<image src="../../static/img/img3.jpg"></image>
@@ -108,12 +108,13 @@ import utils from '../../service/utils';
 					
 				// }
 				keyword:'',
-				isAdmin:false
+				isAdmin:false,
+				baseUrl: "http://deyanggaoxin.fengshiyun.com",
 			};
 		},
 		onLoad() {
 			this.getUser()
-			this.getNoticeList()
+			this.getNoticeList(this.categorrId)
 		},
 		methods: {
 			// 获取用户信息
@@ -138,10 +139,10 @@ import utils from '../../service/utils';
 				}
 			},
 			// 获取公式列表
-			getNoticeList(){
+			getNoticeList(id){
 				let that = this
 				that.API.getNoticeList({
-					categoryId:this.categorrId,
+					categoryId:id,
 					pageSize:500
 				}).then(res=>{
 					if(res.code == 200){
@@ -149,6 +150,7 @@ import utils from '../../service/utils';
 							return {
 								...it,
 								createTime:utils.formatTime(it.createTime),
+								isImg: it.imgUrl.length > 0
 							}
 						})
 						// if(that.noticeList.)
@@ -162,9 +164,10 @@ import utils from '../../service/utils';
 					url: '/pages/postNotice/postNotice'
 				})
 			},
-			onCouponTab(type) {
+			onCouponTab(type,id) {
 				this.TabShow = type;
-				this.getNoticeList()
+				this.categorrId = id
+				this.getNoticeList(id)
 			},
 			onArticle(item) {
 				uni.navigateTo({
@@ -182,6 +185,7 @@ import utils from '../../service/utils';
 							return {
 								...it,
 								createTime:utils.formatTime(it.createTime),
+								isImg: it.imgUrl.length > 0
 							}
 						})
 						// if(that.noticeList.)
diff --git a/pages/policy/policy.vue b/pages/policy/policy.vue
index ea4a094..2842a90 100644
--- a/pages/policy/policy.vue
+++ b/pages/policy/policy.vue
@@ -72,8 +72,11 @@
 									</view>
 								</view>
 							</view>
+							<!-- <view class="thumb" v-if="item.isImg">
+								<image :src="baseUrl + item.imgUrl[0].url"></image>
+							</view> -->
 							<view class="thumb">
-								<image src="../../static/img/ma.jpg"></image>
+								<image src="../../static/img/img3.jpg"></image>
 							</view>
 						</view>
 					</view>
@@ -100,7 +103,8 @@
 				isAdmin: false,
 				categoryId: '360234017372505349',
 				baseUrl: "http://deyanggaoxin.fengshiyun.com",
-				haveData:false
+				haveData:false,
+				isImg:false
 			};
 		},
 		onLoad() {
@@ -141,11 +145,12 @@
 				}).then(res => {
 					console.log(res)
 					that.AllList = res.data.list
-					// console.log(that.AllList)
+					console.log('总的',that.AllList)
 					that.AllList = that.AllList.map(it => {
 						return {
 							...it,
-							createTime: utils.formatTime(it.createTime)
+							createTime: utils.formatTime(it.createTime),
+							// isImg: it.imgUrl.length > 0
 						}
 					})
 					this.fenLeiList = that.AllList.filter(it=>{
@@ -154,6 +159,7 @@
 					if(this.fenLeiList === []){
 						this.haveData = true
 					}
+					console.log("this.AllList", this.AllList)
 					console.log("分类", this.fenLeiList)
 				})
 			},
@@ -188,7 +194,8 @@
 					that.AllList = that.AllList.map(it => {
 						return {
 							...it,
-							createTime: utils.formatTime(it.createTime)
+							createTime: utils.formatTime(it.createTime),
+							// isImg: it.imgUrl.length > 0
 						}
 					})
 					this.fenLeiList = that.AllList
@@ -197,7 +204,7 @@
 					}
 					console.log("分类", this.fenLeiList)
 				})
-				console.log(this.fenLeiList)
+				console.log('this.fenLeiList',this.fenLeiList)
 				console.log(type)
 			},
 			// 显示下方为国家级还是省级等
@@ -216,7 +223,8 @@
 					that.AllList = that.AllList.map(it => {
 						return {
 							...it,
-							createTime: utils.formatTime(it.createTime)
+							createTime: utils.formatTime(it.createTime),
+							// isImg: it.imgUrl.length > 0
 						}
 					})
 					this.fenLeiList = that.AllList
@@ -234,14 +242,15 @@
 			search() {
 				let that = this
 				that.API.getPolicyList({
-					categoryId: this.categoryId,
+					// categoryId: this.categoryId,
 					keyword: this.keyword
 				}).then(res => {
 					// console.log(res)
 					that.fenLeiList = res.data.list.map(it => {
 						return {
 							...it,
-							createTime: utils.formatTime(it.createTime)
+							createTime: utils.formatTime(it.createTime),
+							// isImg: it.imgUrl.length > 0
 						}
 					})
 					if(this.fenLeiList === null){
diff --git a/pages/postCon/postCon.vue b/pages/postCon/postCon.vue
index 27a3e42..ba07baa 100644
--- a/pages/postCon/postCon.vue
+++ b/pages/postCon/postCon.vue
@@ -297,6 +297,10 @@ import utils from '../../service/utils';
 							uni.showToast({
 								icon: "success",
 								title: "更新成功！"
+							}).then(()=>{
+								uni.navigateTo({
+									url:"/pages/construct/construct"
+								})
 							})
 						}
 					}).catch((err)=>{
diff --git a/pages/postDemand/postDemand.vue b/pages/postDemand/postDemand.vue
index 9be6bd2..73fb4cb 100644
--- a/pages/postDemand/postDemand.vue
+++ b/pages/postDemand/postDemand.vue
@@ -197,6 +197,10 @@
 									uni.showToast({
 										icon:"success",
 										title:"发布成功"
+									}).then(()=>{
+										uni.navigateTo({
+											url:"/pages/demand/demand"
+										})
 									})
 								}
 							})
diff --git a/pages/postNews/postNews.vue b/pages/postNews/postNews.vue
index 08aba88..e2530f2 100644
--- a/pages/postNews/postNews.vue
+++ b/pages/postNews/postNews.vue
@@ -21,6 +21,23 @@
 			<view class="example-body">
 				<uni-file-picker limit="9" @select="select" title="新闻图片"></uni-file-picker>
 			</view>
+			<!-- 选择反馈类型 -->
+			<view class="feedback-type">
+				<view class="feedback-type-left">隶属类别</view>
+				<view class="feedback-type-right">
+					<view class="title">
+						<text>{{TypeArray[TypeIndex]}}</text>
+					</view>
+					<view class="picker">
+						<picker @change="FeedbackTypeCh" :value="TypeIndex" :range="TypeArray">
+							<view class="uni-input">{{TypeArray[TypeIndex]}}</view>
+						</picker>
+					</view>
+					<view class="more">
+						<image src="../../static/down1.png"></image>
+					</view>
+				</view>
+			</view>
 		</view>
 
 		<!-- 提交 -->
@@ -74,7 +91,9 @@ import utils from '../../service/utils';
 				isId:'',
 				have:false,
 				detailData:[],
-				categoryId:'360233879019193605'
+				categoryId:['360233879019193605','530363088214426885'],
+				TypeArray: ['热点要闻', '园区快讯'],
+				TypeIndex: 0,
 			};
 
 		},
@@ -97,6 +116,14 @@ import utils from '../../service/utils';
 
 		},
 		methods: {
+			/**
+			 * 反馈类型
+			 * @param {Object} val
+			 */
+			FeedbackTypeCh(val) {
+				console.log(val);
+				this.TypeIndex = val.detail.value;
+			},
 			// 获取上传状态
 			select(e) {
 				console.log('选择文件：', e)
@@ -155,13 +182,15 @@ import utils from '../../service/utils';
 			postAll() {
 				console.log("进入POST")
 				let that = this
+				let categoryId = that.categoryId[that.TypeIndex]
+				console.log(categoryId)
 				if (that.uploadPath) {
 					console.log('jinru')
 					// console.log(uni.getStorageSync('token'))
 					var info = {
 							title: that.valiFormData.title,
 							bodyContent: that.valiFormData.bodyContent,
-							categoryId:that.categoryId,
+							categoryId:categoryId,
 							creatorUserId: that.userCode.userId,
 							subTitle: that.valiFormData.subTitle,
 							imgUrl: that.uploadPath,
diff --git a/pages/postNotice/postNotice.vue b/pages/postNotice/postNotice.vue
index 2144739..1d15a1b 100644
--- a/pages/postNotice/postNotice.vue
+++ b/pages/postNotice/postNotice.vue
@@ -21,6 +21,23 @@
 			<view class="example-body">
 				<uni-file-picker limit="9" @select="select" title="信息图片"></uni-file-picker>
 			</view>
+			<!-- 选择反馈类型 -->
+			<view class="feedback-type">
+				<view class="feedback-type-left">隶属类别</view>
+				<view class="feedback-type-right">
+					<view class="title">
+						<text>{{TypeArray[TypeIndex]}}</text>
+					</view>
+					<view class="picker">
+						<picker @change="FeedbackTypeCh" :value="TypeIndex" :range="TypeArray">
+							<view class="uni-input">{{TypeArray[TypeIndex]}}</view>
+						</picker>
+					</view>
+					<view class="more">
+						<image src="../../static/down1.png"></image>
+					</view>
+				</view>
+			</view>
 		</view>
 
 		<!-- 提交 -->
@@ -74,7 +91,9 @@ import utils from '../../service/utils';
 				isId:'',
 				have:false,
 				detailData:[],
-				categoryId:'360234116366468357'
+				categoryId:['360234116366468357','530362479830631685'],
+				TypeArray: ['公示', '通知'],
+				TypeIndex: 0,
 			};
 
 		},
@@ -97,6 +116,14 @@ import utils from '../../service/utils';
 
 		},
 		methods: {
+			/**
+			 * 反馈类型
+			 * @param {Object} val
+			 */
+			FeedbackTypeCh(val) {
+				console.log(val);
+				this.TypeIndex = val.detail.value;
+			},
 			// 获取上传状态
 			select(e) {
 				console.log('选择文件：', e)
@@ -155,16 +182,20 @@ import utils from '../../service/utils';
 			postAll() {
 				console.log("进入POST")
 				let that = this
+				let categoryId = that.categoryId[that.TypeIndex]
+				console.log(categoryId)
+				console.log(that.uploadPath)
 				if (that.uploadPath) {
 					console.log('jinru')
 					// console.log(uni.getStorageSync('token'))
 					var info = {
 							title: that.valiFormData.title,
 							bodyContent: that.valiFormData.bodyContent,
-							categoryId:that.categoryId,
+							categoryId:categoryId,
 							creatorUserId: that.userCode.userId,
 							subTitle: that.valiFormData.subTitle,
 							imgUrl: that.uploadPath,
+							
 					}
 					console.log(info)
 					this.API.postInfo(info).then(res=>{
diff --git a/pages/postProduct/postProduct.vue b/pages/postProduct/postProduct.vue
index 28295bf..ecb3a8f 100644
--- a/pages/postProduct/postProduct.vue
+++ b/pages/postProduct/postProduct.vue
@@ -193,6 +193,10 @@
 								uni.showToast({
 									icon:"success",
 									title:"发布成功"
+								}).then(()=>{
+									uni.navigateTo({
+										url:'/pages/supply/supply'
+									})
 								})
 							}
 							
diff --git a/pages/postTalent/postTalent.vue b/pages/postTalent/postTalent.vue
index e358aa4..29236f6 100644
--- a/pages/postTalent/postTalent.vue
+++ b/pages/postTalent/postTalent.vue
@@ -33,6 +33,7 @@
 					subTitle: '',
 					bodyContent: '',
 					post: '',
+					phone:''
 				},
 				creater: '',
 				rules: {
@@ -83,6 +84,10 @@
 							uni.showToast({
 								icon:"success",
 								title:'发布成功'
+							}).then(()=>{
+								uni.navigateTo({
+									url:'/pages/talent/talent'
+								})
 							})
 						}
 					})
diff --git a/pages/recommend/postRecommend/postRecommend.vue b/pages/recommend/postRecommend/postRecommend.vue
index c25444f..7fdb149 100644
--- a/pages/recommend/postRecommend/postRecommend.vue
+++ b/pages/recommend/postRecommend/postRecommend.vue
@@ -148,6 +148,29 @@
 			}
 		},
 		methods: {
+			// 获取用户信息
+			getUser() {
+				if (uni.getStorageSync('user')) {
+					let userCode = uni.getStorageSync("user")
+					console.log(userCode)
+					if(userCode.userInfo.userId === 'admin'){
+						this.isAdmin = true
+					}
+					console.log('用户已登录！')
+				} 
+				else {
+					uni.showToast({
+						title: '请登录',
+						icon: 'none',
+						duration:1500
+					})
+					setTimeout(() => {
+						uni.reLaunch({
+							url: '/pages/login/index'
+						})
+					})
+				}
+			},
 			// 获取上传状态
 			select(e) {
 				console.log('选择文件：', e)
@@ -204,6 +227,10 @@
 									uni.showToast({
 										icon:"success",
 										title:"发布成功！"
+									}).then(()=>{
+										uni.navigateTo({
+											url:'/pages/recommend/recommend'
+										})
 									})
 								}
 							})
diff --git a/pages/talentDetail/talentDetail.vue b/pages/talentDetail/talentDetail.vue
index 5cc1dce..020cf4c 100644
--- a/pages/talentDetail/talentDetail.vue
+++ b/pages/talentDetail/talentDetail.vue
@@ -24,12 +24,12 @@
 					<text>收藏</text>
 				</view>
 			</view> -->
-			<view class="footer-buy" style="width:100%">
+			<!-- <view class="footer-buy" style="width:100%">
 				<view class="buy-at" @click="callPhone(phoneNumber)">  
 					<image src="../../static/detail1.png"></image>
 					<text>打电话</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
--
libgit2 0.21.4