全流程测试，细节调整

apis/pagejs/index.md

@@ -21,3 +21,6 @@ import request from '@/apis/utils/request'
 /mobile/recruit/createRecruit 发布招聘信息
/mobile/recruit/recruitDetail 招聘信息详细(免登陆
/mobile/recruit/createShareWork 发布共享用工信息
 
 /mobile/job/createJobHunt 发布求职信息
/mobile/job/jobHuntDetail 求职信息详细(免登陆
+
+
+[](https://equipment.xiaoxinda.com/jk-temporary-workers-portal/)

apis/pagejs/main.js

@@ -28,12 +28,13 @@ export function logout(data) {
 	})
 }
 
-// 实名/企业认证
-export function createAuthentication(data) {
-	var url='/mobile/user/createAuthentication';
-	return request({
+
+
+export function bannerList(data) {
+	var url='/mobile/banner/bannerList';
+	return requestWhite({
 		method: 'post',
 		data: data,
 		url: url
 	})
-}
+}

apis/pagejs/packages.js

@@ -193,3 +193,13 @@ export function myRegistration(data) {
  	})
 }
 
+
+// 实名/企业认证
+export function createAuthentication(data) {
+	var url='/mobile/user/createAuthentication';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}

config/.env.dev.js

@@ -1,7 +1,7 @@
 const UNI_APP = {  
 	ProjectName :"荆州经开区共享用工平台",
 	 BASE_URL: 'http://192.168.77.162:8086/jk-temporary-workers-server/',
-	//BASE_URL:"https://equipment.xiaoxinda.com/equipment-manage-server/",
+	BASE_URL:"https://equipment.xiaoxinda.com/jk-temporary-workers-server/",
 	//IMG_URL:"http://www.jsrailway.com.cn/",
 	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 	
@@ -14,7 +14,7 @@ const UNI_APP = {
 	openId:"o_5WO4hc7MyyVNjSDePRIft6AokI",//个人企业都注册
 	
 	//openId:"001",// 个人企业 未注册
-	//openId:"223",// 个人  注册 ，企业未
+	openId:"002",// 个人  注册 ，企业未
 	//openId:"323",// 个人  未注册 ，企业 注册
 	 
 	//小鹏管家appid

pages/main/index/index.vue

@@ -222,6 +222,7 @@
 				}
 			}
 			this.findRecruitHomePage();
+			this.bannerList()
 			this.findByOpenId();
 		},
 		computed:{
@@ -233,6 +234,17 @@
 			}
 		},
 		methods: {
+			bannerList(){
+				API.bannerList({
+								
+				}).then((res) => {
+									 
+				
+									 
+				}).catch(error => {
+									
+				})
+			},
 			findByOpenId(){
 				
 				 API_weixin.findByOpenId({

pages/packages/mine/employmentService/shareEmployment.vue

@@ -10,7 +10,7 @@
 			<view class="info-card" v-for="(item,i) in list[current].list" :key="i">
 				<!-- 卡片信息 -->
 				<view class="detail" @click="gotoUrl('pages/packages/shareEmployment/articleDetail?id='+item.id)">
-					{{item.content}}
+					{{item.title}}
 				</view>
 				<view class="tag" @click="gotoUrl('pages/packages/shareEmployment/articleDetail?id='+item.id)">
 					<view class="item1" v-if="item.type == '1'">
@@ -110,7 +110,7 @@
 		},
 		methods: {
 			init() {
-				//this.current = 0
+				this.current =1
 				for(var i in this.list){
 					this.formList[i].pageIndex = 1
 					this.list[i].list = []

pages/packages/mine/otherServices/authentication.vue

@@ -19,7 +19,7 @@
 							手机号码
 						</view>
 						<view class="value">
-							<input v-model="personalForm.phone" type="text" placeholder="15500001111">
+							{{personalForm.phone}}
 						</view>
 					</view>
 					<view class="item">
@@ -184,7 +184,7 @@
 </template>
 
 <script>
-	import * as API_main from '@/apis/pagejs/main.js'
+	import * as API_main from '@/apis/pagejs/packages.js'
 	import * as API_weixin from '@/apis/weixin.js'
 	import {
 		checkIdCard
@@ -322,21 +322,14 @@
 					openId:this.carhelp.getOpenId()
 				}).then((res) => {
 					uni.hideLoading();
+					
 					var userList = res.data.regUser;
 					var enterList = res.data.enterpriseInfo;
 					this.personalForm = userList;
 					if(userList.status == '1') {
 						this.authentication = false;
-						if(userList.realName.length == 2) {
-							this.personalForm.realName = userList.realName.slice(0,1) + '*';
-						} else {
-							var num = userList.realName.length - 2;
-							var xh = '';
-							for (var i = 0; i < num; i++) {
-								x += '*';
-							}
-							this.personalForm.realName = userList.realName.slice(0,1) + xh + userList.realName.slice(-1);
-						}
+						this.personalForm.realName = userList.realName;
+						
 					}
 					if(enterList != null) {
 						this.enterpriseForm = enterList;

pages/packages/news/articleDetail.vue

@@ -15,7 +15,7 @@
 						<img src="@/assets/img/riLine-eye-line Copy@1x.png" alt="">
 					</view>
 					<view class="number">
-						{{newsDetail.readNum}}
+						{{newsDetail.browseNumber}}
 					</view>
 				</view>
 			</view>
@@ -42,18 +42,20 @@
 			
 			
 			this.id =op.id;
-			//this.getNewsInfoDetail();
+			this.getNewsDetail();
 		},
 		methods: {
-			getNewsInfoDetail() {
+			getNewsDetail() {
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
 				})
 				
-				API.newsInfoDetail(this.id).then((res) => {
+				API.newsDetail({
+					id:this.id
+				}).then((res) => {
 					uni.hideLoading()					
-					this.newsDetail = res.data;
+					this.newsDetail = res.data.newsInfo;
 					
 					this.$nextTick(()=>{
 					    var list =document.getElementsByClassName("news-content")[0].getElementsByTagName("img");

pages/packages/news/news.vue

@@ -7,19 +7,19 @@
 			@click="gotoUrl('pages/packages/news/articleDetail?id='+item.id)">
 				<view class="content">
 					<view class="title">
-						荆州市发布“招硕引博”公告，高新区招录8人​！
+						{{item.title}}
 					</view>
 					<view class="tags">
 						<view class="classify">
-							政策发布
+							{{item.categoryN}}
 						</view>
 						<view class="date">
-							2023-06-10
+							{{item.createTime.substring(0,10)}}
 						</view>
 					</view>
 				</view>
 				<view class="picture">
-					 <!-- <img src="@/assets/img/newsPicture.png" alt=""> -->
+					 <img :src="item.thumbnailImage" alt="">
 				</view>
 			</view>
 		</view>
@@ -106,6 +106,7 @@
 			height: auto;
 			margin-bottom: 40rpx;
 			.content{
+				width: 526rpx;
 				margin-right: 24rpx;
 			    display: flex;
 				flex-direction: column;

pages/packages/search/search.vue

@@ -126,7 +126,7 @@
 					</view>
 				</view>
 			</u-popup>
-			<u-divider  v-if="tabList[current].recordsTotal==tabList[current].list.length"
+			<u-divider   bgNoneColor="#F0F0F2" style="background: #F0F0F2;" v-if="tabList[current].recordsTotal==tabList[current].list.length"
 					 :isnone="tabList[current].recordsTotal==0" nonetext="没有找到相关内容" 
 					border-color="#CFD2D5">已经到底了</u-divider>
 		</view>
@@ -236,7 +236,7 @@
 					</view>
 				</view>
 			</u-popup>
-			<u-divider  v-if="tabList[current].recordsTotal==tabList[current].list.length"
+			<u-divider   bgNoneColor="#F0F0F2" style="background: #F0F0F2;" v-if="tabList[current].recordsTotal==tabList[current].list.length"
 					 :isnone="tabList[current].recordsTotal==0" nonetext="没有找到相关内容" 
 					border-color="#CFD2D5">已经到底了</u-divider>
 		</view>

pages/packages/shareEmployment/articleDetail.vue

@@ -29,8 +29,8 @@
 			</view>
 			<u-line color="#CFD2D5" />
 			<!-- 文章内容 -->
-			<view class="content">
-				{{form.content}}
+			<view class="content news-content" v-html="form.content">
+				 
 			</view>
 			<!-- 图片 -->
 			<view class="picture">
@@ -67,6 +67,12 @@
 				API_packages.shareWorksDetail({id: this.form.id}).then((res) => {
 					this.form = res.data.shareWorksInfo;
 					this.photo = res.data.personInfo.photo;
+					this.$nextTick(()=>{
+					    var list =document.getElementsByClassName("news-content")[0].getElementsByTagName("img");
+					    for(var i=0;i<list.length;i++){
+					        list[i].style='width: 100%;height: 100%;'
+					    } 
+					})
 					uni.hideLoading();
 				}).catch(error => {
 					uni.showToast({icon: 'none',

pages/packages/shareEmployment/shareEmployment.vue

@@ -10,14 +10,17 @@
 			@click="gotoUrl('pages/packages/shareEmployment/articleDetail?id='+item.id)">
 			<!-- 卡片信息 -->
 			<view class="detail">
-				企业现急需熟练机床车工5名，如有资源请联系0716-8818118 刘女士。
+				{{item.title}}
 			</view>
 			<view class="tag">
-				<view class="item1">
+				<view class="item1" v-if="item.type == '1'">
 					急需用工
 				</view>
+				<view class="item2" v-if="item.type == '2'">
+					资源共享
+				</view>
 				<view class="date-item">
-					2023-06-12
+					{{item.createTime.slice(0,10)}}
 				</view>
 			</view>
 

pages/tab/choreInformation/choreInformation.vue

@@ -68,7 +68,8 @@
 				</view>
 				
 			</view>
-			<u-divider  v-if="tabList[current].recordsTotal==tabList[current].list.length"
+			<u-divider  style="background: #F0F0F2;" bgNoneColor="#F0F0F2"
+			 v-if="tabList[current].recordsTotal==tabList[current].list.length"
 					 :isnone="tabList[current].recordsTotal==0" nonetext="没有找到相关内容" 
 					border-color="#CFD2D5">已经到底了</u-divider>
 		</view>

pages/tab/jobInformation/jobInformation.vue

@@ -65,7 +65,9 @@
 				</view>
 			</view>
 			
-			<u-divider  v-if="tabList[current].recordsTotal==tabList[current].list.length"
+			<u-divider  style="background: #F0F0F2;"  bgNoneColor="#F0F0F2"
+			 
+			 v-if="tabList[current].recordsTotal==tabList[current].list.length"
 					 :isnone="tabList[current].recordsTotal==0" nonetext="没有找到相关内容" 
 					border-color="#CFD2D5">已经到底了</u-divider>
 		</view>

pages/tab/mine/mine.vue

@@ -35,8 +35,8 @@
 		<view class="card card1">
 			<view class="title">
 				求职信息
-				<img v-if="ck1()" src="@/assets/img/riFill-checkbox-circle-fill@1x.png" >
-				<img v-else src="@/assets/img/riFill-error-warning-fill@1x.png"></img>
+				<img class="showImg"  v-if="ck1()" src="@/assets/img/riFill-checkbox-circle-fill@1x.png" >
+				<img class="showImg"  v-else src="@/assets/img/riFill-error-warning-fill@1x.png"></img>
 			</view>
 			 <u-grid :col="3" :border="false">
 			 		<u-grid-item   @click="gotoUrl1('pages/packages/mine/myJobInformation/myJobInformation')">
@@ -65,8 +65,8 @@
 		<view class="card ">
 			<view class="title">
 				用工服务
-				<img v-if="ck2()" src="@/assets/img/riFill-checkbox-circle-fill@1x.png" >
-				<img v-else src="@/assets/img/riFill-error-warning-fill@1x.png"></img>
+				<img class="showImg" v-if="ck2()" src="@/assets/img/riFill-checkbox-circle-fill@1x.png" >
+				<img class="showImg"  v-else src="@/assets/img/riFill-error-warning-fill@1x.png"></img>
 				
 			</view>
 			 <u-grid :col="4" :border="false">
@@ -130,26 +130,30 @@
 			 	</u-grid>
 		</view>
 		<!-- 登录弹窗 -->
-			<u-popup v-model="show" mode="center" :closeable="true" @close="close" >
-				<view class="title">
-					登录荆开零工驿站
-				</view>
-				<view >
-					<button class="login-btn"  @click="decryptPhoneNumberH5"
-					 open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber" >
-						<u-icon name="weixin-fill" size="46"></u-icon>	<text>微信用户一键登录</text>
-					</button>
-				
-				</view>
+			<u-popup v-model="show" mode="center" border-radius="24" :closeable="true" @close="close" >
+				<view class="u-mode-center-main">
+					
 				
-				<view class="radio" v-if="false">
-					<!-- <radio></radio>
-						<view class="agreement">
-							阅读并同意<text style="color: #2795FD">《用户隐私协议》</text>
-					</view> -->
-					<u-radio-group v-model="value">
-						<u-radio active-color="red">阅读并同意<text style="color: #2795FD">《用户隐私协议》</text></u-radio>
-					</u-radio-group>
+					<view class="title">
+						登录荆开零工驿站
+					</view>
+					<view >
+						<button class="login-btn"  @click="decryptPhoneNumberH5"
+						 open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber" >
+							<u-icon name="weixin-fill" size="46"></u-icon>	<text>微信用户一键登录</text>
+						</button>
+					
+					</view>
+					
+					<view class="radio" v-if="false">
+						<!-- <radio></radio>
+							<view class="agreement">
+								阅读并同意<text style="color: #2795FD">《用户隐私协议》</text>
+						</view> -->
+						<u-radio-group v-model="value">
+							<u-radio active-color="red">阅读并同意<text style="color: #2795FD">《用户隐私协议》</text></u-radio>
+						</u-radio-group>
+					</view>
 				</view>
 			</u-popup>
 		 
@@ -184,10 +188,11 @@
 			}
 		},
 		onLoad() {
-			
+			this.userInfo=this.carhelp.getPersonInfo()
 			this.findByOpenId();
 			
 		},
+		
 		methods: {
 			
 			ck1(){
@@ -338,6 +343,8 @@
 			},
 			close(){
 				// #ifdef MP-WEIXIN
+				
+				// #endif
 				if(this.userInfo.id){
 					
 				}else{
@@ -345,7 +352,6 @@
 						url:"/"
 					})
 				}
-				// #endif
 			},
 			decryptPhoneNumberH5(){
 				// #ifdef H5
@@ -435,7 +441,10 @@
 	
 </style>
 <style lang="scss" scoped>
-
+	.showImg{
+		width: 38rpx ;
+		height: 38rpx ;
+	}
 	.top{
 		
 		display: flex;
@@ -539,51 +548,52 @@
   }
 
 // 弹窗
-/deep/.u-mode-center-box{
-	width: 560rpx !important;
-	border-radius: 12px;
-	padding: 80rpx 48rpx;
-	display: flex;
-	.title{
-		color: rgba(16, 16, 16, 1);
-		font-size: 36rpx;
-		font-family: 'PingFangSC-medium';
-	}
-	.login-btn{
-		background-color: rgba(0, 188, 99, 1);
-		color: #fff;
-		padding: 8rpx 70rpx;
-		margin-top: 56rpx;
-		margin-bottom: 16rpx;
-		border-radius: 8px;
-		display: flex;
+.u-mode-center-main{
+	
+		width: 560rpx !important;
+		border-radius: 12px;
+		padding: 80rpx 48rpx;
 		
-		font-size: 32rpx;
-		text{
-			margin-left: 8rpx;
+		.title{
+			color: rgba(16, 16, 16, 1);
+			font-size: 36rpx;
+			font-family: 'PingFangSC-medium';
 		}
-	}
-	.radio {
-		display: inline-block;
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		font-size: 24rpx;
-		color: #777777;
-		margin-left: 20rpx;
-		.uni-radio-input{
-			width: 24rpx;
-			height: 24rpx;
+		.login-btn{
+			background-color: rgba(0, 188, 99, 1);
+			color: #fff;
+			padding: 8rpx 70rpx;
+			margin-top: 56rpx;
+			margin-bottom: 16rpx;
+			border-radius: 8px;
+			display: flex;
 			
+			font-size: 32rpx;
+			text{
+				margin-left: 8rpx;
+			}
 		}
-		
-		.uni-radio-input-checked:before{
+		.radio {
+			display: inline-block;
+			width: 100%;
+			display: flex;
+			justify-content: center;
 			font-size: 24rpx;
-			    background-color: rgb(0, 122, 255);
-			    border-color: rgb(0, 122, 255);
+			color: #777777;
+			margin-left: 20rpx;
+			.uni-radio-input{
+				width: 24rpx;
+				height: 24rpx;
+				
+			}
+			
+			.uni-radio-input-checked:before{
+				font-size: 24rpx;
+					background-color: rgb(0, 122, 255);
+					border-color: rgb(0, 122, 255);
+			}
 		}
-	}
+	
 }
 
-
 </style>

uni_modules/uview-ui/components/u-divider/u-divider.vue

@@ -1,6 +1,8 @@
 <template>
 	<view>
-		<view  class="carNone"  v-if="isnone" >
+		<view  class="carNone" :style="bgNoneColor?'background-color:'+bgNoneColor:''"
+		 
+		 v-if="isnone" >
 			<!-- <img src="@/assets/img/暂无数据-缺省页.png" alt=""> -->
 			<view style=" margin-top: 40px;">
 				<u-empty  :text="nonetext" mode="search"></u-empty>
@@ -87,6 +89,11 @@ export default {
 			type: String,
 			default: '#f4f4f4'
 		},
+		// 整个divider的背景颜色
+		bgNoneColor: {
+			type: String,
+			default: ''
+		},
 		// 整个divider的高度单位rpx
 		height: {
 			type: [Number, String],