From 8bb63dcffc55854cee5ba5333116bff937ab962b Mon Sep 17 00:00:00 2001
From: zxy <353513737@qq.com>
Date: Mon, 19 Feb 2024 23:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                   |   8 +
 pages/index/index.vue        |  16 +-
 pages/project/newProject.vue | 549 +++++++++++++++++++++++++++++++++++
 pages/project/project.vue    |   4 +-
 pages/seach/seach.vue        |  20 +-
 5 files changed, 585 insertions(+), 12 deletions(-)
 create mode 100644 pages/project/newProject.vue

diff --git a/pages.json b/pages.json
index c83cbc3..6343150 100644
--- a/pages.json
+++ b/pages.json
@@ -51,6 +51,14 @@
                 "enablePullDownRefresh" : true
             }
         },
+		{
+		    "path" : "pages/project/newProject",
+		    "style" : {
+		        "navigationBarTitleText" : "德阳市灵活就业平台",
+		        "navigationBarBackgroundColor" : "#FFFFFF",
+		        "enablePullDownRefresh" : true
+		    }
+		},
         {
             "path" : "pages/news/news",
             "style" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8fb785a..741c466 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -181,23 +181,27 @@
 			</view>
 		</view>
 		<view class="latestMission">
-			<view class="cardTips" style="margin-left: 16px;">最新任务</view>
+			<view class="cardTips" style="margin-left: 16px;">最新资讯</view>
+			<view style="position:absolute;right: 0;">更多</view>
 			<view class="newPeojectList">
-				<block v-if="companyList.length>0" v-for="(item, index) in companyList" :key="item.id">
+				<!-- <block v-if="companyList.length>0" v-for="(item, index) in companyList" :key="item.id">
 					<view class="baddd"></view>
 					<company-list :companyitem="item"></company-list>
-				</block>
+				</block> -->
+				<view style="display: flex;">
+					
+				</view>
 				<view v-if="companyList.length<=0">
 					<image src="../../static/img/pic_notask.svg" class="nothing" mode=""></image>
-					<view class="nothing_text">暂无最新任务</view>
+					<view class="nothing_text">暂无最新资讯</view>
 					<view class="baddd"></view>
 				</view>
 			</view>
 
 		</view>
 		<view class="homeFooter">
-			<view class="atBottom">已经到到底了</view>
-			<image src="../../static/img/index/seeMore.png" mode="" @click="goMore()"></image>
+			<view class="atBottom">德阳市人力资源和社会保障局主办</view>
+			<!-- <image src="../../static/img/index/seeMore.png" mode="" @click="goMore()"></image> -->
 		</view>
 		<policy-content ref="pContent"></policy-content>
 	</view>
diff --git a/pages/project/newProject.vue b/pages/project/newProject.vue
new file mode 100644
index 0000000..a321842
--- /dev/null
+++ b/pages/project/newProject.vue
@@ -0,0 +1,549 @@
+<template>
+	<view>
+		<view class="titleSearch">
+			<view class="searchName">搜 索</view>
+
+			<u-search placeholder="搜任务/搜岗位/搜政策" @focus="goSeach" shape="round" :showAction="false"></u-search>
+		</view>
+
+		<view class="content">
+			<view class="typeButtonWrapper">
+				<view class="typeButtonLeft">
+
+					<view v-for="(item, index) in nonReactiveArray" :key="index"
+						:class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{ item
+						}}</view>
+				</view>
+				<!-- 筛选 -->
+				<!-- <view class="screenButton" @click="showPopUp = true">
+					筛选
+					<view class="arrow-up-right"> </view>
+				</view> -->
+			</view>
+
+			<u-popup closeable :show="showPopUp" mode="right" @close="closePopUp">
+				<view class="popUpWrapper">
+					<verticalMenu :closePopUp="closePopUp" :subMitPopUp="subMitPopUp" />
+				</view>
+			</u-popup>
+
+			<block v-if="activeTab == 0">
+				<view v-if="newList.length > 0">
+					<block v-for="(item, index) in newList" :key="index">
+						<companyList :companyitem="item"></companyList>
+					</block>
+				</view>
+				<view v-else>
+					<image src="../../static/img/pic_notask.svg" class="nothing" mode=""></image>
+					<view class="nothing_text">暂无信息</view>
+				</view>
+			</block>
+
+			<block v-if="activeTab == 1">
+				<view>
+					<!-- <view class="location" @click="gomap">
+						<image src="../../static/img/location.svg" mode=""></image>
+						{{ currentAddress }}（切换位置）
+						<image src="../../static/img/right.svg" mode=""></image>
+					</view> -->
+				</view>
+
+				<view v-if="companyList.length > 0">
+					<block v-for="(item, index) in companyList" :key="item.id">
+						<workList :companyitem="item" :near="activeTab === 0"></workList>
+					</block>
+				</view>
+				<view v-else>
+					<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+					<view class="nothingContnt">
+						暂无信息
+					</view>
+				</view>
+			</block>
+
+			<block v-if="activeTab == 2">
+				<!-- <view v-if="recommendList.length > 0">
+					<block v-for="(item, index) in recommendList" :key="item.id">
+						<companyList :companyitem="item"></companyList>
+					</block>
+				</view>
+
+				<view v-else>
+					<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+					<view class="nothingContnt">
+						完善技能，获取精推荐
+					</view>
+					<view class="btn" @click="goResume">
+						完善技能
+					</view>
+				</view> -->
+				<view v-for="(item, index) in policyContentList" :key="index" style="width: 90%;height: 100rpx;background-color: #fff;border-radius: 10rpx;margin:20rpx 5% 20rpx 5%;display: flex;align-items: center" @click="goPolicyInfo(item.id)">
+					<image :src="item.headPic" style="width: 60rpx;height: 60rpx;margin: 0 20rpx;"></image>
+					<view style="font-size: 26rpx;">{{ item.articleTitle }}</view>
+				</view>
+			</block>
+
+			<cs-button></cs-button>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import vTabs from '@/components/v-tabs/v-tabs.vue';
+import testData from '@/common/textdata.js';
+import companyList from '@/components/companyList/companyList.vue';
+import workList from '@/components/companyList/workList.vue'
+import {
+	newMissionAll,
+	recommendMission,
+	nearMission
+} from '@/api/mission.js';
+import {getPolicyContent} from '@/api/newIndex.js'
+import {
+	getcoder
+} from "@/api/map.js";
+import verticalMenu from '@/components/vertical-menu/vertical-menu.vue';
+
+export default {
+	components: {
+		vTabs,
+		companyList, 
+		verticalMenu,
+		workList
+	},
+
+	data() {
+		return {
+			policyContentList: [],
+			activeTab: 0,
+			companyList: [],
+			recommendList: [],
+			newList: [],
+			
+			nearPage: {
+				current: 1,
+				size: 10,
+				total: 0
+			},
+			recommendPage: {
+				current: 1,
+				size: 10,
+				total: 0
+			},
+			newPage: {
+				current: 1,
+				size: 10,
+				total: 0
+			},
+			currentAddress: '',
+			currentPoint: {
+				latitude: 0,
+				longitude: 0
+			},
+			key: 'FW3BZ-6JTK6-GCUS5-MZCRR-3GPR5-HJFEI',
+			open: false,
+			showPopUp: false,
+
+			nonReactiveArray: ["最新任务", "最新岗位", "最新政策"],
+		}
+	},
+	onLoad: function () {
+		this.getData()
+		this.getPolicy()
+	},
+	onShow: function () {
+		if (this.$store.state.user.token) {
+			this.$store.dispatch('refreshAuthState').then((e) => {
+				var auth = this.$store.state.auth
+				if (!auth.bankCardState) {
+					this.step()
+				}
+			})
+		}
+
+		const value = uni.getStorageSync('active');
+		if (value) {
+			this.activeTab = value;
+			uni.removeStorageSync('active')
+		}
+	},
+	/*页面滚动到底部 换页*/
+	onReachBottom: function () {
+		this.upLoad()
+	},
+	/*下拉刷新*/
+	onPullDownRefresh: function () {
+		if (!this.$store.state.user.token) {
+			uni.redirectTo({
+				url: "/pages/login/login"
+			});
+		} else {
+			this.download();
+		}
+	},
+	methods: {
+		step() {
+			var that = this
+			that.open = true
+			uni.showModal({
+				title: '实名认证',
+				content: `检查到您还未实名认证，实名认证之后才可进行操作哦`,
+				showCancel: false,
+				confirmText: '立即认证',
+				success: function (res) {
+					if (res.confirm) {
+						that.goSign(0)
+					} else if (res.cancel) {
+						that.step()
+					}
+					that.open = false
+				}
+			});
+		},
+		// 步骤
+		goSign(active) {
+			uni.navigateTo({
+				url: `/pages/projectInfo/signContract?active=${active}`
+			})
+		},
+		goResume: function () {
+			uni.navigateTo({
+				url: '/pageMy/my/resume/addSkill'
+			})
+		},
+		/*定位*/
+		getLocation: function () {
+			var that = this;
+			uni.getLocation({
+				type: 'gcj02',
+				success: function (res) {
+					that.currentPoint = {
+						latitude: res.latitude,
+						longitude: res.longitude
+					}
+					that.getAddrByPoint(res);
+					that.getNearList(that.currentPoint)
+				},
+				complete: function (e) { }
+			});
+		},
+		/*逆地址解析*/
+		getAddrByPoint: function (point) {
+			var that = this;
+			var location = point.latitude + ',' + point.longitude
+			getcoder(location, encodeURI(that.key), 0).then(res => {
+				that.currentAddress = res.data.result.address
+			});
+		},
+		goSeach: function () {
+			uni.navigateTo({
+				url: '../seach/seach'
+			})
+		},
+		gomap: function () {
+			uni.navigateTo({
+				url: '../mapSeach/mapSeach'
+			})
+		},
+		getPolicy(){
+			getPolicyContent(1).then(res=>{
+				this.policyContentList=res.data.data.records
+			})
+		},
+		changeTab: function (e) {
+			this.activeTab = e;
+		},
+		//附近任务；
+		getNearList: function (point) {
+			nearMission(this.nearPage.current, this.nearPage.size).then(res => {
+				if (this.nearPage.current === 1) {
+					this.companyList = [];
+				}
+				this.nearPage.current += 1;
+				this.nearPage.total = res.data.data.total;
+				if (res.data.data && res.data.data.records.length) {
+					this.companyList = this.companyList.concat(res.data.data.records);
+				}
+			})
+		},
+		goPolicyInfo(data){
+			if(data){
+				// var val=encodeURIComponent(data)
+				
+				uni.navigateTo({
+					url:`/pages/user/policyContent?id=${data}`
+				})
+				
+			}
+			else{
+				// uni.showToast({
+				// 	title:'暂无内容',
+				// 	icon:'none'
+				// })
+			}
+		},
+		//推荐任务；
+		getRecommendList: function () {
+			recommendMission(this.recommendPage.current, this.recommendPage.size, '').then(res => {
+				if (this.recommendPage.current === 1) {
+					this.recommendList = [];
+				}
+				this.recommendPage.current += 1;
+				this.recommendPage.total = res.data.data.total;
+				if (res.data.data && res.data.data.records.length) {
+					this.recommendList = this.recommendList.concat(res.data.data.records);
+				}
+			})
+		},
+		//最新任务；
+		getNewList: function () {
+			newMissionAll(this.newPage.current, this.newPage.size, '').then(res => {
+				if (this.newPage.current === 1) {
+					this.newList = [];
+				}
+				this.newPage.current += 1;
+				this.newPage.total = res.data.data.total;
+				if (res.data.data && res.data.data.records.length) {
+					this.newList = this.newList.concat(res.data.data.records);
+				}
+			})
+		},
+		//上拉加载
+		upLoad: function () {
+			if (this.activeTab === 0) {
+				if (this.nearPage.current <= Math.ceil(this.nearPage.total / this.nearPage.size)) {
+					this.getNearList(this.currentPoint);
+				} else {
+					uni.showToast({
+						icon: "none",
+						title: '已经是最后一页',
+					})
+				}
+				return
+			}
+			if (this.activeTab === 1) {
+				if (this.recommendPage.current <= Math.ceil(this.recommendPage.total / this.recommendPage.size)) {
+					this.getRecommendList();
+				} else {
+					uni.showToast({
+						icon: "none",
+						title: '已经是最后一页',
+					})
+				}
+				return
+			}
+			if (this.activeTab === 2) {
+				if (this.newPage.current <= Math.ceil(this.newPage.total / this.newPage.size)) {
+					this.getNewList();
+				} else {
+					uni.showToast({
+						icon: "none",
+						title: '已经是最后一页',
+					})
+				}
+				return
+			}
+		},
+		//下拉刷新
+		download: function () {
+			if (this.activeTab === 0) {
+				this.nearPage.current = 1;
+				this.getLocation();
+				setTimeout(function () {
+					uni.stopPullDownRefresh();
+				}, 1000);
+				return
+			}
+			if (this.activeTab === 1) {
+				this.recommendPage.current = 1;
+				this.getRecommendList();
+				setTimeout(function () {
+					uni.stopPullDownRefresh();
+				}, 1000);
+				return
+			}
+			if (this.activeTab === 2) {
+				this.newPage.current = 1;
+				this.getNewList();
+				setTimeout(function () {
+					uni.stopPullDownRefresh();
+				}, 1000);
+				return
+			}
+		},
+		getData: function () {
+			if (!this.$store.state.user.token) {
+				uni.redirectTo({
+					url: "/pages/login/login"
+				});
+			} else {
+				uni.$emit('newsReadChange');
+				this.nearPage.current = 1;
+				this.recommendPage.current = 1;
+				this.newPage.current = 1;
+				this.getLocation();
+				this.getRecommendList();
+				this.getNewList();
+				this.getNearList();
+			}
+		},
+
+
+		closePopUp() {
+			this.showPopUp = false
+		},
+		subMitPopUp({submitData,areaModal,industryModal}) {
+			console.log(submitData,areaModal,industryModal,"------确定");
+			this.showPopUp = false
+		}
+	}
+}
+</script>
+
+<style scoped>
+.titleSearch {
+	display: flex;
+	width: 80%;
+	margin: 0 auto;
+	font-size: 22px;
+	font-weight: bold;
+	padding: 20rpx;
+}
+
+
+
+.searchName {
+	margin-right: 28rpx;
+}
+
+.content {
+	background-color: #f3f4f8;
+	padding-top: 20rpx;
+	min-height: 80vh;
+}
+
+
+
+.screenButton {
+	/* position: absolute;
+	top: 10px;
+	z-index: 1;
+	left: 30rpx; */
+	position: relative;
+	width: 50px;
+	text-align: center;
+	line-height: 30px;
+	font-size: 14px;
+	background-color: #fff;
+}
+
+.typeButtonWrapper {
+	width: 92%;
+	margin: 0 auto;
+	display: flex;
+	justify-content: space-between;
+	/* margin-bottom: 10rpx; */
+}
+
+.typeButtonLeft {
+	display: flex;
+}
+
+.typeButton {
+	font-size: 14px;
+	padding: 10rpx 40rpx;
+	background: #fff;
+	border-radius: 50px;
+	margin-right: 10rpx;
+}
+
+.activeButton {
+	color: #4171f9;
+	background-color: #cfdaf8;
+}
+
+.arrow-up-right {
+	width: 0;
+	height: 0;
+	border-left: 10px solid transparent;
+	border-right: 10px solid #949396;
+	/* 这里的颜色可以根据你的需要进行修改 */
+	border-bottom: 10px solid transparent;
+	position: absolute;
+	top: 3px;
+	right: 3px;
+
+}
+
+
+.topseach {
+	width: 25px;
+	height: 25px;
+	position: absolute;
+	top: 10px;
+	right: 30rpx;
+}
+
+.location image:last-child {
+	margin-left: auto;
+}
+
+.location image {
+	width: 40rpx;
+	height: 40rpx;
+	margin-right: 10rpx;
+}
+
+.location {
+	padding: 20rpx 30rpx;
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #333333;
+}
+
+.btn {
+	margin: 0 auto;
+	color: #999;
+	border: 1rpx solid #999;
+	font-size: 28rpx;
+	height: 52rpx;
+	line-height: 52rpx;
+	text-align: center;
+	width: 180rpx;
+	border-radius: 5rpx;
+	margin-top: 30rpx;
+}
+
+.nothing_text {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #666666;
+	text-align: center;
+}
+
+.nothingContnt {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #333333;
+	margin-top: 30rpx;
+	text-align: center;
+}
+
+.nothing {
+	width: 400rpx;
+	height: 200rpx;
+	display: block;
+	margin: 0 auto;
+	margin-top: 300rpx;
+}
+
+
+
+.popUpWrapper {
+	width: 100%;
+}
+</style>
diff --git a/pages/project/project.vue b/pages/project/project.vue
index 8879466..a486716 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -28,7 +28,7 @@
 			</u-popup>
 
 			<block v-if="activeTab == 0">
