三得利页面调整

apis/pagejs/index.md

@@ -0,0 +1,19 @@
+import requestWhite from '@/apis/utils/requestWhite'
+import request from '@/apis/utils/request'
+ 
+[x]//  /mobile/recruit/findAllRecruit 
// 首页查询的接口

// /mobile/recruit/findRecruitSearch
// 搜索结果 查询
+ /mobile/news/
+ 下面包括首页的top
+ 新闻政策(政策发布,爱心驿站,招聘新闻) 新闻详细
+ 共享用工 共享用工详细
+ 技能培训 技能培训详细
+ 
+ ---------------------
+ recruit-api
+ 
+ 
+ 
+ 
+ 
+ [](https://modao.cc/app/tVP0IkhVrw0ksnBNexe9Md)
+

apis/pagejs/main.js

@@ -1,32 +1,12 @@
 import requestWhite from '@/apis/utils/requestWhite'
- import request from '@/apis/utils/request'
+import request from '@/apis/utils/request'
  
-
-export function urlgetlisg(data,url) {
-	//var url = '/mobile/out/outApproveList';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-
-export function outApproveList(data) {
-	var url = '/mobile/out/outApproveList';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-export function queryDeviceByCode(data) {
-	var url = '/mobile/device/queryDeviceByCode';
-	return requestWhite({
-		method: 'post',
-		data: data,
-		url: url
-	})
+export function findRecruitHomePage(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/recruit/findRecruitHomePage'
+ 	})
 }
 
 export function findByOpenId(data) {
@@ -47,71 +27,3 @@ export function logout(data) {
 		url: url
 	})
 }
-
-export function userDepartmentList() {
-	var url='/mobile/user/userDepartmentList';
-	return request({
-		method: 'post',
-		//data: data,
-		url: url
-	})
-}
-
- 
-export function deviceList(data) {
-	var url='/mobile/device/deviceList';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-export function deviceDetails(data) {
-	var url='/mobile/device/deviceDetails';
-	return requestWhite({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-export function deviceDetailsByName(data) {
-	var url='/mobile/device/deviceDetailsByName';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-export function deviceTypeList(data) {
-	var url='/mobile/device/deviceTypeList';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-
-
-export function validateCode(data) {
-	 
-	return requestWhite({
-		method: 'post',
-		data:data ,
-		url: '/mobile/user/validateCode'
-	})
-} 
-
-export function getVerifyCode(tel) {
-	 
-	return requestWhite({
-		method: 'post',
-		data:{
-			telephone:tel
-		} ,
-		url: '/mobile/user/getVerifyCode'
-	})
-} 

apis/pagejs/packages.js

@@ -0,0 +1,61 @@
+import requestWhite from '@/apis/utils/requestWhite'
+import request from '@/apis/utils/request'
+ 
+
+// 零工驿站
//  /mobile/recruit/findRecruitSearch
// status = 1
+
+export function findRecruitSearch(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/recruit/findRecruitSearch'
+ 	})
+}
+
+export function newsList(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/news/newsList'
+ 	})
+}
+
+export function newsDetail(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/news/newsDetail'
+ 	})
+}
+
+export function shareWorksDetail(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/news/shareWorksDetail'
+ 	})
+}
+
+export function shareWorksList(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/news/shareWorksList'
+ 	})
+}
+
+export function trainingDetail(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/news/trainingDetail'
+ 	})
+}
+
+export function trainingList(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/news/trainingList'
+ 	})
+}

apis/pagejs/tab.js

