feat: 经纪人公告

pages.json

@@ -154,6 +154,18 @@
 				"navigationBarTitleText": "订单报备"
 			}
 		},
+		{
+			"path": "pages/broker/brokerNotice",
+			"style": {
+				"navigationBarTitleText": "公告"
+			}
+		},
+		{
+			"path": "pages/broker/noticeDetails",
+			"style": {
+				"navigationBarTitleText": "公告"
+			}
+		},
 
 		//驻场老师
 		{

pages/broker/brokerNotice.vue

@@ -0,0 +1,112 @@
+<template>
+	<view>
+		<view class="list">
+			<view class="list-item" v-for="(item,index) in noticeList" :key="index" @click="goPage(item.id)">
+				<view class="item-time">{{item.createtime}}</view>
+				<view class="item-card">
+					<view class="card-title">{{item.title}}</view>
+					<view class="card-content">
+						<u-parse :content="item.details"></u-parse>
+					</view>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="pstatus"></uni-load-more>
+	</view>
+</template>
+
+<script>
+	var _this;
+	export default {
+		data() {
+			return {
+				noticeList: [],
+				pstatus: 'more',
+				ppage: 1,
+				psize: 20,
+			}
+		},
+		onLoad() {
+			_this = this;
+			_this.getNotice();
+		},
+		onReachBottom: function() {
+			if (_this.pstatus !== 'more') {
+				return;
+			}
+			_this.getNotice();
+		},
+		methods: {
+			goPage(noticeid) {
+				uni.navigateTo({
+					url: '/pages/broker/noticeDetails?noticeid=' + noticeid
+				});
+			},
+			
+			getNotice() {
+				_this = this;
+				_this.$req.ajax({
+					path: "notice/listBrokerNotice",
+					data: {
+						ppage: _this.ppage,
+						psize: _this.psize,
+					}
+				}).then((data) => {
+					console.log("公告",data)
+					_this.pstatus = data.pstatus;
+					_this.noticeList = _this.noticeList.concat(data.plist);
+					_this.ppage += 1;
+				}).catch((err) => {
+					uni.showModal({
+						title: '信息提示',
+						content: err,
+						showCancel: false
+					});
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list {
+		padding: 20rpx 20rpx;
+	
+		.list-item {
+			margin-bottom: 30rpx;
+			display: flex;
+			flex-direction: column;
+	
+			.item-time {
+				margin: 0 auto 20rpx;
+				padding: 0 20rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				border-radius: 20rpx;
+				font-size: 20rpx;
+				color: #FFFFFF;
+				background-color: #d7d7d7;
+			}
+	
+			.item-card {
+				padding: 20rpx 20rpx;
+				background-color: #FFFFFF;
+				border-radius: 12rpx;
+				// box-shadow: 0rpx 0rpx 10rpx 1rpx rgba(73, 128, 209, 0.3);
+				box-shadow: 5rpx 5rpx 10rpx 2rpx rgba(255, 0, 0, 0.3);
+	
+				.card-title {
+					font-size: 35rpx;
+					font-weight: 600;
+				}
+	
+				.card-content {
+					margin-top: 20rpx;
+					line-height: 40rpx;
+					font-size: 25rpx;
+					color: #797979;
+				}
+			}
+		}
+	}
+</style>

pages/broker/center.vue

@@ -1,6 +1,16 @@
 <template>
 	<view>
-		<image :src="$getImageUrl('static/images/applet/broker/topBg.png')" class="header-image" mode="widthFix"></image>
+		<view class="header">
+			<image
+				:src="brokerinfo.type == 1 ? $getImageUrl('static/images/applet/broker/topBg.png') : $getImageUrl('static/images/applet/broker/topBgRed.png')"
+				class="header-image" mode="widthFix"></image>
+			<view class="header-notice" @click="goPage('/pages/broker/brokerNotice')">
+				<u-icon name="volume" color="#E0E0E0" size="28"></u-icon>
+				<view>公告</view>
+			</view>
+		</view>
+
+
 		<view class="cu-bar bg-white solid-bottom">
 			<view class="action">
 				<text class="cuIcon-title text-orange "></text> {{income_title}}
@@ -11,11 +21,15 @@
 		</view>
 		<view class="lw-table">
 			<view class="lw-table-item padding">
-				<view :class="{'text-price':brokerinfo.type == 1}" class="lw-table-value text-bold text-red">{{statistics.income_total}}</view>
+				<view :class="{'text-price':brokerinfo.type == 1}" class="lw-table-value text-bold text-red">
+					{{statistics.income_total}}
+				</view>
 				<view class="lw-table-title text-gray padding-top-xs">{{income_total_title}}</view>
 			</view>
 			<view class="lw-table-item padding">
-				<view :class="{'text-price':brokerinfo.type == 1}" class="lw-table-value text-bold text-red">{{statistics.income}}</view>
+				<view :class="{'text-price':brokerinfo.type == 1}" class="lw-table-value text-bold text-red">
+					{{statistics.income}}
+				</view>
 				<view class="lw-table-title text-gray padding-top-xs">{{income_now_title}}</view>
 			</view>
 		</view>
@@ -36,16 +50,19 @@
 		</view>
 		<view class="cu-list grid col-3 no-border margin-top">
 			<view class="cu-item text-center" @click="goNavPage('/pages/broker/broker')">
-				<image class="myicon" :src="$getImageUrl('static/images/applet/broker/code.png')" style="width: 50rpx;height: 50rpx;"></image>
+				<image class="myicon" :src="$getImageUrl('static/images/applet/broker/code.png')"
+					style="width: 50rpx;height: 50rpx;"></image>
 				<text>我的邀请码</text>
 			</view>
 			<view class="cu-item text-center" @click="goNavPage('/pages/broker/myorder')">
-				<image class="myicon" :src="$getImageUrl('static/images/applet/broker/order.png')" style="width: 50rpx;height: 50rpx;"></image>
+				<image class="myicon" :src="$getImageUrl('static/images/applet/broker/order.png')"
+					style="width: 50rpx;height: 50rpx;"></image>
 				<text>劳务订单</text>
 				<view style="color: #888;font-size: 26rpx;">(针对劳务机构)</view>
 			</view>
 			<view class="cu-item text-center" @click="goNavPage('/pages/my/myentry')">
-				<image class="myicon" :src="$getImageUrl('static/images/applet/broker/record.png')" style="width: 50rpx;height: 50rpx;"></image>
+				<image class="myicon" :src="$getImageUrl('static/images/applet/broker/record.png')"
+					style="width: 50rpx;height: 50rpx;"></image>
 				<text>悬赏报备记录</text>
 			</view>
 		</view>
@@ -71,6 +88,7 @@
 			_this = this;
 			_this.userinfo = uni.getStorageSync('userinfo') || false;
 			_this.brokerinfo = uni.getStorageSync('brokerinfo') || false;
+			console.log("经纪人", _this.brokerinfo)
 			if (_this.userinfo === false || _this.brokerinfo === false) {
 				uni.reLaunch({
 					url: "/pages/my/my"
@@ -80,6 +98,12 @@
 			_this.init();
 		},
 		methods: {
+			goPage(src) {
+				uni.navigateTo({
+					url: '/pages/broker/brokerNotice'
+				});
+			},
+			
 			init: function() {
 				_this.$req.ajax({
 					path: "broker/center",
@@ -128,9 +152,30 @@
 	}
 </script>
 
-<style scoped>
-	.header-image {
-		width: 750rpx;
+<style lang="scss" scoped>
+	.header {
+		height: 146rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+
+		.header-image {
+			width: 750rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: -1;
+		}
+
+		.header-notice {
+			padding-right: 40rpx;
+			font-size: 25rpx;
+			color: #E0E0E0;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+		}
 	}
 
 	.lw-table {

pages/broker/getorder.vue

@@ -1,18 +1,18 @@
 <template>
 	<view>
-		
+
 		<scroll-view scroll-x class="bg-white radius nav echo-fixed-top">
 			<view class="flex text-center solid-bottom">
-				<view class="cu-item flex-sub" :class="1==TabCur?'text-blue cur':''" @tap="tabSelect" :data-id="1">
+				<view class="cu-item flex-sub" :class="1==TabCur?'text-themeRed cur':''" @tap="tabSelect" :data-id="1">
 					订单信息
 				</view>
-				<view class="cu-item flex-sub" :class="2==TabCur?'text-blue cur':''" @tap="tabSelect" :data-id="2">
+				<view class="cu-item flex-sub" :class="2==TabCur?'text-themeRed cur':''" @tap="tabSelect" :data-id="2">
 					报备记录
 				</view>
 			</view>
 		</scroll-view>
 		<view class="echo-fixed-top-empty"></view>
-		
+
 		<view class="cu-list menu margin-bottom-sm">
 			<view class="cu-item">
 				<view class="content">
@@ -25,7 +25,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<block v-if="1==TabCur">
 			<view class="cu-list menu margin-bottom-sm">
 				<view class="cu-item">
@@ -55,24 +55,24 @@
 			</view>
 			<view class="cu-bar bg-white solids-bottom">
 				<view class="action">
-					<text class="cuIcon-titles text-blue"></text> 岗位要求
+					<text class="cuIcon-titles text-themeRed"></text> 岗位要求
 				</view>
 			</view>
 			<view class="echo-article-details bg-white margin-bottom-sm">
 				<text>{{order.demand.requirement}}</text>
 			</view>
-			
+
 			<view class="cu-bar bg-white solids-bottom">
 				<view class="action">
-					<text class="cuIcon-titles text-blue"></text> 企业简介
+					<text class="cuIcon-titles text-themeRed"></text> 企业简介
 				</view>
 			</view>
 			<view class="echo-article-details bg-white margin-bottom-sm">
 				<text>{{order.demand.comdetails}}</text>
 			</view>
 		</block>
-		
-		
+
+
 		<block v-if="2==TabCur">
 			<view class="padding text-center text-grey" v-if="order_log.length==0">
 				暂无报备记录...
@@ -80,7 +80,7 @@
 			<view v-else>
 				<view class="cu-timeline" v-for="(item,index) in order_log" :key="index">
 					<view class="cu-time">{{item.arrivetime}}</view>
-					<view class="cu-item text-blue">
+					<view class="cu-item text-themeRed">
 						<view class="content">
 							<view class="text-bold margin-bottom-sm">{{item.realname}}</view>
 							<view class="text-gray text-sm">电话：{{item.mobile}}</view>
@@ -90,9 +90,10 @@
 				</view>
 			</view>
 		</block>
-		
+
 		<view class="cu-bar bg-white tabbar border shop foot">
-			<view class="bg-blue submit echo-foot-button" @tap="goPage('/pages/broker/setreport?id=' + order.id)" v-if="order.status==2"> <text>立即报备</text> </view>
+			<view class="bg-themeBtn submit echo-foot-button" @tap="goPage('/pages/broker/setreport?id=' + order.id)"
+				v-if="order.status==2"> <text>立即报备</text> </view>
 			<view class="bg-grey submit echo-foot-button" v-else> <text>已招满</text> </view>
 		</view>
 	</view>
@@ -150,6 +151,9 @@
 </script>
 
 <style>
-	.cu-time{ width: 300rpx !important; padding-left: 30rpx !important; text-align: left !important; }
-</style>
-
+	.cu-time {
+		width: 300rpx !important;
+		padding-left: 30rpx !important;
+		text-align: left !important;
+	}
+</style>

pages/broker/noticeDetails.vue

@@ -0,0 +1,58 @@
+<template>
+	<view>
+		<view class="title">{{notice.title}}</view>
+		<view class="content">
+			<u-parse :content="notice.details"></u-parse>
+		</view>
+	</view>
+</template>
+
+<script>
+	var _this;
+	export default {
+		data() {
+			return {
+				noticeid: 0,
+				notice: {}
+			}
+		},
+		onLoad(option) {
+			_this = this;
+			_this.noticeid = option.noticeid || 0;
+			_this.getDetails()
+		},
+		methods: {
+			getDetails() {
+				_this = this;
+				_this.$req.ajax({
+					path: "notice/brokerNoticeDetail",
+					data: {
+						noticeid: _this.noticeid,
+					}
+				}).then((data) => {
+					console.log("公告",data.notice)
+					_this.notice = data.notice
+				}).catch((err) => {
+					uni.showModal({
+						title: '信息提示',
+						content: err,
+						showCancel: false
+					});
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		font-size: 35rpx;
+		font-weight: bold;
+		text-align: center;
+	}
+	
+	.content {
+		margin-top: 30rpx;
+		padding: 0 20rpx;
+	}
+</style>

pages/comjobs/detail.vue

@@ -53,6 +53,8 @@
 						open-type="navigate" v-else>
 					</navigator>
 				</view>
+				
+				<view class="jobBrokerage-charge">平台将收取{{comjobs_commission}}%手续费</view>
 			</view>
 
 
@@ -323,7 +325,8 @@
 				modal: {
 					name: null,
 					comjobspic: ""
-				}
+				},
+				comjobs_commission: 0
 			}
 		},
 		onLoad: function(option) {
@@ -356,6 +359,8 @@
 					userid: _this.userinfo == null ? 0 : _this.userinfo.id
 				}
 			}).then((data) => {
+				console.log(data)
+				_this.comjobs_commission = data.comjobs_commission;
 				_this.comjobs = data.comjobs;
 				_this.comjobslist = data.comjobslist;
 				_this.comjobsstar = data.comjobsstar;
@@ -761,6 +766,13 @@
 				border-radius: 60rpx;
 			}
 		}
+		
+		.jobBrokerage-charge {
+			margin-top: 20rpx;
+			font-size: 30rpx;
+			font-weight: 600;
+			color: #CA151C;
+		}
 	}
 
 	.publisher {

pages/comjobs/recruitFast.vue

@@ -39,6 +39,7 @@
 					<view class="card-top-item short">
 						<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardC.png')"></image>
 						<view class="item-text">赏金<text class="item-text-money">{{item.retmoney}}元</text></view>
+						<image class="item-iconA" v-if="item.is_pay == 1" :src="$getImageUrl('static/images/applet/other/paid.png')"></image>
 					</view>
 					<view class="card-top-item long">
 						<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardB.png')"></image>
@@ -172,11 +173,12 @@
 				flex-wrap: wrap;
 
 				.long {
-					width: 57%;
+					width: 50%;
 				}
 
 				.short {
-					width: 40%;
+					width: 45%;
+					
 				}
 
 				.card-top-item {
@@ -185,13 +187,18 @@
 					align-items: center;
 
 					.item-icon {
-						margin-right: 15rpx;
 						width: 35rpx;
 						height: 35rpx;
 					}
+					
+					.item-iconA {
+						width: 40rpx;
+						height: 40rpx;
+					}
 
 					.item-text {
-						flex: 1;
+						margin: 0 15rpx;
+						// flex: 1;
 						overflow: hidden;
 						text-overflow: ellipsis;
 						-webkit-line-clamp: 1;
@@ -203,7 +210,7 @@
 
 						.item-text-money {
 							margin-left: 10rpx;
-							font-size: 40rpx;
+							font-size: 30rpx;
 							font-weight: 600;
 							color: #FF0000;
 						}

pages/my/getmoney.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="padding bg-blue">
+		<view class="padding bg-themeRed">
 			<view class="text-center padding-top">
 				<view class="text-sl padding-bottom-xs">{{user_balance}}</view>
 				<view>

pages/my/my.vue

@@ -456,6 +456,7 @@
 					_this.agentall = data.agentall;
 					_this.brokerall = data.brokerall;
 					_this.resident = data.resident;
+					console.log("经纪人",_this.brokerall)
 					uni.setStorageSync('residentinfo', data.resident);
 					uni.setStorageSync('brokerinfo', data.brokerall ? data.brokerall[0] : null);
 				}).catch((err) => {