-				<view v-if="newList.length > 0">
+				<view v-if="newList.length > 0" style="padding-bottom: 20rpx;">
 					<block v-for="(item, index) in newList" :key="index">
 						<companyList :companyitem="item"></companyList>
 					</block>
@@ -48,7 +48,7 @@
 					</view> -->
 				</view>
 
-				<view v-if="companyList.length > 0">
+				<view v-if="companyList.length > 0" style="padding-bottom: 20rpx;">
 					<block v-for="(item, index) in companyList" :key="item.id">
 						<workList :companyitem="item" :near="activeTab === 0"></workList>
 					</block>
diff --git a/pages/seach/seach.vue b/pages/seach/seach.vue
index a1322b2..13950fc 100644
--- a/pages/seach/seach.vue
+++ b/pages/seach/seach.vue
@@ -6,7 +6,7 @@
 					<image src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;" mode=""></image>
 					<input type="text" confirm-type="搜索" v-model="keywords" @confirm="getNewList('search')"
 						placeholder="请输入任务名称或公司名称" />
-					<view style="width: 80rpx;height: 50rpx;color:#fff;background-color: #0091ff;font-size:24rpx;text-align: center;line-height: 50rpx;border-radius: 25rpx;;">搜索</view>
+					<view @click="getNewList('search')" style="width: 80rpx;height: 50rpx;color:#fff;background-color: #0091ff;font-size:24rpx;text-align: center;line-height: 50rpx;border-radius: 25rpx;;">搜索</view>
 				</view>
 				<!-- <view class="close" @click="closeBack">
 					取消
@@ -220,9 +220,21 @@ export default {
 		
 		toDetail(item) {
 			const no = item.id
-			uni.navigateTo({
-				url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(no)}&isCan=1`
-			})
+			// 判断是岗位还是任务 0：任务，1：岗位，2：政策
+			if(item.type == 0) {
+				uni.navigateTo({
+					url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(no)}&isCan=1`
+				})
+			} else if(item.type == 1) {
+				uni.navigateTo({
+					url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(no)}&isCan=1`
+				})
+			} else if(item.type == 2) {
+				uni.navigateTo({
+					url:`/pages/user/policyContent?id=${no}`
+				})
+			}
+			
 		},
 
 		changeTab: function (e) {