修改部分显示问题/增加证书页面字段

h5_web/common/config.js

@@ -9,13 +9,10 @@ if(process.env.NODE_ENV=="development"){
 	base = 'https://wx.hw.hongweisoft.com/veterans/app';
 	// base = 'https://veterwebpro.hw.hongweisoft.com/veterans-prod-api/app';
 }
-// console.log('base',base);
 const config = {
-	wxAppid: '', // 测试wxAppid
-	// baseUrl: 'https://wx.hw.hongweisoft.com/veterans/app' ,// 64服务器地址
 	baseUrl: base ,// 201服务器地址
-	
-	uploadUrl:'https://wx.hw.hongweisoft.com/veterans/file/upload/single/minio'
+	uploadUrl: 'https://wx.hw.hongweisoft.com/veterans/file/upload/single/minio',
+	version: '1.0.1'
 }
 export {
 	config

h5_web/pages.json

@@ -163,14 +163,6 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-		},
-		{
-			"path": "pages/dynamicTracking/dynamicTracking",
-			"style": {
-				"navigationBarTitleText": "全链条动态跟踪",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/personalModify/personalModify",
 			"style": {
@@ -228,13 +220,6 @@
 				"navigationBarTextStyle": "white"
 			}
 
-		}, {
-			"path": "pages/dynamicTracking/dynamicTracking",
-			"style": {
-				"navigationBarTitleText": "全链条动态跟踪",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/personalModify/personalModify",
 			"style": {
@@ -342,8 +327,7 @@
 			"style": {
 				"navigationBarTitleText": "退役军人职业教育码申请",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationStyle": "custom"
 			}
 
 		}, {

h5_web/pages/applyEducationCode/applyEducationCode.vue

@@ -57,14 +57,13 @@
 					<u-upload
 						ref="uUpload"
 						:action="action"
-						:auto-upload="true"
 						:custom-btn="true"
-						:show-upload-list="false"
-						max-count="1"
+						:max-count="1"
 						:limitType="['png', 'jpg']"
 						@on-success="uploadSuccess"
+						@on-remove="uploadRemove"
 					>
-						<view class="pic-upload-box"  slot="addBtn">
+						<view class="pic-upload-box" slot="addBtn">
 							<view class="pic-upload">
 								<image src="../../static/img/upload-add.png" mode=""/>
 								<view class="font">上传照片</view>
@@ -72,16 +71,16 @@
 							<view class="tips">支持jpg.png格式</view>
 						</view>
 					</u-upload>
-					<view class="pic-photograph" @click="photograph">
+					<!-- <view class="pic-photograph" @click="photograph">
 						<image src="../../static/img/paizhao.png" mode=""></image>
 						<view class="font">立即拍照</view>
-					</view>
-					<view class="pic-url" v-if="form.files.length > 0">
+					</view> -->
+					<!-- <view class="pic-url" v-if="form.files.length > 0">
 						<view class="icon">
 							<u-icon name="close" color="#fff" size="16" @click="clearFile"></u-icon>
 						</view>
 						<image :src="form.files[0].filesUrl" mode=""/>
-					</view>
+					</view> -->
 				</view>
 			</u-form-item>
 			<u-form-item>
@@ -483,6 +482,13 @@
 				this.form.files = []
 				this.form.files.push({ filesType: 6, filesUrl: e.data.url})
 			},
+			/**
+			 * 图片移除
+			 * @param {Object} index
+			 */
+			uploadRemove(index) {
+				this.form.files.splice(index, 1)
+			},
 			/**
 			 * 拍照
 			 */

h5_web/pages/applyEducationCode/applyEducationSuccess.vue

@@ -1,6 +1,7 @@
 <!-- 退役军人职业教育码申请成功 -->
 <template>
 	<view class="apply-success">
+		<u-navbar :is-back="false" title="退役军人职业教育码申请" :background="{ backgroundColor: '#3D5D4C' }" title-color="#fff"></u-navbar>
 		<view class="apply-success-top">
 			<image src="../../static/img/success-icon.png" mode=""></image>
 			<view>提交成功，等待审核</view>
@@ -15,18 +16,18 @@
 	export default {
 		data() {
 			return {
-				/**
-				 * 跳转到指定页面
-				 */
-				jumpPage(url) {
-					uni.switchTab({
-						url: url
-					})
-				}
+				
 			}
 		},
 		methods: {
-			
+			/**
+			 * 跳转到指定页面
+			 */
+			jumpPage(url) {
+				uni.switchTab({
+					url: url
+				})
+			}
 		}
 	}
 </script>

h5_web/pages/bannerDetails/bannerDetails.vue

@@ -21,8 +21,7 @@
 		methods: {
 			// 获取详情
 			getDetails(id) {
-				this.$u.api.getIndexBannerList()
-					.then(res => {
+				this.$u.api.indexApi.indexBannerListApi().then(res => {
 						if (res.code === 200) {
 							const list = res.data
 							list.forEach(item => {

h5_web/pages/businessDetails/businessDetails.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="business-details">
 		<!-- 导航栏 -->
-		<u-navbar title="企业详情" :background="background" title-color="#fff" back-icon-color="#fff"/>
+		<u-navbar title="企业详情" :background="background" title-color="#fff" back-icon-color="#fff" />
 		<!-- 背景 -->
 		<view class="business-details-bg"></view>
 		<!-- 内容 -->
@@ -29,7 +29,7 @@
 					<u-icon class="icon" name="arrow-right" color="#666666"></u-icon>
 				</view>
 			</view> -->
-			
+
 			<!-- 公司概况 -->
 			<view class="business-details-content-survey">
 				<view class="title">公司概况</view>
@@ -48,49 +48,50 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<!-- 公司介绍 -->
 			<view class="business-details-content-introduce">
 				<view class="title">公司介绍</view>
 				<view class="content">
 					<view class="content" v-if="companyInfo.detatil">
-						<u-parse :html="companyInfo.detatil"/>
+						<u-parse :html="companyInfo.detatil" />
 					</view>
 					<u-empty v-else text="暂无公司介绍" mode="data"></u-empty>
 				</view>
 			</view>
-			
+
 			<!-- 公司相册 -->
 			<view class="business-details-content-album">
 				<view class="title">公司相册</view>
-					<scroll-view scroll-x="true" class="pic" style="width: 100%; overflow:hidden; white-space: nowrap;" v-if="companyInfo.environmentUrlList && companyInfo.environmentUrlList.length > 0">
-						<view class="pic-list">
-							<view class="pic-list-item" v-for="(item, index) in companyInfo.environmentUrlList" :key="index">
-								<u-image :src="item" mode="" height="206" @tap="picClick(index)"/>
-							</view>
+				<scroll-view scroll-x="true" class="pic" style="width: 100%; overflow:hidden; white-space: nowrap;"
+					v-if="companyInfo.environmentUrlList && companyInfo.environmentUrlList.length > 0">
+					<view class="pic-list">
+						<view class="pic-list-item" v-for="(item, index) in companyInfo.environmentUrlList"
+							:key="index">
+							<u-image :src="item" mode="" height="206" @tap="picClick(index)" />
 						</view>
-					</scroll-view>
-					<u-empty v-else text="该公司暂未发布公司相册" mode="data"></u-empty>
+					</view>
+				</scroll-view>
+				<u-empty v-else text="该公司暂未发布公司相册" mode="data"></u-empty>
 			</view>
-			
+
 			<!-- 公司职位 -->
 			<view class="business-details-content-position">
 				<view class="title">公司职位</view>
 				<view class="position-list" v-if="positionList.length > 0">
-					<view
-						class="position-list-item"
-						v-for="(item, index) in positionList"
-						:key="index"
-						@click="jumpPage('/pages/jobDetails/jobDetails', { id: item.id })"
-					>
+					<view class="position-list-item" v-for="(item, index) in positionList" :key="index"
+						@click="jumpPage('/pages/jobDetails/jobDetails', { id: item.id })">
 						<view class="left">
 							<view class="logo">
-								<image :src="item.companyLogoUrl" mode=""></image>
+								<u-image :src="item.companyLogoUrl" mode="aspectFill" width="112" height="112"
+									border-radius="10" />
 							</view>
 							<view class="info">
 								<view>{{ item.postName }}</view>
-								<view>{{ `${item.workPlace} | 经验${item.workYear ? item.workYear + '年' : '不限'} | ${item.educationBg}` }}</view>
-								<view>{{ item.workPlace }}</view>
+								<view>
+									{{ `${ item.areaName ?  item.areaName + ' |' : '' } 经验${item.workYear ? item.workYear + '年' : '不限'} | ${ getEducationBg(item.educationBg) || '' }` }}
+								</view>
+								<view>{{ item.companyName }}</view>
 							</view>
 						</view>
 						<view class="right">
@@ -111,7 +112,7 @@
 		data() {
 			return {
 				background: {
-					backgroundColor: 'transparent'
+					backgroundColor: '#3D5D4C'
 				},
 				// 公司id
 				companyId: '',
@@ -120,12 +121,14 @@
 				companyScopeList: [],
 				companyTradeList: [],
 				// 公司职位
-				positionList: []
+				positionList: [],
+				degrEducList: []
 			}
 		},
 		onLoad(page) {
 			this.getDict('company_scope');
 			this.getDict('company_trade');
+			this.getDict('degr_educ');
 			if (page.id) {
 				this.companyId = page.id
 			}
@@ -142,6 +145,19 @@
 			}
 		},
 		methods: {
+			/**
+			 * 获取教育等级名称
+			 * @param {Object} value
+			 */
+			getEducationBg(value) {
+				let name;
+				this.degrEducList.forEach(item => {
+					if (item.text == value) {
+						name = item.label
+					}
+				})
+				return name;
+			},
 			/**
 			 * 获取详情
 			 * @param { String } id 获取详情企业id
@@ -179,6 +195,8 @@
 							this.companyScopeList = res.data
 						} else if (key === 'company_trade') {
 							this.companyTradeList = res.data;
+						} else if (key === 'degr_educ') {
+							this.degrEducList = res.data;
 						}
 					}
 				})
@@ -211,7 +229,11 @@
 			 * @param {Object} url
 			 */
 			getCompanyPost(id, pageNum, pageSize) {
-				this.$u.api.company.getCompanyPostList({ id, pageNum, pageSize}).then(res => {
+				this.$u.api.company.getCompanyPostList({
+					id,
+					pageNum,
+					pageSize
+				}).then(res => {
 					if (res.code === 200) {
 						this.positionList = res.rows
 					} else {
@@ -251,5 +273,5 @@
 </script>
 
 <style lang="scss" scoped>
-@import './businessDetails.scss';
+	@import './businessDetails.scss';
 </style>

h5_web/pages/dynamicTracking/dynamicTracking.vue

@@ -1,21 +0,0 @@
-<!-- 全链条动态跟踪 -->
-<template>
-	<view>全链条动态跟踪</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-@import './dynamicTracking.scss'
-</style>

h5_web/pages/index/index.scss

@@ -122,10 +122,10 @@
       }
     }
     &-head{
-      border-bottom: 1px solid #9F9F9F;
+      border-bottom: 1px solid rgba($color: #9F9F9F, $alpha: 0.5);
       &-item{
         margin-bottom: 17rpx;
-        .card-head-title{
+        .card-head-title {
           font-size: 36rpx;
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 600;
@@ -141,6 +141,7 @@
         border-bottom: 1px solid #E1E1E1;
         
         .news-text{
+					margin-right: 26rpx;
           &-title{
             margin-bottom: 20rpx;
             font-size: 30rpx;

h5_web/pages/index/index.vue

@@ -18,8 +18,8 @@
 					</view>
 				</view>
 				<view class="index-header-banner">
-					<u-swiper :list="bannerList" name="bannerUrl" border-radius="0" mode="round" height="440"
-						img-mode="scaleToFill" @click="swiperClick" />
+					<u-swiper :list="bannerList" name="bannerUrl" border-radius="16" mode="round" height="440"
+						img-mode="scaleToFill" @click="swiperClick" bg-color="transparent"/>
 				</view>
 			</view>
 		</view>
@@ -77,7 +77,7 @@
 
 		<!-- 新闻动态 -->
 		<view class="news">
-			<u-card class="news-list" :body-style="{'padding-top':0}" :border="false" :foot-border-top="false"
+			<u-card class="news-list" :body-style="{ 'padding-top':0 }" :border="false" :foot-border-top="false"
 				:head-border-bottom="false" :full="true" :border-radius="10" margin="0">
 				<view class="news-list-head" slot="head">
 					<view class="news-list-head-item">
@@ -88,9 +88,9 @@
 					</view>
 				</view>
 				<view class="news-list-body" slot="body">
-					<u-nodata notice="暂无新闻" v-if="newsList.length==0"></u-nodata>
+					<u-nodata notice="暂无新闻" v-if="newsList.length == 0"></u-nodata>
 					<view v-for="(item,index) in newsList"
-						@click="$u.route('/pages/newsDetails/newsDetails',{artId:item.artId})" :key="item.artId"
+						@click="$u.route('/pages/newsDetails/newsDetails',{ artId: item.artId })" :key="item.artId"
 						class="news-list-body-item u-body-item u-flex u-border-bottom u-col-between u-row-between">
 						<view class="news-text">
 							<view class="news-text-title u-body-item-title u-line-2">{{item.artTitle}}</view>
@@ -99,7 +99,10 @@
 								<view>{{$u.timeFormat(item.createTime.replace(/-/g, '/'), 'mm-dd hh:MM')}}</view>
 							</view>
 						</view>
-						<image :src="item.artImage" mode="aspectFill"></image>
+						<view>
+							<u-image :src="item.artImage" mode="aspectFill" width="160" height="120"
+								border-radius="10" />
+						</view>
 					</view>
 				</view>
 			</u-card>
@@ -114,7 +117,6 @@
 
 <script>
 	import tabbarconfig from 'tabbarconfig.js';
-
 	export default {
 		data() {
 			return {
@@ -184,9 +186,9 @@
 			 */
 			getNewsList() {
 				let params = {
-					// artCategoryId:2,
+					artCategoryId: 2,
 					pageNum: 1,
-					pageSize: 10
+					pageSize: 3
 				}
 				this.$u.api.indexApi.getIndexNewsListApi(params).then(res => {
 					if (res?.code == 200) {

h5_web/pages/jobDetails/jobDetails.vue

@@ -5,67 +5,76 @@
 
 <template>
 	<view class="jobdetails">
-    <view class="jobdetails-head">
-    	<u-card :border="false" :head-border-bottom="false" :foot-border-top="false" :padding="0" :border-radius="0" class="jobdetails-head-card">
-    		<view slot="head">
-          <view class="jobdetails-head-cardhead">
-            <view class="content">
-              <view class="left">
-                <view>{{ recruitmentData.postName }}</view>
-                <view>经验{{ recruitmentData.workYear }}年 / {{ recruitmentData.educationBg }}</view>
-              </view>
-              <view class="right">{{ `${recruitmentData.lowestSalary || ''} ~ ${recruitmentData.highestSalary || ''}k` }}</view>
-            </view>
-          </view>
-    		</view>
-    		<view slot="body">
-          <view class="jobdetails-head-cardbody">
-            <view class="container" @tap="tapHeadCardBody(recruitmentData)">
-              <view class="container-image">
-                <image :src="recruitmentData.companyLogoUrl" mode="aspectFill" class="image"></image>
-              </view>
-              <view class="content">
-                <view class="content-left">
-                  <view >{{ recruitmentData.companyName }}</view>
-                  <view >快递和运输 · 199-499人</view>
-                </view>
-                <view class="content-right">
-                  <u-icon name="arrow-right" color="#000000" size="48"></u-icon>
-                </view>
-              </view>
-            </view>
-          </view>
-    		</view>
-    		<view slot="foot">
-          <view class="jobdetails-head-cardfoot">
-            <view class="content">
-              <view class="content-left">
-                <view >（{{ recruitmentData.companyAddress }}）</view>
-              </view>
-              <!-- <view class="content-right" @tap="tapHeadCardFoot(recruitmentData)">
+		<view class="jobdetails-head">
+			<u-card :border="false" :head-border-bottom="false" :foot-border-top="false" :padding="0" :border-radius="0"
+				class="jobdetails-head-card">
+				<view slot="head">
+					<view class="jobdetails-head-cardhead">
+						<view class="content">
+							<view class="left">
+								<view>{{ recruitmentData.postName }}</view>
+								<view>经验{{ recruitmentData.workYear }}年 /
+									{{ getEducationBg(recruitmentData.educationBg) }} / {{ recruitmentData.cityName }}
+								</view>
+							</view>
+							<view class="right">
+								{{ `${recruitmentData.lowestSalary || ''}k - ${recruitmentData.highestSalary || ''}k` }}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view slot="body">
+					<view class="jobdetails-head-cardbody">
+						<view class="container" @tap="tapHeadCardBody(recruitmentData)">
+							<view class="container-image">
+								<u-image :src="recruitmentData.companyLogoUrl" mode="aspectFill" width="96" height="96"
+									border-radius="10" />
+							</view>
+							<view class="content">
+								<view class="content-left">
+									<view>{{ recruitmentData.companyName }}</view>
+									<view>{{ getCompanyType(companyInfo.trade) }} · {{ getCompanyScope(companyInfo.scope) }}</view>
+								</view>
+								<view class="content-right">
+									<u-icon name="arrow-right" color="#d2d3d5" size="30"></u-icon>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view slot="foot">
+					<view class="jobdetails-head-cardfoot">
+						<view class="content">
+							<view class="content-left">
+								<view>
+									{{ `${recruitmentData.provinceName || ''}${recruitmentData.cityName || ''}${recruitmentData.areaName || ''}` }}（{{ recruitmentData.companyAddress || '' }}）
+								</view>
+							</view>
+							<!-- <view class="content-right" @tap="tapHeadCardFoot(recruitmentData)">
                 <u-icon name="map-fill" color="#709078" size="30" class="content-right-icon"></u-icon>
                 <view class="content-right-text">查看位置</view>
               </view> -->
-            </view>
-          </view>
-    		</view>
-    	</u-card>
-    </view>
-    
-    <view class="jobdetails-content">
-      <u-card :border="false" :head-border-bottom="false" :foot-border-top="false" :padding="0" :border-radius="0" class="jobdetails-content-card">
-      	<view slot="head">
-          <view class="jobdetails-content-cardhead">
-            <view class="container">
-              <view class="title">职位描述</view>
-              <view class="content">
-                <!-- <u-input :disabled="true" v-model="detailsInfo.description" type="textarea" class="content-textarea" /> -->
+						</view>
+					</view>
+				</view>
+			</u-card>
+		</view>
+
+		<view class="jobdetails-content">
+			<u-card :border="false" :head-border-bottom="false" :foot-border-top="false" :padding="0" :border-radius="0"
+				class="jobdetails-content-card">
+				<view slot="head">
+					<view class="jobdetails-content-cardhead">
+						<view class="container">
+							<view class="title">职位描述</view>
+							<view class="content">
+								<!-- <u-input :disabled="true" v-model="detailsInfo.description" type="textarea" class="content-textarea" /> -->
 								<u-parse :html="recruitmentData.description"></u-parse>
-              </view>
-            </view>
-          </view>
-      	</view>
-      	<!-- <view slot="body">
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- <view slot="body">
           <view class="jobdetails-content-cardbody">
             <view class="container">
               <view class="title">职位要求</view>
@@ -75,20 +84,18 @@
             </view>
           </view>
       	</view> -->
-      </u-card>
-    </view>
+			</u-card>
+		</view>
 
-    <view class="jobdetailsbtn" v-if="!isSubmit">
-      <view class="jobdetailsbtn-container">
-        <view class="jobdetailsbtn-content">
-          <view>
-            <u-button type="primary"
-              @click="handleResumeClick"
-              class="jobdetailsubmitbtn">提交简历</u-button>
-          </view>
-        </view>
-      </view>
-    </view>
+		<view class="jobdetailsbtn" v-if="!isSubmit">
+			<view class="jobdetailsbtn-container">
+				<view class="jobdetailsbtn-content">
+					<view>
+						<u-button type="primary" @click="handleResumeClick" class="jobdetailsubmitbtn">提交简历</u-button>
+					</view>
+				</view>
+			</view>
+		</view>
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -97,15 +104,19 @@
 	export default {
 		data() {
 			return {
-        recruitmentData: {},
-        detailsInfo: {
-          jobDesc: `1、规划产品发展方向，制定产品计划和竞争策略；\n2、编写产品需求文档，对产品需求进行评估及确认项目开发周期；\n3、跟踪项目进度，协调各方资源，产品培训和产品演示；\n4、对产品的设计、开发、包装、渠道、定价、上市、维护等过程进行全程监控；\n5、协助营销市场部门，参与各类市场活动等`,
-          jobRequire: `1. 大专学历，2年以上蓝牙耳机产品经理岗位经验；\n2. 英语听说读写能力强，能熟练用英语与国外客户沟通交流；\n3、熟悉产品设计、研发流程，有完整的项目管理经验；\n4、有创造性、规划产品，有较强的市场敏锐性和超前意识。`
-        },
-				isSubmit: true
+				recruitmentData: {},
+				detailsInfo: {},
+				degrEducList: [],
+				isSubmit: true,
+				companyInfo: {},
+				companyScopeList: [],
+				companyTradeList: []
 			};
 		},
 		onLoad(param) {
+			this.getVeteDegrEduc();
+			this.getDict('company_scope');
+			this.getDict('company_trade');
 			if (param.id) {
 				this.getPostDetails(param.id)
 				this.judgeIsSubmit(param.id)
@@ -117,14 +128,91 @@
 		onShow() {
 		},
 		methods: {
+			/**
+			 * 获取字典
+			 * company_scope  公司规模
+			 * company_trade  公司类型
+			 */
+			getDict(key) {
+				this.$u.api.getDictdataUrl({
+					key: key
+				}).then(res => {
+					if (res.code === 200) {
+						if (key === 'company_scope') {
+							this.companyScopeList = res.data
+						} else if (key === 'company_trade') {
+							this.companyTradeList = res.data;
+						}
+					}
+				})
+			},
+			/**
+			 * 获取企业类别
+			 * @param {Object} val
+			 */
+			getCompanyType(val) {
+				let name;
+				this.companyTradeList.forEach(item => {
+					if (item.text == val) {
+						name = item.label
+					}
+				})
+				return name;
+			},
+			/**
+			 * 获取企业规模
+			 * @param {Object} val
+			 */
+			getCompanyScope(val) {
+				let name;
+				this.companyScopeList.forEach(item => {
+					if (item.text == val) {
+						name = item.label
+					}
+				})
+				return name;
+			},
+			/**
+			 * 获取文化程度类别
+			 */
+			getVeteDegrEduc() {
+				this.$u.api.getDictdataUrl({
+					key: 'degr_educ'
+				}).then(res => {
+					if (res.code == 200) {
+						this.degrEducList = res.data.map(item => {
+							return {
+								...item,
+								value: item.text
+							}
+						});
+					}
+				});
+			},
+			/**
+			 * 获取教育等级名称
+			 * @param {Object} value
+			 */
+			getEducationBg(value) {
+				let name;
+				this.degrEducList.forEach(item => {
+					if (item.value == value) {
+						name = item.label
+					}
+				})
+				return name;
+			},
 			/**
 			 * 通过职位id获取详情
 			 * @param { String } id 职位id 
 			 */
 			getPostDetails(id) {
-				this.$u.api.company.getPostDetails({ id }).then(res => {
+				this.$u.api.company.getPostDetails({
+					id
+				}).then(res => {
 					if (res.code === 200) {
-						this.recruitmentData = res.data
+						this.recruitmentData = res.data;
+						this.getCompanyDetails(res.data.companyId);
 					} else {
 						this.$refs.uToast.show({
 							title: res.msg,
@@ -138,8 +226,33 @@
 					})
 				})
 			},
+			/**
+			 * 获取企业详情
+			 * @param { String } id 获取详情企业id
+			 */
+			getCompanyDetails(id) {
+				this.$u.api.company.getCompanyDetails({
+					id: id
+				}).then(res => {
+					if (res.code === 200) {
+						this.companyInfo = res.data
+					} else {
+						this.$refs.uToast.show({
+							title: res.msg,
+							type: 'error'
+						})
+					}
+				}).catch((err) => {
+					this.$refs.uToast.show({
+						title: '系统异常!',
+						type: 'error'
+					})
+				})
+			},
 			judgeIsSubmit(id) {
-				this.$u.api.company.judgeIsSubmit({ id }).then(res => {
+				this.$u.api.company.judgeIsSubmit({
+					id
+				}).then(res => {
 					if (res.code === 200) {
 						if (res.data === 0) {
 							this.isSubmit = false
@@ -159,33 +272,35 @@
 					})
 				})
 			},
-      /**
-       * 企业信息事件
-       */
-      tapHeadCardBody(param){
-        this.$u.route({
-        	url: 'pages/businessDetails/businessDetails',
-        	params: {
-        	  id: param.companyId
-        	}
-        });
-      },
-      /**
-       * 企业位置事件
-       */
-      tapHeadCardFoot(param){
-        
-      },
-      /**
-       * 提交简历按钮事件
-       */
-      handleResumeClick(){
-				this.$u.api.company.deliveryResume({ postId: this.recruitmentData.id }).then(res => {
+			/**
+			 * 企业信息事件
+			 */
+			tapHeadCardBody(param) {
+				this.$u.route({
+					url: 'pages/businessDetails/businessDetails',
+					params: {
+						id: param.companyId
+					}
+				});
+			},
+			/**
+			 * 企业位置事件
+			 */
+			tapHeadCardFoot(param) {
+
+			},
+			/**
+			 * 提交简历按钮事件
+			 */
+			handleResumeClick() {
+				this.$u.api.company.deliveryResume({
+					postId: this.recruitmentData.id
+				}).then(res => {
 					if (res.code === 200) {
 						this.$u.route({
 							url: 'pages/resumeDeliveryResults/resumeDeliveryResults',
 							params: {
-							  // item: JSON.stringify(param)
+								// item: JSON.stringify(param)
 							}
 						});
 					} else {
@@ -200,11 +315,11 @@
 						type: 'error'
 					})
 				})
-      }
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-  @import './scss/jobDetails.scss';
+	@import './scss/jobDetails.scss';
 </style>

h5_web/pages/mine/mine.vue

@@ -33,8 +33,7 @@
 				</view>
 				<view class="mine-info-authentication-item">
 					<view>适应性培训</view>
-					<view v-if="memberinfo.auditStatus === 0" class="no-certified">审核中</view>
-					<view v-else-if="memberinfo.auditStatus === 2" class="had passed">已通过</view>
+					<view v-if="memberinfo.adaptTrainIsPass === 1" class="had passed">已通过</view>
 					<view @click="jumpPage('/pages/basicTraining/basicTraining')" class="no-certified" v-else>未通过</view>
 				</view>
 			</view>

h5_web/pages/mycode/mycode.vue

@@ -176,7 +176,7 @@
 					this.$u.api.getmemberinfo().then(res => {
 						if (res.code == 200) {
 							this.memberinfo = res.data;
-							if (res.data.isShowButton) {
+							if (res.data.isShowButton && res.data.auditStatus == 2) {
 								this.isHeaderShow = true
 								this.viewDetails()
 							} else {

h5_web/pages/newsInformation/newsInformation.vue

@@ -1,15 +1,12 @@
 <!-- 新闻动态 -->
 <template>
 	<view class="news">
-		<z-paging
-			ref="paging"
-			v-model="newsList"
-			@query="queryList"
-		>
+		<z-paging ref="paging" v-model="newsList" @query="queryList">
 			<view class="news-list">
-				<view class="news-list-item" v-for="(item, index) in newsList" :key="index" @click="jumpPage('/pages/newsDetails/newsDetails', { artId: item.artId })">
+				<view class="news-list-item" v-for="(item, index) in newsList" :key="index"
+					@click="jumpPage('/pages/newsDetails/newsDetails', { artId: item.artId })">
 					<view class="news-list-item-left">
-						<image :src="item.artImage"></image>
+						<u-image :src="item.artImage" width="128" height="120" border-radius="10"/>
 					</view>
 					<view class="news-list-item-right">
 						<view class="title">{{ item.artTitle }}</view>
@@ -81,41 +78,48 @@
 </script>
 
 <style lang="scss" scoped>
-.news {
-	background-color: #f2f2f2;
-	min-height: calc(100vh - 44px);
-	&-list {
-		padding: 28rpx 30rpx;
-		&-item {
-			display: flex;
-			align-items: center;
-			background-color: #fff;
-			padding: 34rpx 32rpx;
-			margin-bottom: 20rpx;
-			&-left {
-				margin-right: 16rpx;
-				image {
-					width: 132rpx;
-					height: 106rpx;
-				}
-			}
-			&-right {
-				.title {
-					color: #000;
-					font-size: 30rpx;
+	.news {
+		background-color: #f2f2f2;
+		min-height: calc(100vh - 44px);
+
+		&-list {
+			padding: 28rpx 30rpx;
+
+			&-item {
+				display: flex;
+				align-items: center;
+				background-color: #fff;
+				padding: 34rpx 32rpx;
+				margin-bottom: 20rpx;
+
+				&-left {
+					margin-right: 16rpx;
+
+					image {
+						width: 132rpx;
+						height: 106rpx;
+					}
 				}
-				.date {
-					margin-top: 12rpx;
-					color: #6F6F6F;
-					font-size: 24rpx;
-					display: flex;
-					justify-content: space-between;
-					view {
-						width: 50%;
+
+				&-right {
+					.title {
+						color: #000;
+						font-size: 30rpx;
+					}
+
+					.date {
+						margin-top: 12rpx;
+						color: #6F6F6F;
+						font-size: 24rpx;
+						display: flex;
+						justify-content: space-between;
+
+						view {
+							width: 50%;
+						}
 					}
 				}
 			}
 		}
 	}
-}
 </style>

h5_web/pages/policyInfo/policyInfo.vue

@@ -4,207 +4,170 @@
 -->
 
 <template>
-  <view class="policyInfo">
-    <z-paging ref="policyInfoPaging"
-      v-model="policyInfoList"
-      @query="policyInfoQueryList">
-      <view class="policyInfo-banner"
-        slot="top">
-        <u-swiper :list="bannerList"
-          name="bannerUrl"
-          border-radius="0"
-          mode="round"
-          height="372"
-          img-mode="scaleToFill"
-          @click="swiperClick"
-          @change="swiperChange"></u-swiper>
-      </view>
+	<view class="policyInfo">
+		<z-paging ref="policyInfoPaging" v-model="policyInfoList" @query="policyInfoQueryList">
+			<view class="policyInfo-banner" slot="top">
+				<u-swiper :list="bannerList" name="bannerUrl" border-radius="0" mode="round" height="372"
+					img-mode="scaleToFill" @click="swiperClick" @change="swiperChange"></u-swiper>
+			</view>
 
-      <view class="policyInfo-title"
-        slot="top">
-        <view>{{ policyInfoTitle }}</view>
-      </view>
+			<view class="policyInfo-title" slot="top">
+				<view>{{ policyInfoTitle }}</view>
+			</view>
 
-      <!-- u-tabs-swiper -->
-      <view class="policyInfo-tabsswiper"
-        slot="top">
-        <u-tabs bg-color="transparent"
-          :list="tabsList"
-          name="label"
-          :is-scroll="true"
-          :current="tabCurrent"
-          font-size="30"
-          @change="tabsChange" />
-      </view>
+			<!-- u-tabs-swiper -->
+			<view class="policyInfo-tabsswiper" slot="top">
+				<u-tabs bg-color="transparent" :list="tabsList" name="label" :is-scroll="true" :current="tabCurrent"
+					font-size="30" @change="tabsChange" />
+			</view>
 
-      <view class="policyInfo-list">
-        <view class="list-container"
-          v-for="(item, index) in policyInfoList"
-          :key="index + 'policyInfoList'"
-          @click="$u.route('/pages/policyInfo/policyInfoDetails',{artId:item.artId})">
-          <view class="item">
-            <view class="title">{{item.artTitle}}</view>
-            <view class="item-image">
-              <image :src="item.artImage"
-                mode="aspectFill"
-                class="image"></image>
-            </view>
-          </view>
-        </view>
-      </view>
-    </z-paging>
+			<view class="policyInfo-list">
+				<view class="list-container" v-for="(item, index) in policyInfoList" :key="index + 'policyInfoList'"
+					@click="$u.route('/pages/policyInfo/policyInfoDetails',{artId:item.artId})">
+					<view class="item">
+						<view class="title">{{item.artTitle}}</view>
+						<view class="item-image">
+							<u-image :src="item.artImage" mode="aspectFill" class="image" width="128" height="102" border-radius="10"/>
+						</view>
+					</view>
+				</view>
+			</view>
+		</z-paging>
 
-   <view class="policybtn">
-      <view class="policybtn-container">
-        <view class="policybtn-content">
-          <view>
-            <u-button type="primary"
-              @click="policySubmitBtnClick"
-              class="policysubmitbtn">政策咨询（0851-863789）</u-button>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+		<view class="policybtn">
+			<view class="policybtn-container">
+				<view class="policybtn-content">
+					<view>
+						<u-button type="primary" @click="policySubmitBtnClick" class="policysubmitbtn">政策咨询（0851-863789）
+						</u-button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        bannerList: [],
-        policyInfoTitle: '中华人民共和国英雄烈士保护法',
-        // 政策资讯列表
-        policyInfoList: [],
-        tabsList: [],
-        tabCurrent: 0
-      }
-    },
-    onLoad() {
-      this.getPolicyType();
-    },
-    onShow() {
-      this.getBannerList();
-    },
-    methods: {
-      /**
-       * 获取政策资讯类别
-       */
-      getPolicyType() {
-        this.$u.api.getDictdataUrl({
-          key: 'policy_type'
-        }).then(res => {
-          if (res.code == 200) {
-            this.tabsList = res.data;
-            this.getList(0, 1, 10, this.tabsList[0].text);
-          } else {
-            uni.showToast({
-              icon: 'none',
-              title: res.msg
-            });
-          }
-        });
-      },
-      getBannerList() {
-        this.$u.api.getIndexBannerList()
-          .then(res => {
-            if (!res) return;
-            this.bannerList = res?.data || [];
-            this.bannerList = [];
-            this.bannerList.push({
-              bannerUrl: require('@/static/jpeg/e2f3c933be411c565ec65cd49e832ac8.jpeg'),
-              content: '<p>代码固定测试内容999998</p>',
-              id: "999998",
-              name: "代码固定测试999998"
-            });
-            this.bannerList.push({
-              bannerUrl: require('@/static/jpeg/836ee345ca125ef429c04cfbabac0154.jpeg'),
-              content: '<p>代码固定测试内容999999</p>',
-              id: "999999",
-              name: "代码固定测试999999"
-            });
-            // console.log('bannerList',JSON.parse(JSON.stringify(res)));
-          })
-      },
-      // 轮播图点击
-      swiperClick(index) {
-        if (this.bannerList[index].jumpUrl) {
-          let url = this.bannerList[index].jumpUrl.split('#')[1];
-          this.$u.route({
-            url: url,
-          });
-        } else {
-          this.$u.route({
-            url: 'pages/bannerDetails/bannerDetails',
-            params: {
-              id: this.bannerList[index].id
-            }
-          });
-        }
-      },
-      swiperChange(index) {
-        // this.policyInfoTitle = this.bannerList[index]?.name || '';
-      },
-      /**
-       * 获取列表
-       * @param { Number } idx
-       * @param { Number } pageNum
-       * @param { Number } pageSize
-       * @param { Number } artCategoryId
-       */
-      getList(idx, pageNum, pageSize, artCategoryId) {
-        this.$u.api.policyInfo.getPolicyInfoList({
-          pageNum,
-          pageSize,
-          artCategoryId
-        }).then(res => {
-          if (res.code === 200) {
-            this.$refs.policyInfoPaging.complete(res.rows || []);
-          } else {
-            uni.showToast({
-              icon: 'none',
-              title: res.msg
-            });
-            this.$refs.policyInfoPaging.complete([]);
-          }
-        }).catch(err => {
-          // console.log("err: ",err);
-          uni.showToast({
-            title: '系统异常!',
-            type: 'error'
-          });
-          this.$refs.policyInfoPaging.complete([]);
-        });
-      },
-      // tab栏切换
-      tabsChange(index) {
-        this.tabCurrent = index;
-        this.getList(index, 1, 10, this.tabsList[index]?.text);
-      },
-      /**
-       * 列表加载触发
-       */
-      policyInfoQueryList(pageNo, pageSize) {
-        if (this.tabsList.length > 0) {
-          this.getList(this.tabCurrent, pageNo, pageSize, this.tabsList[this.tabCurrent]?.text);
-        }
-      },
-      /**
-       * 政策咨询事件
-       */
-      policySubmitBtnClick() {
-        this.$u.route({
-          url: 'pages/questionConsulting/questionConsulting',
-          params: {
-            id: '9999'
-          }
-        });
-      }
-    }
-  }
+	export default {
+		data() {
+			return {
+				bannerList: [],
+				policyInfoTitle: '中华人民共和国英雄烈士保护法',
+				// 政策资讯列表
+				policyInfoList: [],
+				tabsList: [],
+				tabCurrent: 0
+			}
+		},
+		onLoad() {
+			this.getPolicyType();
+		},
+		onShow() {
+			this.getBannerList();
+		},
+		methods: {
+			/**
+			 * 获取政策资讯类别
+			 */
+			getPolicyType() {
+				this.$u.api.getDictdataUrl({
+					key: 'policy_type'
+				}).then(res => {
+					if (res.code == 200) {
+						this.tabsList = res.data;
+						this.getList(0, 1, 10, this.tabsList[0].text);
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						});
+					}
+				});
+			},
+			getBannerList() {
+				this.$u.api.indexApi.indexBannerListApi().then(res => {
+						if (!res) return;
+						this.bannerList = res?.data || [];
+					})
+			},
+			// 轮播图点击
+			swiperClick(index) {
+				if (this.bannerList[index].jumpUrl) {
+					let url = this.bannerList[index].jumpUrl.split('#')[1];
+					this.$u.route({
+						url: url,
+					});
+				} else {
+					this.$u.route({
+						url: 'pages/bannerDetails/bannerDetails',
+						params: {
+							id: this.bannerList[index].id
+						}
+					});
+				}
+			},
+			swiperChange(index) {
+				// this.policyInfoTitle = this.bannerList[index]?.name || '';
+			},
+			/**
+			 * 获取列表
+			 * @param { Number } idx
+			 * @param { Number } pageNum
+			 * @param { Number } pageSize
+			 * @param { Number } artCategoryId
+			 */
+			getList(idx, pageNum, pageSize, artCategoryId) {
+				this.$u.api.policyInfo.getPolicyInfoList({
+					pageNum,
+					pageSize,
+					artCategoryId
+				}).then(res => {
+					if (res.code === 200) {
+						this.$refs.policyInfoPaging.complete(res.rows || []);
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						});
+						this.$refs.policyInfoPaging.complete([]);
+					}
+				}).catch(err => {
+					// console.log("err: ",err);
+					uni.showToast({
+						title: '系统异常!',
+						type: 'error'
+					});
+					this.$refs.policyInfoPaging.complete([]);
+				});
+			},
+			// tab栏切换
+			tabsChange(index) {
+				this.tabCurrent = index;
+				this.getList(index, 1, 10, this.tabsList[index]?.text);
+			},
+			/**
+			 * 列表加载触发
+			 */
+			policyInfoQueryList(pageNo, pageSize) {
+				if (this.tabsList.length > 0) {
+					this.getList(this.tabCurrent, pageNo, pageSize, this.tabsList[this.tabCurrent]?.text);
+				}
+			},
+			/**
+			 * 政策咨询事件
+			 */
+			policySubmitBtnClick() {
+				this.$u.route({
+					url: 'pages/questionConsulting/questionConsulting',
+					params: {
+						id: '9999'
+					}
+				});
+			}
+		}
+	}
 </script>
 
-<style lang="scss"
-  scoped>
-  @import './scss/policyInfo.scss'
+<style lang="scss" scoped>
+	@import './scss/policyInfo.scss'
 </style>

h5_web/pages/recruitment/recruitment.vue

@@ -5,98 +5,94 @@
 
 <template>
 	<view class="recruitment">
-    <u-navbar title-color="#FFFFFF" :customBack="navbarCustomBack" :bpay-bottom="false" back-icon-color="#FFFFFF" :background="{background: '#3D5D4C' }" title="招聘就业" class="recruitment-unavbar" />
-    
-    <z-paging ref="recruitmentPaging"
-      v-model="recruitmentJobList"
-      @query="recruitmentQueryList">
-      
-      <!-- ###################################-- 轮播图 -- ################################### -->
-      <view class="recruitment-banner" slot="top">
-        <u-swiper
-          :list="bannerList"
-          name="bannerUrl"
-          border-radius="0"
-          mode="round"
-          height="440"
-          img-mode="scaleToFill"
-          @click="swiperClick"
-        ></u-swiper>
-      </view>
-      
-      <!-- ###################################-- 请输入您关键词 -- ################################### -->
-      <view class="recruitment-usearch" slot="top">
-         <u-search placeholder="请输入您关键词" v-model="headerTopKeyword" :show-action="false" bg-color="#FFFFFF" @search="searchKeyword" @clear="searchKeyword"></u-search>
-      </view>
-      
-      <!-- ###################################-- 企业推荐 -- ################################### -->
-      <view class="u-card-wrap recruitment-recommend" slot="top">
-      	<u-card :show-foot="false" class="recruitment-recommend-card">
-         <view slot="head">
-           <view class="recommend-card-head">
-              <view class="recommend-card-head-title">{{recommendConfigData.title}}</view>
-              <view class="recommend-card-head-subtitle" @tap="recommendCardMoreClick">
-                {{recommendConfigData.titlemore}}
-                <u-icon name="arrow-right" color="#A3A3A3" size="28"></u-icon>
-              </view>
-           </view>
-          </view>
-      		<view slot="body">
-            <view class="recommend-card-body">
-              <swiper
-              v-if="recommendList&&recommendList.length>0"
-              class="recommend-card-content" 
-              :display-multiple-items="5"
-              :autoplay="true"
-              >
-                <swiper-item v-for="(recommendItem, index) in recommendList" :key="'recommendList' + index">
-                  <view class="swiper-item" @tap="tapRecommendSwiperItem(recommendItem)" :data-id="recommendItem.id" :data-index="index">
-                    <image class="img" :src="recommendItem.logoUrl" mode="aspectFill"></image>
-                    <view class="subject">{{recommendItem.companyName}}</view>
-                    <view class="post u-text-center">
-                      岗位
-                      <text class="postlink">{{recommendItem.postCount}}</text>个
-                    </view>
-                  </view>
-                </swiper-item>
-                <swiper-item v-if="recommendConfigData.listmore">
-                  <view class="swiper-item lookmore" @tap="recommendCardMoreClick">
-                    <view class="moretext">查看更多</view>
-                  </view>
-                </swiper-item>
-              </swiper>
-            </view>
-      		</view>
-      	</u-card>
-      </view>
-      
-      <!-- ###################################-- tabs页签 -- ################################### -->
-      <view class="recruitment-tabs" slot="top">
-        <u-tabs bg-color="transparent" :list="dataAreaTabsList" @change="dataAreaTabsChange" :current="dataAreaTabsCurrent" />
-      </view>
-      
-      
-      <!-- ###################################-- 招聘就业岗位 -- ################################### -->
-      <view class="recruitment-dataarea">
-        <view class="recruitment-dataarea-card" v-for="(item,index) in recruitmentJobList" :key="'recruitmentJobList' + index" @tap="tapDataAreaCard(item)">
-          <view class="dataarea-card-left">
-            <image :src="item.companyLogoUrl" mode="aspectFill" class="image"></image>
-          </view>
-          <view class="dataarea-card-content">
-            <view class="dataarea-content-left">
-              <view>{{item.postName}}</view>
-              <view class="content">{{item.workPlace}}｜{{item.workYear}}｜{{item.educationBg}}</view>
-              <view >{{item.companyName}}</view>
-            </view>
-            <view class="dataarea-content-right">
-              <view>{{item.lowestSalary}}k~{{item.highestSalary}}k</view>
-              <view>&nbsp;</view>
-              <view>{{item.createTime}}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </z-paging>
+		<u-navbar title-color="#FFFFFF" :customBack="navbarCustomBack" :bpay-bottom="false" back-icon-color="#FFFFFF"
+			:background="{background: '#3D5D4C' }" title="招聘就业" class="recruitment-unavbar" />
+
+		<z-paging ref="recruitmentPaging" v-model="recruitmentJobList" @query="recruitmentQueryList">
+
+			<!-- ###################################-- 轮播图 -- ################################### -->
+			<view class="recruitment-banner" slot="top">
+				<u-swiper :list="bannerList" name="bannerUrl" border-radius="0" mode="round" height="440"
+					img-mode="scaleToFill" @click="swiperClick"></u-swiper>
+			</view>
+
+			<!-- ###################################-- 请输入您关键词 -- ################################### -->
+			<view class="recruitment-usearch" slot="top">
+				<u-search placeholder="请输入您关键词" v-model="headerTopKeyword" :show-action="false" bg-color="#FFFFFF"
+					@search="searchKeyword" @clear="searchKeyword"></u-search>
+			</view>
+
+			<!-- ###################################-- 企业推荐 -- ################################### -->
+			<view class="u-card-wrap recruitment-recommend" slot="top">
+				<u-card :show-foot="false" class="recruitment-recommend-card">
+					<view slot="head">
+						<view class="recommend-card-head">
+							<view class="recommend-card-head-title">{{recommendConfigData.title}}</view>
+							<view class="recommend-card-head-subtitle" @tap="recommendCardMoreClick">
+								{{recommendConfigData.titlemore}}
+								<u-icon name="arrow-right" color="#A3A3A3" size="28"></u-icon>
+							</view>
+						</view>
+					</view>
+					<view slot="body">
+						<view class="recommend-card-body">
+							<swiper v-if="recommendList&&recommendList.length>0" class="recommend-card-content"
+								:display-multiple-items="4" :autoplay="true">
+								<swiper-item v-for="(recommendItem, index) in recommendList"
+									:key="'recommendList' + index">
+									<view class="swiper-item" @tap="tapRecommendSwiperItem(recommendItem)"
+										:data-id="recommendItem.id" :data-index="index">
+										<view class="img">
+											<u-image :src="recommendItem.logoUrl" mode="aspectFill" width="140"
+												height="140" border-radius="10"/>
+										</view>
+										<view class="subject">{{recommendItem.companyName}}</view>
+										<view class="post u-text-center">
+											岗位
+											<text class="postlink">{{recommendItem.postCount}}</text>个
+										</view>
+									</view>
+								</swiper-item>
+								<swiper-item v-if="recommendConfigData.listmore">
+									<view class="swiper-item lookmore" @tap="recommendCardMoreClick">
+										<view class="moretext">查看更多</view>
+									</view>
+								</swiper-item>
+							</swiper>
+						</view>
+					</view>
+				</u-card>
+			</view>
+
+			<!-- ###################################-- tabs页签 -- ################################### -->
+			<view class="recruitment-tabs" slot="top">
+				<u-tabs bg-color="transparent" :list="dataAreaTabsList" @change="dataAreaTabsChange"
+					:current="dataAreaTabsCurrent" />
+			</view>
+
+
+			<!-- ###################################-- 招聘就业岗位 -- ################################### -->
+			<view class="recruitment-dataarea">
+				<view class="recruitment-dataarea-card" v-for="(item,index) in recruitmentJobList"
+					:key="'recruitmentJobList' + index" @tap="tapDataAreaCard(item)">
+					<view class="dataarea-card-left">
+						<u-image :src="item.companyLogoUrl" mode="aspectFill" width="120" height="120" border-radius="10"/>
+					</view>
+					<view class="dataarea-card-content">
+						<view class="dataarea-content-left">
+							<view>{{item.postName}}</view>
+							<view class="content">{{ item.areaName }}｜经验{{ item.workYear }}年｜{{ getEducationBg(item.educationBg) }}</view>
+							<view>{{item.companyName}}</view>
+						</view>
+						<view class="dataarea-content-right">
+							<view>{{item.lowestSalary}}k~{{item.highestSalary}}k</view>
+							<view>&nbsp;</view>
+							<view>{{$u.timeFormat(new Date(item.createTime).getTime(), 'yyyy-mm-dd')}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</z-paging>
 	</view>
 </template>
 
@@ -104,267 +100,197 @@
 	export default {
 		data() {
 			return {
-        headerTopKeyword: '',
+				headerTopKeyword: '',
 				bannerList: [],
-        // 企业推荐列表
-        recommendList: [],
-        recruitmentJobList: [],
-        recommendListData:[
-        	{
-        		id:1,
-        		img:"https://img.xiaopiu.com/userImages/img88517697eccbd8.jpg",
-        		subject:"顺丰快递",
-            postNumber: 10,
-            postCompany: '顺丰速运有限公司贵州分公司',
-            postName: '快递员',
-            postContent: '云岩区｜经验不限｜中等专科',
-            postWage: '4.0k-8.0k',
-            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
-        	},
-        	{
-        		id:2,
-        		img:"https://img.xiaopiu.com/userImages/img88317697ec8588.jpg",
-        		subject:"中国平安",
-            postNumber: 14,
-            postCompany: '中国平安贵州分公司',
-            postName: '保险员',
-            postContent: '贵州省｜经验不限｜中等专科',
-            postWage: '4.0k-8.0k',
-            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
-        	},
-        	{
-        		id:3,
-        		img:"https://img.xiaopiu.com/userImages/img205717698ca4710.png",
-        		subject:"保利贵州",
-            postNumber: 8,
-            postCompany: '保利贵州酒店管理有限公司',
-            postName: '保安员',
-            postContent: '贵州省｜经验不限｜中等专科',
-            postWage: '4.0k-8.0k',
-            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
-        	},
-        	{
-        		id:4,
-        		img:"https://img.xiaopiu.com/userImages/img87917697ec0c70.png",
-        		subject:"海大装饰",
-            postNumber: 18,
-            postCompany: '海大装饰有限公司',
-            postName: '设计师',
-            postContent: '贵州省  | 设计师经验 | 中等专科',
-            postWage: '4.0k-8.0k',
-            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
-        	},
-        	{
-        		id:5,
-        		img:"https://img.xiaopiu.com/userImages/img87717697ebe178.jpg",
-        		subject:"永辉超市",
-            postNumber: 10,
-            postCompany: '永辉超市有限公司',
-            postName: '收银员',
-            postContent: '贵州省  | 相关经验 | 中等专科',
-            postWage: '4.0k-8.0k',
-            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
-        	},
-        	{
-        		id:5,
-        		img:"https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
-        		subject:"研发测试岗位",
-            postNumber: 99,
-            postCompany: '智能科技有限公司',
-            postName: '研发员',
-            postContent: '贵州省｜经验不限｜中等专科',
-            postWage: '4.0k-8.0k',
-            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
-        	}
-        ],
-        recommendConfigData:{
-        	title:'企业推荐',
-        	titlemore:'更多',
-        	listmore: false
-        },
-        dataAreaTabsCurrent: 0,
-        dataAreaTabsList: [
-          {
-            name: '最新',
-            text: '1'
-          }, 
-          // {
-          //   name:  '附近',
-          //   count: 7
-          // }, {
-          //   name: '筛选'
-          // }
-        ]
+				// 企业推荐列表
+				recommendList: [],
+				recruitmentJobList: [],
+				recommendListData: [],
+				recommendConfigData: {
+					title: '企业推荐',
+					titlemore: '更多',
+					listmore: false
+				},
+				dataAreaTabsCurrent: 0,
+				dataAreaTabsList: [{
+					name: '最新',
+					text: '1'
+				}],
+				degrEducList: []
 			}
 		},
 		onLoad() {
 			// console.log(this.$u.config.v);
-      // 获取企业推荐列表
+			// 获取企业推荐列表
 			this.getRecommendList();
 		},
 		onShow() {
 			this.getBannerList();
+			this.getVeteDegrEduc();
 		},
 		methods: {
-      /**
-       * 导航栏返回事件
-       */
-      navbarCustomBack(){
-        this.$u.route({
-          type: 'switchTab',
-          url: 'pages/index/index'
-        });
-      },
-			getBannerList(){
-				this.$u.api.getIndexBannerList()
-				.then(res=>{
-					if (res.code === 200) {
+			/**
+			 * 获取文化程度类别
+			 */
+			getVeteDegrEduc(){
+				this.$u.api.getDictdataUrl({key:'degr_educ'}).then(res=>{
+					if(res.code == 200){						
+						this.degrEducList = res.data.map(item => {
+							return {
+								...item,
+								value: item.text
+							}
+						});
+					}
+				});
+			},
+			/**
+			 * 获取教育等级名称
+			 * @param {Object} value
+			 */
+			getEducationBg(value) {
+				let name;
+				this.degrEducList.forEach(item => {
+					if (item.value == value) {
+						name = item.label
+					}
+				})
+				return name;
+			},
+			/**
+			 * 导航栏返回事件
+			 */
+			navbarCustomBack() {
+				this.$u.route({
+					type: 'switchTab',
+					url: 'pages/index/index'
+				});
+			},
+			getBannerList() {
+				this.$u.api.indexApi.indexBannerListApi().then(res => {
+					if (res?.code === 200) {
 						this.bannerList = res.data;
-						this.bannerList = [];
-						this.bannerList.push(
-						  {
-						    bannerUrl: 'https://img.xiaopiu.com/userImages/img146217698746a98.jpg',
-						    content: '<p>代码固定测试内容999997</p>',
-						    id: "999997",
-						    name: "代码固定测试999997"
-						  }
-						);
-						this.bannerList.push(
-						  {
-						    bannerUrl: 'https://img.xiaopiu.com/userImages/img14641769874a530.png',
-						    content: '<p>代码固定测试内容999998</p>',
-						    id: "999998",
-						    name: "代码固定测试999998"
-						  }
-						);
-						this.bannerList.push(
-						  {
-						    bannerUrl: 'https://img.xiaopiu.com/userImages/img14661769874c088.jpg',
-						    content: '<p>代码固定测试内容999999</p>',
-						    id: "999999",
-						    name: "代码固定测试999999"
-						  }
-						);
 					}
 				})
 			},
 			// 轮播图点击
-			swiperClick (index) {
-				// console.log('swiperClick',index);
-				if(this.bannerList[index].jumpUrl){
+			swiperClick(index) {
+				if (this.bannerList[index].jumpUrl) {
 					let url = this.bannerList[index].jumpUrl.split('#')[1];
 					this.$u.route({
 						url: url,
 					});
-				}else{
+				} else {
 					this.$u.route({
 						url: 'pages/bannerDetails/bannerDetails',
 						params: {
-						  id: this.bannerList[index].id
+							id: this.bannerList[index].id
 						}
 					})
 				}
 			},
-      /**
-       * 获取企业推荐列表
-       */
-      getRecommendList() {
-        this.$u.api.recruitment.getRecommendList().then(res => {
-          if (res.code === 200) {
-            this.recommendList = res.data || [];
-          } else {
-            uni.showToast({
-              icon: 'none',
-              title: res.msg
-            });
-          }
-        }).catch(err => {
-          uni.showToast({
-            title: '系统异常!',
-            type: 'error'
-          });
-        });
-      },
-      /**
-       * 获取招聘就业岗位列表
-       * @param { Number } newest
-       * @param { Number } pageNum
-       * @param { Number } pageSize
-       * @param { String } postName
-       */
-      getRecruitmentJobList(newest, pageNum, pageSize, postName) {
-        this.$u.api.recruitment.getRecruitmentJobList({
-          pageNum,
-          pageSize,
-          postName,
-          newest
-        }).then(res => {
-          if (res.code === 200) {
-            this.$refs.recruitmentPaging.complete(res.rows || []);
-          } else {
-            uni.showToast({
-              icon: 'none',
-              title: res.msg
-            });
-            this.$refs.recruitmentPaging.complete([]);
-          }
-        }).catch(err => {
-          uni.showToast({
-            title: '系统异常!',
-            type: 'error'
-          });
-          this.$refs.recruitmentPaging.complete([]);
-        });
-      },
+			/**
+			 * 获取企业推荐列表
+			 */
+			getRecommendList() {
+				this.$u.api.recruitment.getRecommendList().then(res => {
+					if (res.code === 200) {
+						this.recommendList = res.data || [];
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						});
+					}
+				}).catch(err => {
+					uni.showToast({
+						title: '系统异常!',
+						type: 'error'
+					});
+				});
+			},
+			/**
+			 * 获取招聘就业岗位列表
+			 * @param { Number } newest
+			 * @param { Number } pageNum
+			 * @param { Number } pageSize
+			 * @param { String } postName
+			 */
+			getRecruitmentJobList(newest, pageNum, pageSize, postName) {
+				this.$u.api.recruitment.getRecruitmentJobList({
+					pageNum,
+					pageSize,
+					postName,
+					newest
+				}).then(res => {
+					if (res.code === 200) {
+						this.$refs.recruitmentPaging.complete(res.rows || []);
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						});
+						this.$refs.recruitmentPaging.complete([]);
+					}
+				}).catch(err => {
+					uni.showToast({
+						title: '系统异常!',
+						type: 'error'
+					});
+					this.$refs.recruitmentPaging.complete([]);
+				});
+			},
 			/**
 			 * @param { String } value
 			 */
 			searchKeyword(value) {
-				this.getRecruitmentJobList(this.dataAreaTabsList[this.dataAreaTabsCurrent]?.text, 1, 10, this.headerTopKeyword);
+				this.getRecruitmentJobList(this.dataAreaTabsList[this.dataAreaTabsCurrent]?.text, 1, 10, this
+					.headerTopKeyword);
+			},
+			// tab栏切换
+			dataAreaTabsChange(index) {
+				this.dataAreaTabsCurrent = index;
+				this.getRecruitmentJobList(this.dataAreaTabsList[index]?.text, 1, 10, this.headerTopKeyword);
 			},
-      // tab栏切换
-      dataAreaTabsChange(index) {
-        this.dataAreaTabsCurrent = index;
-        this.getRecruitmentJobList(this.dataAreaTabsList[index]?.text, 1, 10, this.headerTopKeyword);
-      },
-      /**
-       * 列表加载触发
-       */
-      recruitmentQueryList(pageNo, pageSize) {
-        if (this.dataAreaTabsList.length > 0) {
-          this.getRecruitmentJobList(this.dataAreaTabsList[this.dataAreaTabsCurrent]?.text, pageNo, pageSize, this.headerTopKeyword);
-        }
-      },
-      recommendCardMoreClick(index) {
-        console.log("recommendCardMoreClick: ",index);
-        this.$u.route({
-        	url: 'pages/cooperativeEnterprise/cooperativeEnterprise',
-        	params: {
-        	  flag: 'recruitment'
-        	}
-        });
-      },
-      tapRecommendSwiperItem(param){
-        this.$u.route({
-        	url: 'pages/businessDetails/businessDetails',
-        	params: {
-            id: param?.id,
-        	  flag: 'recruitment'
-        	}
-        });
-      },
-      tapDataAreaCard(param){
-        this.$u.route({
-        	url: 'pages/jobDetails/jobDetails',
-        	params: {
-            id: param?.id
-        	}
-        });
-      }
+			/**
+			 * 列表加载触发
+			 */
+			recruitmentQueryList(pageNo, pageSize) {
+				if (this.dataAreaTabsList.length > 0) {
+					this.getRecruitmentJobList(this.dataAreaTabsList[this.dataAreaTabsCurrent]?.text, pageNo, pageSize,
+						this.headerTopKeyword);
+				}
+			},
+			recommendCardMoreClick(index) {
+				console.log("recommendCardMoreClick: ", index);
+				this.$u.route({
+					url: 'pages/cooperativeEnterprise/cooperativeEnterprise',
+					params: {
+						flag: 'recruitment'
+					}
+				});
+			},
+			tapRecommendSwiperItem(param) {
+				this.$u.route({
+					url: 'pages/businessDetails/businessDetails',
+					params: {
+						id: param?.id,
+						flag: 'recruitment'
+					}
+				});
+			},
+			tapDataAreaCard(param) {
+				this.$u.route({
+					url: 'pages/jobDetails/jobDetails',
+					params: {
+						id: param?.id
+					}
+				});
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-  @import './scss/recruitment.scss';
+	@import './scss/recruitment.scss';
 </style>

h5_web/pages/recruitment/scss/recruitment.scss

@@ -41,24 +41,20 @@ page{background-color: #f2f2f2;}
         padding: 30rpx 16px 0 !important;
       }
       
-      .recommend-card-body{
+      .recommend-card-body {
         .recommend-card-content{
-          height: 220rpx !important;
-          // min-height: 208rpx !important;
+          height: 240rpx !important;
           
-          .swiper-item{
-          	// height: 101rpx;
+          .swiper-item {
           	margin-right: 14rpx;
             text-align: center;
             
-            .img{
-            	width: 94rpx;
-            	height: 94rpx;
-              box-shadow: 0px 0px 10px 0px rgba(77, 77, 77, 0.23);
-              border-radius: 10rpx;
+            .img {
+              // box-shadow: 0px 0px 10px 0px rgba(77, 77, 77, 0.23);
+							margin-bottom: 20rpx;
             }
             
-            .subject{
+            .subject {
               width: 100%;
               text-align: center;
               font-size: 24rpx;
@@ -67,6 +63,9 @@ page{background-color: #f2f2f2;}
               color: #000000;
               line-height: 33rpx;
               letter-spacing: 1px;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
             }
             
             .post{
@@ -108,30 +107,22 @@ page{background-color: #f2f2f2;}
     padding: 0 30rpx;
     width: 100%;
     
-    &-card{
+    &-card {
       display: flex;
-      flex-wrap: wrap;
+			align-items: center;
       margin-top: 20rpx;
-      padding: 5%;
-      width: 100%;
+      padding: 32rpx;
       background-color: #FFFFFF;
       border-radius: 10rpx;
       
       .dataarea-card-left{
-        .image{
-          width: 101rpx;
-          height: 101rpx;
-          box-shadow: 0 0 10rpx 0 rgba(77, 77, 77, 0.23);
-          border-radius: 5rpx;
-        }
+				margin-right: 24rpx;
       }
       
       .dataarea-card-content{
-        margin-left: 4%;
-        min-width: 78%;
         display: flex;
-        flex-wrap: wrap;
         justify-content: space-between;
+				width: 100%;
         
         .dataarea-content-left{
           view:first-child{

h5_web/pages/setting/setting.vue

@@ -3,7 +3,7 @@
 	<view class="setting">
 		<u-cell-group :border="false" :title-style="{'color': '#333333', 'font-size': '24rpx'}">
 			<u-cell-item icon="" title="退出登录" @click="	logoutModal = true"/>
-			<u-cell-item icon="" title="版本信息" :arrow="false" value="当前版本8.9，已更新"/>
+			<u-cell-item icon="" title="版本信息" :arrow="false" :value="`当前版本${ config.version }，已更新`"/>
 		</u-cell-group>
 		<!-- 退出登录提示框 -->
 		<u-modal