@@ -1,112 +1,3 @@
-import request from '@/apis/utils/request'
-
-//----出库
-export function outApplyList(data) {
-	var url = '/mobile/out/outApplyList';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-export function inApplyList(data) {
-	var url = '/mobile/in/inApplyList';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-// export function outRecord(data) {
-// 	var url = '/mobile/out/outRecord';
-// 	return request({
-// 		method: 'post',
-// 		data: data,
-// 		url: url
-// 	})
-// }
-
-export function outRecordDeviceById(data) {
-	var url = '/mobile/out/outRecordDeviceById';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-export function saveOutRecord(data) {
-	var url = '/mobile/out/saveOutRecord';
-	return request({
-		//	header:{'Content-Type':'application/json'},
-
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-export function saveInRecord(data) {
-	var url = '/mobile/in/saveOutRecord';
-	return request({
-		//	header:{'Content-Type':'application/json'},
-
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-
-
-export function createOutRecord(data) {
-	var url = '/mobile/out/createOutRecord';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-export function outRecordDetail(data) {
-	var url = '/mobile/out/outRecordDetail';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-export function queryDeviceByCode(data) {
-	var url = '/mobile/device/queryDeviceByCode';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-export function cancelOutRecord(data) {
-	var url = '/mobile/out/cancelOutRecord';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-
-export function inRecordDetail(data) {
-	var url = '/mobile/in/inRecordDetail';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-
-export function deviceDetailsByName(data) {
-	var url = '/mobile/device/deviceDetailsByName';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
+import requestWhite from '@/apis/utils/requestWhite'
+import request from '@/apis/utils/request'
+ 

apis/status.js

@@ -1,78 +0,0 @@
-
-export const recordStatus = (val,item) => {
-	var retu = ""
-	switch (val) {
-		case '-1':
-			retu = '未开始'
-			break;
-		case '0':
-			retu = '待审核'
-			break;
-		case '1':
-			retu = '待出库'
-			break;
-		case '2':
-			retu = '已驳回'
-				break;
-		case '3':
-				retu = '完成出库'
-				break;
-			case '5':
-				retu = '已撤销'
-			break;
-	}
-	if(item&&item.statusN&&!retu){
-		retu=item.statusN;
-	}
-	return retu
-}
-
-export const recordStatusColor = (val) => {
-	var retu = ""
-	val=val+''
-	switch (val) {
-		case '-1':
-			retu = '#f29a38'
-			break;
-		case '0':
-			retu = '#f29a38'
-			break;
-		case '1':
-			retu = '#52b56b'
-			break;
-		case '2':
-			retu = '#c94031'
-			break;
-		case '3':
-			retu = '#3a3bc2'
-			break;
-		case '5':
-			retu = '#c94031'
-			break;
-		default:
-			retu = '#52b56b'
-			break;
-	}
-
-	return retu
-}
-
-
-export const recordItemStatus = (val) => {
-	var retu = ""
-	switch (val) {
-		
-		case '0':
-			retu = '预出库'
-			break;
-		case '1':
-			retu = '已出库'
-			break;
-		case '2':
-			retu = '已出库'
-			break;
-	}
-
-	return retu
-}
-

config/.env.dev.js

@@ -1,7 +1,7 @@
 const UNI_APP = {  
-	ProjectName :"荆力设备管理",
-	//BASE_URL: 'http://192.168.77.162:8086/equipment-manage-server/',
-	BASE_URL:"https://equipment.xiaoxinda.com/equipment-manage-server/",
+	ProjectName :"荆州经开区共享用工平台",
+	 BASE_URL: 'http://192.168.77.162:8086/jk-temporary-workers-server/',
+	//BASE_URL:"https://equipment.xiaoxinda.com/equipment-manage-server/",
 	//IMG_URL:"http://www.jsrailway.com.cn/",
 	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 	

config/.env.prod.js

@@ -1,5 +1,5 @@
 const UNI_APP = {  	
-	ProjectName :"荆力设备管理",
+	ProjectName :"荆州经开区共享用工平台",
 	PREFIX : "jp-Equipment-Jingli",
 	
 //	BASE_URL:"http://47.98.231.198:8081/equipment-manage-server/",

config/.env.test.js

@@ -1,6 +1,6 @@
 const UNI_APP = {  
 	PREFIX : "jp-Equipment-Jingli",
-	ProjectName :"荆力设备管理",
+	ProjectName :"荆州经开区共享用工平台",
 	
 	//BASE_URL:"http://47.98.231.198:8081/equipment-manage-server/",
     //BASE_URL: 'https://charging.xiaoxinda.com/charging-station-server/',

pages/main/index/index.vue

@@ -1,371 +1,438 @@
-<template>
-	<view>
-		<u-navbar back-text="荆州经开区共享用工平台"  :customBack="customBack" :background="background" :back-text-style="backColor"></u-navbar>
-
-
-
-		<!-- 头部 -->
-		<view class="top">
-			<!-- 搜索框 -->
-			<view class="search">
-				<u-search placeholder="请输入找工关键字" 
-				 @focus="gotoUrl('pages/packages/search/search')"
-				 :show-action="false"></u-search>
-			</view>
-
-		</view>
-		<!-- 幻灯片 -->
-		<view class="swiper">
-			<u-swiper :list="list"></u-swiper>
-
-		</view>
-		<!-- 功能区 -->
-		<view class="function">
-			<view class="function-item"  @click="gotoUrl('pages/packages/choreInformation/choreInformation')">
-				<view class="icon-box icon-box3">
-			
-					<view class="icon">
-						<img src="@/assets/img/riFill-contacts-book-2-fill@1x.png" alt="">
-					</view>
-			
-				</view>
-				<view class="item-text">
-					零工驿站
-				</view>
-			</view>
-			<view class="function-item"  @click="gotoUrl('pages/packages/news/news?t=1&title=爱心驿站')">
-				<view class="icon-box icon-box2">
-
-					<view class="icon">
-						<img src="@/assets/img/riFill-heart-2-fill@1x.png" alt="">
-					</view>
-
-				</view>
-				<view class="item-text">
-					爱心驿站
-				</view>
-			</view>
-			<view class="function-item" @click="gotoUrl('pages/packages/mine/employmentService/shareEmployment')">
-				<view class="icon-box">
-					<view class="icon">
-						<img src="@/assets/img/riFill-cloud-fill@1x.png" alt="">
-					</view>
-				</view>
-				
-				<view class="item-text">
-					共享用工
-				</view>
-			</view>
-			
-			<view class="function-item"  @click="gotoUrl('pages/packages/skillTraining/skillTraining')">
-				<view class="icon-box icon-box4">
-			
-					<view class="icon">
-						<img src="@/assets/img/riFill-tools-fill@1x.png" alt="">
-					</view>
-			
-				</view>
-				<view class="item-text">
-					技能培训
-				</view>
-			</view>
-			<view class="function-item"   @click="gotoUrl('pages/packages/news/news?t=2&title=政策发布')" >
-				<view class="icon-box icon-box5">
-
-					<view class="icon">
-						<img src="@/assets/img/riFill-newspaper-fill@1x.png" alt="">
-					</view>
-
-				</view>
-				<view class="item-text">
-					政策发布
-				</view>
-			</view>
-
-
-		</view>
-		
-		<!-- 标签 -->
-		<view class="tabs">
-			<view class="title">
-				<u-tabs bg-color="#F0F0F2" :list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
-			   <view class="more"   @click="gotoUrl('pages/tab/jobInformation/jobInformation')" >
-			   	更多
-				<u-icon name="arrow-right"></u-icon>
-			   </view>
-			
-			</view>
-			<!-- 卡片 -->
-			<view class="classify-card">
-				<view class="item" v-for="item in 3"  
+<template>
+	<view>
+		<u-navbar back-text="荆州经开区共享用工平台" :customBack="customBack" :background="background"
+			:back-text-style="backColor"></u-navbar>
+
+
+
+		<!-- 头部 -->
+		<view class="top">
+			<!-- 搜索框 -->
+			<view class="search">
+				<u-search placeholder="请输入找工关键字" @focus="gotoUrl('pages/packages/search/search')"
+					:show-action="false"></u-search>
+			</view>
+
+		</view>
+		<!-- 幻灯片 -->
+		<view class="swiper">
+			<u-swiper :list="bannerlist"></u-swiper>
+
+		</view>
+		<!-- 功能区 -->
+		<view class="function">
+			<view class="function-item" @click="gotoUrl('pages/packages/choreInformation/choreInformation')">
+				<view class="icon-box icon-box3">
+
+					<view class="icon">
+						<img src="@/assets/img/riFill-contacts-book-2-fill@1x.png" alt="">
+					</view>
+
+				</view>
+				<view class="item-text">
+					零工驿站
+				</view>
+			</view>
+			<view class="function-item" @click="gotoUrl('pages/packages/news/news?t=3&title=爱心驿站')">
+				<view class="icon-box icon-box2">
+
+					<view class="icon">
+						<img src="@/assets/img/riFill-heart-2-fill@1x.png" alt="">
+					</view>
+
+				</view>
+				<view class="item-text">
+					爱心驿站
+				</view>
+			</view>
+			<view class="function-item" @click="gotoUrl('pages/packages/mine/employmentService/shareEmployment')">
+				<view class="icon-box">
+					<view class="icon">
+						<img src="@/assets/img/riFill-cloud-fill@1x.png" alt="">
+					</view>
+				</view>
+
+				<view class="item-text">
+					共享用工
+				</view>
+			</view>
+
+			<view class="function-item" @click="gotoUrl('pages/packages/skillTraining/skillTraining')">
+				<view class="icon-box icon-box4">
+
+					<view class="icon">
+						<img src="@/assets/img/riFill-tools-fill@1x.png" alt="">
+					</view>
+
+				</view>
+				<view class="item-text">
+					技能培训
+				</view>
+			</view>
+			<view class="function-item" @click="gotoUrl('pages/packages/news/news?t=1&title=政策发布')">
+				<view class="icon-box icon-box5">
+
+					<view class="icon">
+						<img src="@/assets/img/riFill-newspaper-fill@1x.png" alt="">
+					</view>
+
+				</view>
+				<view class="item-text">
+					政策发布
+				</view>
+			</view>
+
+
+		</view>
+
+		<!-- 标签 -->
+		<view class="tabs">
+			<view class="title">
+				<u-tabs bg-color="#F0F0F2" :list="tabList" :is-scroll="false" :current="current"
+					@change="change"></u-tabs>
+				<view class="more" @click="gotoUrl('pages/tab/jobInformation/jobInformation')">
+					更多
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+
+			</view>
+			<!-- 卡片 -->
+			<view class="classify-card">
+				<view class="item" v-for="(item,i) in showList" :key="i"
 				 
-				 @click="gotoUrl('pages/packages/jobInformation/jobDetails')"
-				 >
-					<view class="content-1">
-						<!-- 职位 -->
-						<view class="position">
-							摄影助理
-						</view>
-						<!-- 薪水 -->
-						<view class="salary">
-							200元/天
-						</view>
-					</view>
-					<view class="content-2">
-						<!-- 标签 -->
-						<view class="tag">
-							<view class="tag-item">
-								个人
-							</view>
-							<view class="tag-item">
-								日结
-							</view>
-						</view>
-						<!-- 日期 -->
-						<view class="date">
-							2023-06-01
-						</view>
-					</view>
-					<view class="content-3">
-						<view class="issuer">
-							李先生
-						</view>
-						 <view class="address">
-						 	锦佳酒店
-						 </view>
-					</view>
-				</view>
-				
+				 @click="gotoUrl('pages/packages/jobInformation/jobDetails?id='+item.id)">
+					<view class="content-1">
+						<!-- 职位 -->
+						<view class="position">
+							{{item.positionName}}
+						</view>
+						<!-- 薪水 -->
+						<view class="salary">
+							{{item.salary}}元/{{tabList[item.settlementMethod].unit}}
+						</view>
+					</view>
+					<view class="content-2">
+						<!-- 标签 -->
+						<view class="tag">
+							<!-- <view class="tag-item">
+								个人
+							</view> -->
+							<view class="tag-item">
+								{{item.settlementMethodN}}
+							</view>
+						</view>
+						<!-- 日期 -->
+						<view class="date">
+							{{item.createTime}}
+						</view>
+					</view>
+					<view class="content-3">
+						<view class="issuer">
+							{{item.contacts}}
+						</view>
+						<view class="address">
+							{{item.workArea}}
+						</view>
+					</view>
+				</view>
+
 			</view>
-			
+			
+		<u-divider style="margin-top: 10px;"
+		 :isnone="showList.length==0" nonetext="没有找到相关内容" 
+		 @click="gotoUrl('pages/tab/jobInformation/jobInformation')"
+		border-color="#CFD2D5">点击查看更多</u-divider>
 		</view>
-		<tabbar :current="0"></tabbar>
-		
-	</view>
-
-
-
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/main.js'
-	import tabbar from "@/components/Tabbar.vue"
-	
-	export default {
-		components: {
-		
-			tabbar
+		
+		<tabbar :current="0"></tabbar>
+
+	</view>
+
+
+
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/main.js'
+	import tabbar from "@/components/Tabbar.vue"
+
+	export default {
+		components: {
+
+			tabbar
+		},
+		data() {
+			return {
+				keyword: '',
+				// 导航栏背景
+				background: {
+					backgroundColor: '#2795FD',
+				},
+				backColor: {
+					color: '#ffffff'
+				},
+				bannerlist: [{
+						image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
+					},
+					{
+						image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
+					},
+					{
+						image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
+					}
+				],
+				tabList: [{
+					name: '最新',
+					value:"",
+					list:[],
+					recordsTotal:0
+				}, {
+					name: '日结',
+					unit:"日",
+					value:"1",
+					list:[],
+					recordsTotal:0
+				}, {
+					name: '周结',
+					unit:"周",
+					value:"2",
+					list:[],
+					recordsTotal:0
+
+				}, {
+					name: '月结',
+					unit:"月",
+					value:"3",
+					list:[],
+					recordsTotal:0
+				}],
+				
+				current: 0,
+				homeList:[],
+				
+			}
+		},
+		onLoad() {
+			this.findRecruitHomePage();
 		},
-		data() {
-			return {
-				keyword: '',
-				// 导航栏背景
-				background: {
-					backgroundColor: '#2795FD',
-				},
-				backColor: {
-					color: '#ffffff'
-				},
-				list: [{
-						image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
-					},
-					{
-						image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
-					},
-					{
-						image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-					}
-				],
-					tabList: [{
-									name: '最新'
-								}, {
-									name: '日结'
-								}, {
-									name: '周结',
-									
-								},{
-									name:'月结'
-								}],
-								
-             current:0
+		computed:{
+			showRecordsTotal(){
+				return this.tabList[this.current].recordsTotal
+			},
+			showList(){
+				return this.tabList[this.current].list
 			}
-		},
-		onLoad() {
-
-		},
+		},
 		methods: {
-			customBack(){},
-        change(index) {
-        				this.current = index;
-        			}
-		}
-	}
-</script>
-<style>
-	page {
-		background: #F0F0F2;
-		padding-bottom: 50px;
-	}
-</style>
-<style scoped lang="scss">
-	/deep/.u-navbar {
-		.u-icon--right {
-			display: none !important;
-		}
-	}
-
-	// 头部
-	.top {
- 
-		// 搜索框
-		.search {
-			background-color: rgba(39, 149, 253, 1);
-			padding: 16rpx 32rpx;
-
-		}
-
-	}
-
-	// 功能区
-	.function {
-		background-color: #fff;
-		padding: 32rpx 46rpx;
-		display: flex;
-		justify-content: space-between;
-
-		.function-item {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-
-			.icon-box {
-				width: 96rpx;
-				height: 96rpx;
-				background-color: rgba(240, 233, 255, 1);
-				text-align: center;
-				border-radius: 999px;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.icon-box2 {
-				background-color: rgba(255, 234, 230, 1);
-			}
-
-			.icon-box3 {
-				background-color: rgba(227, 246, 255, 1);
-			}
-
-			.icon-box4 {
-				background-color: rgba(255, 242, 224, 1);
-			}
-			.icon-box5 {
-				background-color: rgba(221, 247, 238, 1);
-			}
-
-
-			.icon {
-				width: 48rpx;
-				height: 48rpx;
-
-				img {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.item-text {
-				color: rgba(51, 51, 51, 1);
-				margin-top: 8rpx;
-				font-family: 'PingFang Medium';
-			}
-		}
-	}
-
-// 标签
-.tabs{
-	margin-top: 32rpx;
-	.title{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 0rpx 24rpx;
-		/deep/.u-tabs{
-			width: 400rpx;
-		}
-		.more{
-			color: rgba(119, 119, 119, 1);
-		}
-	}
-	.classify-card{
-		background-color: #fff;
-		.item{
-			padding: 24rpx 0;
-			margin: 0 32rpx;
-			border-bottom: 1px solid #F0F0F2;
-			.content-1{
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				// 职位
-				.position{
-					color: rgba(16, 16, 16, 1);
-					font-size: 36rpx;
-					font-family: 'PingFang Medium';
-				}
-				// 薪水
-				.salary{
-					color: rgba(255, 61, 0, 1);
-					font-size: 32rpx;
-					font-family: 'PingFang Medium';
-				}
-			}
-		
-		    .content-2{
-				margin-top: 12rpx;
-				display: flex;
-				justify-content: space-between;
-				// 标签
-				.tag{
-					display: flex;
-					.tag-item{
-						width: 64rpx;
-						height: 36rpx;
-						line-height: 36rpx;
-						border-radius: 8rpx;
-						background-color: rgba(241, 241, 247, 1);
-						color: rgba(129, 127, 153, 1);
-						font-size: 24rpx;
-						text-align: center;
-						margin-right: 12rpx;
-					}
-				}
-				// 日期
-				.date{
-					color: rgba(153, 153, 153, 1);
-					font-size: 24rpx;
-				}
-			}
-		
-		    .content-3{
-				margin-top: 20rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				.issuer{
-					color: rgba(51, 51, 51, 1);
-					font-size: 24rpx;
-				}
-				.address{
-					color: rgba(51, 51, 51, 1);
-					font-size: 24rpx;
-				}
-			}
-		
-		}
-	}
-}
-
+			findRecruitHomePage(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.findRecruitHomePage({
+					pageIndex:1,
+					pageSize:5,
+					type:this.tabList[this.current].value,
+				}).then((res) => {
+					uni.hideLoading();
+					this.tabList[this.current].list=res.data.data
+					this.tabList[this.current].recordsTotal=res.data.recordsTotal
+					
+				}).catch(error => {
+				
+					uni.showToast({
+						title: error
+					})
+					//this.getPhone()
+					
+				})
+			},
+			customBack() {},
+			change(index) {
+				this.current = index;
+				this.findRecruitHomePage()
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background: #F0F0F2;
+		padding-bottom: 50px;
+	}
+</style>
+<style scoped lang="scss">
+	/deep/.u-navbar {
+		.u-icon--right {
+			display: none !important;
+		}
+	}
+
+	// 头部
+	.top {
+
+		// 搜索框
+		.search {
+			background-color: rgba(39, 149, 253, 1);
+			padding: 16rpx 32rpx;
+
+		}
+
+	}
+
+	// 功能区
+	.function {
+		background-color: #fff;
+		padding: 32rpx 46rpx;
+		display: flex;
+		justify-content: space-between;
+
+		.function-item {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+
+			.icon-box {
+				width: 96rpx;
+				height: 96rpx;
+				background-color: rgba(240, 233, 255, 1);
+				text-align: center;
+				border-radius: 999px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.icon-box2 {
+				background-color: rgba(255, 234, 230, 1);
+			}
+
+			.icon-box3 {
+				background-color: rgba(227, 246, 255, 1);
+			}
+
+			.icon-box4 {
+				background-color: rgba(255, 242, 224, 1);
+			}
+
+			.icon-box5 {
+				background-color: rgba(221, 247, 238, 1);
+			}
+
+
+			.icon {
+				width: 48rpx;
+				height: 48rpx;
+
+				img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.item-text {
+				color: rgba(51, 51, 51, 1);
+				margin-top: 8rpx;
+				font-family: 'PingFang Medium';
+			}
+		}
+	}
+
+	// 标签
+	.tabs {
+		margin-top: 32rpx;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0rpx 24rpx;
+
+			/deep/.u-tabs {
+				width: 400rpx;
+			}
+
+			.more {
+				color: rgba(119, 119, 119, 1);
+			}
+		}
+
+		.classify-card {
+			background-color: #fff;
+
+			.item {
+				padding: 24rpx 0;
+				margin: 0 32rpx;
+				border-bottom: 1px solid #F0F0F2;
+
+				.content-1 {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					// 职位
+					.position {
+						color: rgba(16, 16, 16, 1);
+						font-size: 36rpx;
+						font-family: 'PingFang Medium';
+					}
+
+					// 薪水
+					.salary {
+						color: rgba(255, 61, 0, 1);
+						font-size: 32rpx;
+						font-family: 'PingFang Medium';
+					}
+				}
+
+				.content-2 {
+					margin-top: 12rpx;
+					display: flex;
+					justify-content: space-between;
+
+					// 标签
+					.tag {
+						display: flex;
+
+						.tag-item {
+							width: 64rpx;
+							height: 36rpx;
+							line-height: 36rpx;
+							border-radius: 8rpx;
+							background-color: rgba(241, 241, 247, 1);
+							color: rgba(129, 127, 153, 1);
+							font-size: 24rpx;
+							text-align: center;
+							margin-right: 12rpx;
+						}
+					}
+
+					// 日期
+					.date {
+						color: rgba(153, 153, 153, 1);
+						font-size: 24rpx;
+					}
+				}
+
+				.content-3 {
+					margin-top: 20rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.issuer {
+						color: rgba(51, 51, 51, 1);
+						font-size: 24rpx;
+					}
+
+					.address {
+						color: rgba(51, 51, 51, 1);
+						font-size: 24rpx;
+					}
+				}
+
+			}
+		}
+	}
 </style>

pages/packages/news/news.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<u-navbar back-text="政策发布" back-icon-size="28" back-icon-color="#ffffff"
+		<u-navbar :back-text="title" back-icon-size="28" back-icon-color="#ffffff"
 			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
 		<view class="main">
-			<view class="news-item" v-for="item in 4" 
-			@click="gotoUrl('pages/packages/news/articleDetail')">
+			<view class="news-item" v-for="(item,i) in list"  :key="i"
+			@click="gotoUrl('pages/packages/news/articleDetail?id='+item.id)">
 				<view class="content">
 					<view class="title">
 						荆州市发布“招硕引博”公告，高新区招录8人​！
@@ -23,7 +23,9 @@
 				</view>
 			</view>
 		</view>
-		<u-divider bg-color="#fff" margin-top="20" border-color="#CFD2D5">已经到底了</u-divider>
+		<u-divider v-if="list.length==recordsTotal"
+		  :isnone="list.length==0" nonetext="没有找到相关内容" 
+		 bg-color="#fff" margin-top="20" border-color="#CFD2D5">已经到底了</u-divider>
 	</view>
 </template>
 
@@ -32,11 +34,63 @@
 	export default {
 		data() {
 			return {
+				title:"",
+				type:"",
 				
+				list:[],
+				recordsTotal: 0,
+				listFrom:{
+					pageIndex: 1,
+					pageSize: 20,
+				
+				}
+			}
+		},
+		onLoad(op) {
+			this.title=op.title
+			this.type=op.t
+			this.getList();
+		},
+		onReachBottom() {
+			 
+			if (this.list.length < this.recordsTotal) {
+				this.myLoadmore();
 			}
 		},
 		methods: {
-			
+			myLoadmore(){
+				this.listFrom.pageIndex += 1;
+				this.getList();
+			},
+			getList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.newsList({
+					category:this.type,
+					pageSize:this.listFrom.pageSize,
+					pageIndex:this.listFrom.pageIndex,
+				}).then((res) => {
+					uni.hideLoading();
+					
+					if (this.listFrom.pageIndex == 1) {
+						this.list = res.data.data;
+					} else {
+						this.list = [
+							...this.list,
+							...res.data.data
+						];
+					}
+					
+					this.recordsTotal=res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
 		}
 	}
 </script>

pages/packages/search/search.vue

@@ -7,7 +7,7 @@
 		<view class="search">
 			<view class="search-box">
 				<view class="option">
-					<nxsearch :selectList="selectList" button="inside"  @search="doSearch" @confirm="doSearc" v-model="searchQuery.keyword" placeholder="输入关键字找工作" />
+					<nxsearch :selectList="selectList" button="inside"  @search="doSearch" @confirm="doSearch" v-model="searchQuery.keyword" placeholder="输入关键字找工作" />
          
 
 				</view>
@@ -52,14 +52,15 @@
 					keyword: '',
 					selectIndex: 0
 				},
-				selectList: [{
+				selectList: [
+					{
 						id: 1,
-						name: '找工作'
+						name: '找零工'
 					},
 					{
-						id: 2,
-						name: '找公司'
-					},
+						id: 0,
+						name: '找工作'
+					}
 				],
 				recordsTotal:0,
 				listForm:{
@@ -106,7 +107,7 @@
 			},
 			setHistory(){
 			    //搜索记录保存
-				console.log(this.key)
+				var key =this.searchQuery.keyword;
 			    var sz=this.searchHistory;
 			    if(!sz){
 			        sz=[];
@@ -116,9 +117,9 @@
 			    if(sz.length){
 			        for(var i in sz){
 			            if(i==0){
-			                temp.push(this.key);
+			                temp.push(key);
 			            }
-			            if(sz[i]==this.key){
+			            if(sz[i]==key){
 			                continue;
 			            }
 			            temp.push(sz[i]);
@@ -129,7 +130,7 @@
 			
 			        }
 			    }else{
-			        temp.push(this.key);
+			        temp.push(key);
 			    }
 				
 			    this.setSearchHistory(temp);
@@ -145,7 +146,7 @@
 				this.step=true;
 			},
 			 submit(){
-				 if(!this.key){
+				 if(!this.searchQuery.keyword){
 					return 
 				 }
 			    this.setHistory()
@@ -160,11 +161,33 @@
 				this.query();
 			},
 			query(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.findRecruitSearch({
+					pageIndex:1,
+					pageSize:20,
+					type:this.selectList[this.searchQuery.selectIndex].id,
+					content:this.searchQuery.keyword
+				}).then((res) => {
+					uni.hideLoading();
+					this.tabList[this.current].list=res.data.data
+					this.tabList[this.current].recordsTotal=res.data.recordsTotal
+					
+				}).catch(error => {
 				
+					uni.showToast({
+						title: error
+					})
+					//this.getPhone()
+					
+				})
 			},
              // 执行搜索
             doSearch(searchQuery) {
                 console.log('searchQuery', searchQuery);
+				this.submit()
             },
 
 		}

pages/packages/shareEmployment/shareEmployment-old.vue

@@ -0,0 +1,195 @@
+<template>
+	<view>
+	<u-navbar back-text="共享用工" back-icon-size="28" back-icon-color="#ffffff" :background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
+		
+	<view class="info-card" >
+		<!-- 卡片信息 -->
+		<view class="detail">
+			企业现急需熟练机床车工5名，如有资源请联系0716-8818118 刘女士。
+		</view>
+		<view class="tag">
+			<view class="item1">
+				急需用工
+			</view>
+			<view class="date-item">
+				2023-06-12
+			</view>
+		</view>
+		
+		<u-line color="#CFD2D5"  />
+		<!-- 审核 -->
+		<view class="check">
+			<view class="state">
+				审核中
+			</view>
+			<view class="handle">
+				<view class="unamend">
+					修改
+				</view>
+				<view class="delete">
+					删除
+				</view>
+				
+			</view>
+			
+		</view>
+		
+	</view>
+	
+	<view class="info-card">
+		<!-- 卡片信息 -->
+		<view class="detail">
+			因企业季节性停产3个月，现产生闲置熟练机床车工5名，如有需求请联系0716-8668168 汪先生。
+		</view>
+		<view class="tag">
+			<view class="item2">
+				资源共享
+			</view>
+			<view class="date-item">
+				2023-06-12
+			</view>
+		</view>
+		
+		<u-line color="#CFD2D5"  />
+		<!-- 审核 -->
+		<view class="check">
+			<view class="state">
+				已审核
+			</view>
+			<view class="handle">
+				<view class="amend">
+					修改
+				</view>
+				<view class="delete">
+					删除
+				</view>
+				
+			</view>
+			
+		</view>
+		
+	</view>
+	<u-divider bg-color="#F0F0F2" margin-top="40" border-color="#CFD2D5">已经到底了</u-divider>
+	<!-- 底部按钮 -->
+	
+		<button class="btn">发布信息</button>
+	
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/packages.js'
+	export default {
+		data() {
+			return {
+				
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+	page{
+		background: #F0F0F2;
+		padding-bottom: 100px;
+	}
+</style>
+<style scoped lang="scss">
+	.info-card{
+		margin: 24rpx 32rpx 0;
+		padding: 24rpx;
+		background-color: #fff;
+		border-radius: 24rpx;
+		// 卡片信息
+		.detail{
+			color: rgba(16, 16, 16, 1);
+			line-height: 40rpx;
+			
+		}
+		.tag{
+			display: flex;
+			justify-content: space-between;
+			margin-top: 16rpx;
+			margin-bottom: 24rpx;
+			.item1{
+				color: rgba(39, 149, 253, 1);
+				font-size: 24rpx;
+			}
+			.item2{
+				color: rgba(0, 185, 98, 1);
+				font-size: 24rpx;
+			}
+		}
+		// 审核
+		.check{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 32rpx;
+			.state{
+				color: rgba(51, 51, 51, 1);
+				font-weight: 600;
+			}
+			.handle{
+				display: flex;
+				align-items: center;
+				
+				.unamend{
+					width: 120rpx;
+					height: 56rpx;
+					line-height: 56rpx;
+					text-align: center;
+					font-family: Microsoft Yahei;
+					border: 1px solid rgba(231, 232, 234, 1);
+					border-radius: 50px;
+					opacity: 0.4;
+				}
+				.amend{
+					width: 120rpx;
+					height: 56rpx;
+					line-height: 56rpx;
+					text-align: center;
+					font-family: Microsoft Yahei;
+					border: 1px solid rgba(231, 232, 234, 1);
+					border-radius: 50px;
+					
+				}
+				.delete{
+					width: 120rpx;
+					height: 56rpx;
+					line-height: 56rpx;
+					text-align: center;
+					font-family: Microsoft Yahei;
+					border: 1px solid rgba(231, 232, 234, 1);
+					border-radius: 50px;
+					margin-left: 24rpx;
+					color: #E60012;
+				}
+			}
+		}
+	}
+
+// 底部按钮
+
+	
+	.btn{
+		position: fixed;
+		bottom: 32rpx;
+		left: 0;
+		right: 0;
+		background-color:#F0F0F2;
+		padding: 0 32rpx;
+		border-radius: 50px;
+		background-color: rgba(34, 149, 255, 1);
+		color: rgba(241, 241, 241, 1);
+		font-size: 36rpx;
+		margin: 0 32rpx;
+		box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.03);
+	}
+
+
+</style>

pages/packages/shareEmployment/shareEmployment.vue

@@ -2,7 +2,12 @@
 	<view>
 	<u-navbar back-text="共享用工" back-icon-size="28" back-icon-color="#ffffff" :background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
 		
-	<view class="info-card" >
+		<view class="tabs">
+			<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		</view>
+	<view class="info-card" v-for="(item,i) in list[current].list" 
+		 :key="i"  @click="gotoUrl('pages/packages/shareEmployment/articleDetail?id='+item.id)"
+	>
 		<!-- 卡片信息 -->
 		<view class="detail">
 			企业现急需熟练机床车工5名，如有资源请联系0716-8818118 刘女士。
@@ -16,63 +21,17 @@
 			</view>
 		</view>
 		
-		<u-line color="#CFD2D5"  />
-		<!-- 审核 -->
-		<view class="check">
-			<view class="state">
-				审核中
-			</view>
-			<view class="handle">
-				<view class="unamend">
-					修改
-				</view>
-				<view class="delete">
-					删除
-				</view>
-				
-			</view>
-			
-		</view>
-		
-	</view>
 	
-	<view class="info-card">
-		<!-- 卡片信息 -->
-		<view class="detail">
-			因企业季节性停产3个月，现产生闲置熟练机床车工5名，如有需求请联系0716-8668168 汪先生。
-		</view>
-		<view class="tag">
-			<view class="item2">
-				资源共享
-			</view>
-			<view class="date-item">
-				2023-06-12
-			</view>
-		</view>
-		
-		<u-line color="#CFD2D5"  />
-		<!-- 审核 -->
-		<view class="check">
-			<view class="state">
-				已审核
-			</view>
-			<view class="handle">
-				<view class="amend">
-					修改
-				</view>
-				<view class="delete">
-					删除
-				</view>
-				
-			</view>
-			
-		</view>
 		
 	</view>
-	<u-divider bg-color="#F0F0F2" margin-top="40" border-color="#CFD2D5">已经到底了</u-divider>
+	
+	<u-divider  v-if="formList[current].recordsTotal==list[current].list.length"
+	 :isnone="formList[current].recordsTotal==0" nonetext="没有找到相关内容" 
+	border-color="#CFD2D5">已经到底了</u-divider>
+	
 	<!-- 底部按钮 -->
 	
-		<button class="btn">发布信息</button>
+	
 	
 	</view>
 </template>
@@ -82,12 +41,96 @@
 	export default {
 		data() {
 			return {
-				
+				formList:[
+					{
+						
+						pageIndex: 1,
+						pageSize: 20,
+						recordsTotal: 1,
+						type: "1",
+						
+					},
+					{
+						
+						pageIndex: 1,
+						pageSize: 20,
+						recordsTotal: 1,
+						type: "2",
+						
+					}
+				],
+				list:[
+					{
+						name: '急需用工',
+						
+						list: []
+					},
+					{
+						name: '资源共享',
+						
+						list: []
+					}
+				],
+					current: 0
 				
 			}
 		},
+		onReachBottom() {
+			var obj = this.list[this.current]
+			var objf = this.formList[this.current]
+			if (obj.list.length < objf.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		onReady() {
+			this.getList()
+		},
 		methods: {
+			getList() {
 			
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var list = this.list[this.current].list
+				
+				var listForm = this.formList[this.current]
+				
+			
+				API.shareWorksList(listForm).then((res) => {
+			
+					if (listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+			
+					this.list[this.current].list = list
+			
+					this.formList[this.current].recordsTotal = res.data.recordsTotal;
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			
+			},
+			myLoadmore() {
+				this.formList[this.current].pageIndex += 1;
+				this.getList();
+			},
+			change(index) {
+				this.current = index;
+				var list = this.list[this.current].list
+				if (list.length == 0) {
+					this.getList();
+				}
+			}
 		}
 	}
 </script>

pages/packages/skillTraining/skillTraining.vue

@@ -1,92 +1,140 @@
-<template>
-	<view>
-		<u-navbar back-text="技能培训" back-icon-size="28" back-icon-color="#ffffff"
-			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
+<template>
+	<view>
+		<u-navbar back-text="技能培训" back-icon-size="28" back-icon-color="#ffffff"
+			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
+
+		<view class="content"   v-for="(item,i) in list" 
+		 
+		 :key="i" @click="gotoUrl('pages/packages/skillTraining/trainingRegistration?id='+item.id)" >
+			<!-- 图片 -->
+			<view class="picture">
+				
+				<img  
+				:src=" item.file?item.file: errorFile" alt="">
+			</view>
+			<u-line color="#e6e6e6" />
+			<!-- 标题 -->
+			<view class="title">
+				{{item.name}}
+			</view>
+			<!-- 报名状态 -->
+			<view class="state" :class="{
+				state2:item.status!=1
+			}">
+				{{item.status==1?'开放报名':'结束报名'}}
+			</view>
+		</view>
 		
-	  <view class="content">
-		  <!-- 图片 -->
-		  <view class="picture">
-		  	<img src="@/assets/img/traniningPicture.png" alt="">
-		  </view>
-		  <u-line  color="#e6e6e6"/>
-	  	<!-- 标题 -->
-		<view class="title">
-			育婴师资格证（高级）认证机构培训
-		</view>
-		<!-- 报名状态 -->
-		<view class="state">
-			开放报名
-		</view>
-	  </view>
-	  
-	  <view class="content">
-	  		  <!-- 图片 -->
-	  		  <view class="picture">
-	  		  	<img src="@/assets/img/traniningPicture.png" alt="">
-	  		  </view>
-	  		  <u-line  color="#e6e6e6"/>
-	  	<!-- 标题 -->
-	  		<view class="title">
-	  			育婴师资格证（高级）认证机构培训
-	  		</view>
-	  		<!-- 报名状态 -->
-	  		<view class="state state2">
-	  			开放报名
-	  		</view>
-	  </view>
-	</view>
-</template>
-
+		<u-divider v-if="list.length==recordsTotal"
+		  :isnone="list.length==0" nonetext="没有找到相关内容" 
+		 bg-color="#fff" margin-top="20" border-color="#CFD2D5">已经到底了</u-divider>
+		
+	</view>
+</template>
+
 <script>
-	import * as API from '@/apis/pagejs/packages.js'
-	export default {
-		data() {
+	var file=require("@/assets/img/traniningPicture.png")
+	import * as API from '@/apis/pagejs/packages.js'
+	export default {
+		data() {
 			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-<style>
-	page {
-		background: #F0F0F2;
-		padding-bottom: 50px;
-	}
-</style>
-
-<style lang="scss" scoped>
-	.content{
-		margin: 24rpx 32rpx 0;
-		background-color: #fff;
-		padding: 24rpx;
-		border-radius: 24rpx;
-		.picture{
-			width: 100%;
-			height: 240rpx;
-			margin-bottom: 24rpx;
-		
-			img{
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.title{
-			color: rgba(16, 16, 16, 1);
-			font-size: 32rpx;
-			margin-top: 24rpx;
-		}
-		// 报名状态
-		.state{
-			color: rgba(0, 185, 98, 1);
-			font-size: 24rpx;
-			margin-top: 60rpx;
-		}
-		.state2{
-			color: rgba(153, 153, 153, 1);
-		}
-	}
-
-</style>
+				errorFile:file,
+				list: [],
+				recordsTotal: 0,
+				listFrom: {
+					pageIndex: 1,
+					pageSize: 20,
+
+				}
+			}
+		},
+		onReachBottom() {
+
+			if (this.list.length < this.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		onLoad(op) {
+
+			this.getList();
+		},
+		methods: {
+			myLoadmore() {
+				this.listFrom.pageIndex += 1;
+				this.getList();
+			},
+			getList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.trainingList({
+
+					pageSize: this.listFrom.pageSize,
+					pageIndex: this.listFrom.pageIndex,
+				}).then((res) => {
+					uni.hideLoading();
+
+					if (this.listFrom.pageIndex == 1) {
+						this.list = res.data.data;
+					} else {
+						this.list = [
+							...this.list,
+							...res.data.data
+						];
+					}
+
+					this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background: #F0F0F2;
+		padding-bottom: 50px;
+	}
+</style>
+
+<style lang="scss" scoped>
+	.content {
+		margin: 24rpx 32rpx 0;
+		background-color: #fff;
+		padding: 24rpx;
+		border-radius: 24rpx;
+
+		.picture {
+			width: 100%;
+			height: 240rpx;
+			margin-bottom: 24rpx;
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.title {
+			color: rgba(16, 16, 16, 1);
+			font-size: 32rpx;
+			margin-top: 24rpx;
+		}
+
+		// 报名状态
+		.state {
+			color: rgba(0, 185, 98, 1);
+			font-size: 24rpx;
+			margin-top: 60rpx;
+		}
+
+		.state2 {
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+</style>

pages/packages/skillTraining/trainingRegistration.vue

@@ -1,178 +1,204 @@
-<template>
-	<view>
-		<u-navbar back-text="育婴师资格证（高级）认证..." back-icon-size="28" back-icon-color="#ffffff"
-			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
-		<view class="background">
-			<!-- <img src="@/assets/img/trainingBackground.png" alt=""> -->
-		</view>
-		<!-- 内容 -->
+<template>
+	<view>
+		<u-navbar :back-text="info.title" back-icon-size="28" back-icon-color="#ffffff"
+			:background="{backgroundColor: '#2795FD',}" :back-text-style="{color: '#ffffff'}"></u-navbar>
+		
+		<!-- 内容 -->
 		<view class="main">
-			<view class="headline">
-				育婴师资格证（高级）认证机构培训
-			</view>
-			<view class="title">
-				培训详情
-			</view>
-			<view class="picture">
-				<img src="@/assets/img/traniningPicture.png" alt="">
-			</view>
-			<!-- 详细信息 -->
-			<view class="details">
-				<view class="introduce">
-					培训详细介绍培训详细介绍培训详细介绍培训详细介绍培训详细介绍培训详细介绍培训详细介绍培训详细介绍培训详细介绍，培训详细介绍培训详细介绍培训详细介绍培训详细介绍。
-				</view>
-				<p>报名日期：2021-06-18至2021-06-20</p>
-				<p>培训日期：2021-06-21至2021-06-22</p>
-				<p>培训地点：开发区管委会培训中心</p>
-				<p>联系电话：0716-8123456</p>
-			</view>
-			
-		</view>
-		
-		<!-- 资料 -->
-		<view class="data">
-			<view class="title">
-				培训资料
-			</view>
-			<u-line  color="#e6e6e6"/>
-			<view class="class">
-				<view class="text">
-					育婴师资格证（高级）培训课程表
-				</view>
-				<view class="download">
-					<view class="icon">
-						<img src="@/assets/img/md-file_download@1x.png" alt="">
-					</view>
-					<view class="download-text">
-						下载
-					</view>
-				</view>
-			</view>
-			
-		</view>
-		
-		<!-- 报名按钮 -->
-		<view class="bottom">
-			<button class="sign-up">我要报名</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/packages.js'
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-<style>
-	page {
-		background: #F0F0F2;
-		padding-bottom: 120px;
-	}
-</style>
-<style lang="scss" scoped>
-	.background{
-		width: 100%;
-		height: 376rpx;
-
-		img{
-			width: 100%;
-			height: 100%;
-		}
-	}
-	// 内容
-	.main{
-		padding: 40rpx 32rpx;
-		background-color: #fff;
-		// 标题
-		.headline{
-			color: rgba(16, 16, 16, 1);
-			font-size: 40rpx;
-			font-family: 'PingFangSC-medium';
-		}
-		.title{
-			color: rgba(51, 51, 51, 1);
-			font-size: 32rpx;
-			font-family: 'PingFangSC-medium';
-			margin-top:40rpx
-		}
-		// 图片
-		.picture{
-			border-radius: 4px;
-			width: 100%;
-			height: 256rpx;
-			margin-top: 50rpx;
-			img{
-				width:100%;
-				height: 100%;
-			}
-		}
-		// 详细信息
-		.details{
-			margin-top: 40rpx;
-			line-height:48rpx;
-			color: rgba(51, 51, 51, 1);
-		}
-	}
-
-  // 资料
-  .data{
-	  background-color: #fff;
-	  margin-top: 24rpx;
-	  padding: 24rpx 32rpx;
-	  
-	  .title{
-		  color: rgba(16, 16, 16, 1);
-		  font-size: 16px;
-		  font-weight: bold;
-		  margin-bottom: 24rpx;
-	  }
-	  .class{
-		  margin-top: 40rpx;
-		  border-radius: 5px;
-		  background-color: rgba(245, 245, 245, 1);
-		  padding: 28rpx 24rpx;
-		  color: #101010;
-		  display: flex;
-		  justify-content: space-between;
-		  align-items: center;
-		  .download{
-			  display: flex;
-			  align-items: center;
-			  color: rgba(22, 119, 255, 1);
-			
-			  img{
-				  vertical-align: middle;
-				  width: 40rpx;
-				  height: 40rpx;
-			  }
-		  }
-	  }
-  }
-  // 报名按钮
-  .bottom{
-	  background-color: #fff;
-	  padding: 24rpx 32rpx;
-	  position: fixed;
-	  bottom: 0;
-	  left: 0;
-	  right: 0;
-	  .sign-up{
-		
-		  height: 96rpx;
-		  line-height: 96rpx;
-		  border-radius: 8px;
-		  background-color: rgba(39, 149, 253, 1);
-		  color: rgba(255, 255, 255, 1);
-		  font-size: 36rpx;
-		  text-align: center;
-	  }
-  }
-</style>
+			 <view class="headline">
+				{{info.title}}
+			</view>
+			<view class="title">
+				培训详情
+			</view>
+			<!-- <view class="picture">
+				<img src="@/assets/img/traniningPicture.png" alt="">
+			</view> -->
+			<!-- 详细信息 -->
+			<view class="details" v-html="info.content">
+				
+			</view>
+
+		</view>
+
+		<!-- 资料 -->
+	<!-- 	<view class="data">
+			<view class="title">
+				培训资料
+			</view>
+			<u-line color="#e6e6e6" />
+			<view class="class">
+				<view class="text">
+					育婴师资格证（高级）培训课程表
+				</view>
+				<view class="download">
+					<view class="icon">
+						<img src="@/assets/img/md-file_download@1x.png" alt="">
+					</view>
+					<view class="download-text">
+						下载
+					</view>
+				</view>
+			</view>
+
+		</view> -->
+
+		<!-- 报名按钮 -->
+		<view class="bottom">
+			<button class="sign-up">我要报名</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/packages.js'
+	export default {
+		data() {
+			return {
+				id: "",
+				info: {
+
+				},
+			}
+		},
+		onLoad(op) {
+			this.id = op.id
+			this.getInfo()
+		},
+		methods: {
+			getInfo(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.trainingDetail({
+					id: this.id,
+				}).then((res) => {
+					uni.hideLoading();
+					this.info=res.data.trainingInfo;
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background: #F0F0F2;
+		padding-bottom: 120px;
+	}
+</style>
+<style lang="scss" scoped>
+	.background {
+		width: 100%;
+		height: 376rpx;
+
+		img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	// 内容
+	.main {
+		padding: 40rpx 32rpx;
+		background-color: #fff;
+
+		// 标题
+		.headline {
+			color: rgba(16, 16, 16, 1);
+			font-size: 40rpx;
+			font-family: 'PingFangSC-medium';
+		}
+
+		.title {
+			color: rgba(51, 51, 51, 1);
+			font-size: 32rpx;
+			font-family: 'PingFangSC-medium';
+			margin-top: 40rpx
+		}
+
+		// 图片
+		.picture {
+			border-radius: 4px;
+			width: 100%;
+			height: 256rpx;
+			margin-top: 50rpx;
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		// 详细信息
+		.details {
+			margin-top: 40rpx;
+			line-height: 48rpx;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	// 资料
+	.data {
+		background-color: #fff;
+		margin-top: 24rpx;
+		padding: 24rpx 32rpx;
+
+		.title {
+			color: rgba(16, 16, 16, 1);
+			font-size: 16px;
+			font-weight: bold;
+			margin-bottom: 24rpx;
+		}
+
+		.class {
+			margin-top: 40rpx;
+			border-radius: 5px;
+			background-color: rgba(245, 245, 245, 1);
+			padding: 28rpx 24rpx;
+			color: #101010;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.download {
+				display: flex;
+				align-items: center;
+				color: rgba(22, 119, 255, 1);
+
+				img {
+					vertical-align: middle;
+					width: 40rpx;
+					height: 40rpx;
+				}
+			}
+		}
+	}
+
+	// 报名按钮
+	.bottom {
+		background-color: #fff;
+		padding: 24rpx 32rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+
+		.sign-up {
+
+			height: 96rpx;
+			line-height: 96rpx;
+			border-radius: 8px;
+			background-color: rgba(39, 149, 253, 1);
+			color: rgba(255, 255, 255, 1);
+			font-size: 36rpx;
+			text-align: center;
+		}
+	}
+</style>