Browse Source

feat: 页、招聘、经纪人、申请经纪人、培训专场修改

jiangzixin 1 năm trước cách đây
mục cha
commit
55549bc898

+ 1 - 1
components/wxcontact/wxcontact.vue

@@ -5,7 +5,7 @@
 			<text class="cuIcon-servicefill"></text>
 		</button> -->
 		<image class="echo-wxcontact" @tap="showConcatModel" style="width: 108rpx;height: 108rpx;"
-			src="../../static/images/index/service.png"></image>
+			:src="$getImageUrl('static/images/applet/index/service.png')"></image>
 		<view class="cu-modal" :class="{show:concatModel}" @tap="hideConcatModel">
 			<view class="cu-dialog" @tap.stop>
 				<view class="cu-card">

+ 8 - 8
pages.json

@@ -123,7 +123,7 @@
 		{
 			"path": "pages/broker/myorder",
 			"style": {
-				"navigationBarTitleText": "劳务订单",
+				"navigationBarTitleText": "订单信息",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 50
 			}
@@ -137,7 +137,7 @@
 		{
 			"path": "pages/broker/income",
 			"style": {
-				"navigationBarTitleText": "经纪人收益",
+				"navigationBarTitleText": "订单信息",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 50
 			}
@@ -145,7 +145,7 @@
 		{
 			"path": "pages/broker/brokerform",
 			"style": {
-				"navigationBarTitleText": "经纪人申请"
+				"navigationBarTitleText": "职业顾问注册申请"
 			}
 		},
 		{
@@ -213,7 +213,7 @@
 		{
 			"path": "pages/worker/wcomlog",
 			"style": {
-				"navigationBarTitleText": "招聘报名记录",
+				"navigationBarTitleText": "员工报名记录",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 50
 			}
@@ -275,7 +275,7 @@
 		}, {
 			"path": "pages/demand/snatch",
 			"style": {
-				"navigationBarTitleText": "我接的派遣",
+				"navigationBarTitleText": "我抢的订单",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 50
 			}
@@ -318,7 +318,7 @@
 		{
 			"path": "pages/demand/wdemandlist",
 			"style": {
-				"navigationBarTitleText": "派遣订单",
+				"navigationBarTitleText": "我的订单",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 50
 			}
@@ -334,7 +334,7 @@
 		{
 			"path": "pages/demand/demandform",
 			"style": {
-				"navigationBarTitleText": "发布派遣"
+				"navigationBarTitleText": "发布订单"
 			}
 		},
 
@@ -430,7 +430,7 @@
 		{
 			"path": "pages/my/myentry",
 			"style": {
-				"navigationBarTitleText": "悬赏报备记录",
+				"navigationBarTitleText": "我的报备",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 50
 			}

+ 183 - 40
pages/broker/brokerform.vue

@@ -1,24 +1,75 @@
 <template>
 	<view>
-		<form>
+		<view class="header" :style="'background-image:url('+$getImageUrl('static/images/applet/bg/broker.png')+');'">
+			<image class="header-icon" :src="$getImageUrl('static/images/applet/index/topApplyIcon.png')"></image> 
+		</view>
+		
+		<view class="broKerForm">
+			<view class="broKerForm-item">
+				<view class="item-title">姓名</view>
+				<view class="item-area">
+					<input class="item-area-input" placeholder="请输入姓名" data-val="title" @input="bindInput" placeholder-style="color: #979797;"></input>
+				</view>
+			</view>
+			<view class="broKerForm-item">
+				<view class="item-title">手机号</view>
+				<view class="item-area">
+					<input class="item-area-input" placeholder="请输入手机号" data-val="mobile" @input="bindInput" placeholder-style="color: #979797;"></input>
+				</view>
+			</view>
+			<view class="broKerForm-item">
+				<view class="item-title">代理门店</view>
+				<view class="item-area">
+					<picker mode="multiSelector" @change="MultiChange" @columnchange="MultiColumnChange" :value="multiIndex" :range="multiArray" range-key="title">
+						<view class="picker">
+							{{multiArray[0][multiIndex[0]].title}},{{multiArray[1][multiIndex[1]].title}}
+						</view>
+					</picker>
+					<u-icon name="arrow-right" color="#747474" size="15" @click="MultiColumnChange"></u-icon>
+				</view>
+			</view>
+			<view class="broKerForm-item">
+				<view class="item-title">镇/街道</view>
+				<view class="item-area">
+					<picker mode="multiSelector" @change="TownChange" @columnchange="TownColumnChange" :value="townIndex" :range="townArray">
+						<view class="picker">
+							{{townArray[0][townIndex[0]]}},{{townArray[1][townIndex[1]]}}
+						</view>
+					</picker>
+					<u-icon name="arrow-right" color="#747474" size="15"></u-icon>
+				</view>
+			</view>
+			<view class="broKerForm-item">
+				<view class="item-title">区域</view>
+				<view class="item-area">
+					<input class="item-area-input" placeholder="请输入区域" data-val="region" @input="bindInput" placeholder-style="color: #979797;"></input>
+				</view>
+			</view>
+		</view>
+		
+		<view class="bottomArea"></view>
+		<view class="bottomButton" @tap="submit">立即提交</view>
+		
+		
+		<form v-if="false">
 			<view class="cu-form-group margin-top">
-				<view class="title"><text class="text-red text-bold padding-right-xs">*</text>姓名</view>
+				<view class="title">姓名</view>
 				<input placeholder="请输入姓名" data-val="title" @input="bindInput"></input>
 			</view>
 			<view class="cu-form-group">
-				<view class="title"><text class="text-red text-bold padding-right-xs">*</text>手机号</view>
+				<view class="title">手机号</view>
 				<input placeholder="请输入手机号" data-val="mobile" @input="bindInput"></input>
 			</view>
-			<view class="cu-form-group">
-				<view class="title"><text class="text-red text-bold padding-right-xs">*</text>代理门店</view>
-				<picker mode="selector" @change="agentChange" :value="agentIndex" :range="agentArray" range-key="title">
+			<view class="cu-form-group"> 
+				<view class="title">代理门店</view> 
+				<picker mode="multiSelector" @change="MultiChange" @columnchange="MultiColumnChange" :value="multiIndex" :range="multiArray" range-key="title">
 					<view class="picker">
-						{{agentArray[agentIndex].title}}
+						{{multiArray[0][multiIndex[0]].title}},{{multiArray[1][multiIndex[1]].title}}
 					</view>
 				</picker>
 			</view>
 			<view class="cu-form-group">
-				<view class="title"><text class="text-red text-bold padding-right-xs">*</text>镇街</view>
+				<view class="title">镇街</view>
 				<picker mode="multiSelector" @change="TownChange" @columnchange="TownColumnChange" :value="townIndex" :range="townArray">
 					<view class="picker">
 						{{townArray[0][townIndex[0]]}},{{townArray[1][townIndex[1]]}}
@@ -26,20 +77,13 @@
 				</picker>
 			</view>
 			<view class="cu-form-group">
-				<view class="title"><text class="text-red text-bold padding-right-xs">*</text>区域</view>
+				<view class="title">区域</view>
 				<input placeholder="请输入区域" data-val="region" @input="bindInput"></input>
 			</view>
-			<view class="cu-form-group">
-				<view class="title"> <text class="text-red text-bold padding-right-xs">*</text> 工作地点</view>
-				<view style="flex: 1; font-size: 30rpx; color: #AAAAAA; line-height: 100rpx;">
-					<input placeholder="详细地址" disabled :value="address" v-if="address"></input>
-					<button class="cu-btn bg-blue margin-tb-sm lg" style="width: 100%;" @tap="gpsmap()">地图选位置</button>
-				</view>
-			</view>
+			
 			<view class="padding flex flex-direction bg-white">
 				<button class="cu-btn bg-blue margin-tb-sm lg" @tap="submit">立即提交</button>
 			</view>
-			<view class="bg-white padding-lr padding-bottom">申请经济人后等待后台审核</view>
 		</form>
 	</view>
 </template>
@@ -50,17 +94,17 @@
 		data() {
 			return {
 				isRotate: false,
-				address: '',
 				userinfo: {},
 				forminfo: {
 					title: '',
 					mobile: '',
 					region: '',
-					latitude: 0,
-					longitude: 0,
 				},
-				agentArray: [],
-				agentIndex: 0,
+				multiArray: [
+					[],
+					[],
+				],
+				multiIndex: [0, 0],
 				townArray: [
 					[],
 					[],
@@ -74,10 +118,10 @@
 			_this.userinfo = _this.checkLogin("/pages/my/myinfo");
 			//公司
 			_this.$req.ajax({
-				path: "index/getAgent",
+				path: "index/getWorker",
 				data: {}
 			}).then((data) => {
-				_this.agentArray = data;
+				_this.multiArray = data;
 			}).catch((err) => {
 				uni.showModal({
 					title: '信息提示',
@@ -105,12 +149,43 @@
 				var dataval = e.currentTarget.dataset.val;
 				_this.forminfo[dataval] = e.detail.value;
 			},
-			agentChange(e) {
-				this.agentIndex = e.detail.value
+			MultiChange(e) {
+				this.multiIndex = e.detail.value
 			},
 			TownChange(e) {
 				this.townIndex = e.detail.value
 			},
+			MultiColumnChange(e) {
+				let multi = _this.multiIndex;
+				//公司变更
+				if (e.detail.column == 0) {
+					let workerid = _this.multiArray[0][e.detail.value].id;
+					_this.$req.ajax({
+						path: "index/getAgentByWorker",
+						data: {workerid:workerid}
+					}).then((data) => {
+						let multiArray = _this.multiArray;
+						multiArray[1] = data;
+						_this.multiArray = multiArray;
+						multi = [e.detail.value,0];
+						_this.multiIndex = multi;
+						_this.$forceUpdate();
+					}).catch((err) => {
+						uni.showModal({
+							title: '信息提示',
+							content: err,
+							showCancel: false
+						});
+					});
+				}
+				
+				//门店变更
+				if (e.detail.column == 1) {
+					multi[1] = e.detail.value;
+					_this.multiIndex = multi;
+					_this.$forceUpdate();
+				}
+			},
 			TownColumnChange(e) {
 				let townIndex = _this.townIndex;
 				//公司变更
@@ -130,16 +205,6 @@
 			RegionChange(e) {
 				this.region = e.detail.value
 			},
-			//打开地图
-			gpsmap:function(){
-				uni.chooseLocation({
-				    success: function (res) {
-						_this.address=res.address;
-						_this.forminfo.latitude=res.latitude;
-						_this.forminfo.longitude=res.longitude;			
-				    }
-				});
-			},
 			submit() {
 				if (_this.isRotate) {
 					return false;
@@ -147,7 +212,8 @@
 				_this.isRotate = true;
 				
 				let data = _this.forminfo;
-				let validate = {"title":"姓名","mobile":"手机号","region":"区域","latitude":"请点击地图选择位置"};
+				console.log(data,22);
+				let validate = {"title":"姓名","mobile":"手机号","region":"区域"};
 				for (var i in validate) {
 					if (data[i] == "") {
 						uni.showModal({
@@ -161,8 +227,8 @@
 				}
 				
 				data.userid = _this.userinfo.id;
-				data.workerid = _this.agentArray[_this.agentIndex].workerid;
-				data.agentid = _this.agentArray[_this.agentIndex].id;
+				data.workerid = _this.multiArray[0][_this.multiIndex[0]].id;
+				data.agentid = _this.multiArray[1][_this.multiIndex[1]].id;
 				data.town = _this.townArray[0][_this.townIndex[0]];
 				data.village = _this.townArray[1][_this.townIndex[1]];
 				
@@ -193,9 +259,86 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.cu-form-group .title {
 		min-width: calc(4em + 15px);
 	}
+	
+	page {
+		background-color: #FFFFFF
+	}
+	
+	.header {
+		width: 100%;
+		height: 266rpx;
+		padding-left: 46rpx;
+		background: linear-gradient(270deg, #484353 0%, #6F6F6F 100%);
+		opacity: 1;
+		display: flex;
+		align-items: center;
+		background-size: cover;
+		background-position: center;
+		
+		.header-icon {
+			width: 97rpx;
+			height: 97rpx;
+		}
+	}
+	
+	.broKerForm {
+		padding: 40rpx 70rpx;
+		
+		.broKerForm-item {
+			margin-bottom: 35rpx;
+			
+			.item-area {
+				margin-top: 15rpx;
+				padding: 15rpx 36rpx;
+				width: 100%;
+				// height: 66rpx;
+				background: #F7F7F7;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				font-size: 28rpx;
+				color: #979797;
+				line-height: 66rpx;
+				
+				.item-area-input {
+					width: 100%;
+					display: flex;
+					align-items: center;
+				}
+				
+				.picker {
+					// width: 97%;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					-webkit-line-clamp: 1;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+				}
+			}
+		}
+	}
+	
+	.bottomArea {
+		height: 120rpx;
+	}
+	
+	.bottomButton {
+		position: fixed;
+		bottom: 30rpx;
+		z-index: 100;
+		margin: 0 28rpx;
+		width: 696rpx;
+		height: 90rpx;
+		line-height: 90rpx;
+		background: #CA151C;
+		font-size: 33rpx;
+		text-align: center;
+		color: #FFFFFF;
+		border-radius: 10rpx;
+	}
 </style>
 

+ 160 - 42
pages/broker/brokerlist.vue

@@ -11,16 +11,18 @@
 			</view>
 		</view>
 
-		<view class="menu">
+		<view class="menu" v-if="false">
 			<view class="menu-top">
 				<view class="menu-top-item">优秀经纪人
 					<view class="item-icon">
 						<u-icon name="arrow-down" color="#000000" size="25rpx"></u-icon>
 					</view>
 				</view>
-				<view class="menu-top-item" :style="filterbox!==null? 'color:#CA151C' : ''" data-filterbox="area" @tap="showFilter">{{arealist.title}}
+				<view class="menu-top-item" :style="filterbox!==null? 'color:#CA151C' : ''" data-filterbox="area"
+					@tap="showFilter">{{arealist.title}}
 					<view class="item-icon" :style="{transform:filterbox!==null?transform:'', transition:transition}">
-						<u-icon name="arrow-down" :color="filterbox!==null? '#CA151C' : '#000000'" size="25rpx"></u-icon>
+						<u-icon name="arrow-down" :color="filterbox!==null? '#CA151C' : '#000000'"
+							size="25rpx"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -61,33 +63,53 @@
 			</view>
 		</view>
 
-		<view class="brokerList">
-			<view class="brokerCard" v-for="(item,index) in plist" :key="index">
-				<view class="brokerCard-avatar">
-					<image class="brokerCard-avatar-image" :src="item.muser.avatar ? item.muser.avatar : $getImageUrl('static/images/applet/dfhead.jpg')"></image>
-				</view>
-				<view class="brokerCard-infor">
-					<view class="infor-header">
-						<view :data-index="index" @tap="showModal">{{item.title}}</view>
-						<image :data-telephone="item.mobile" @tap="makeTelephone" class="infor-header-icon" src="../../static/images/broker/contact.png"></image>
-					</view>
-					<view class="infor-item" :data-index="index" @tap="showModal">
-						<image class="infor-item-icon" src="../../static/images/broker/broker.png" mode="widthFix"></image>
-						<view class="infor-item-text">优秀经纪人</view>
-					</view>
-					<view class="infor-item" :data-index="index" @tap="showModal">
-						<image class="infor-item-icon" src="../../static/images/index/cardD.png" mode="widthFix"></image>
-						<view class="infor-item-text">服务区域:{{item.province}} - {{item.city}} - {{item.district}}</view>
+		<view class="mainArea">
+			<view class="areaList">
+				<view class="areaCard" :class="areaItem == '' ? 'areaCardSel' : ''" @click="selArea('全部')">全部</view>
+				<view class="areaCard" v-for="(item,index) in mainArea" :key="index" :class="areaItem == item ? 'areaCardSel' : ''" @click="selArea(item)">{{item}}</view>
+			</view>
+
+			<view class="brokerList">
+				<view class="brokerCard" v-for="(item,index) in plist" :key="index">
+					<view class="brokerCard-avatar">
+						<image class="brokerCard-avatar-image"
+							:src="item.muser.avatar ? item.muser.avatar : $getImageUrl('static/images/applet/dfhead.jpg')">
+						</image>
+						<view class="avatar-bg"
+							:style="'background-image:url('+$getImageUrl('static/images/applet/bg/brokerIdentity.png')+');'">
+							<view class="avatar-bg-title">金牌经纪人 {{item.title}}</view>
+							<!-- <view class="avatar-bg-name"></view> -->
+						</view>
 					</view>
-					<view class="infor-item" :data-index="index" @tap="showModal">
-						<image class="infor-item-icon" src="../../static/images/broker/broker.png" mode="widthFix"></image>
-						<view class="infor-item-text">镇/村:{{item.town}} - {{item.village}}</view>
+					<view class="brokerCard-infor">
+						<view class="infor-header">
+							<view :data-index="index" @tap="showModal">{{item.title}}</view>
+							<image :data-telephone="item.mobile" @tap="makeTelephone" class="infor-header-icon"
+								:src="$getImageUrl('static/images/applet/broker/contact.png')" mode="widthFix"></image>
+						</view>
+						<view class="infor-item" :data-index="index" @tap="showModal">
+							<image class="infor-item-icon" :src="$getImageUrl('static/images/applet/broker/broker.png')"
+								mode="widthFix"></image>
+							<view class="infor-item-text">优秀经纪人</view>
+						</view>
+						<view class="infor-item" :data-index="index" @tap="showModal">
+							<image class="infor-item-icon" :src="$getImageUrl('static/images/applet/broker/broker.png')"
+								mode="widthFix"></image>
+							<view class="infor-item-text">镇/村:{{item.town}} - {{item.village}}</view>
+						</view>
+						<view class="infor-item" :data-index="index" @tap="showModal">
+							<image class="infor-item-icon" :src="$getImageUrl('static/images/applet/index/cardD.png')"
+								mode="widthFix"></image>
+							<view class="infor-item-text">服务区域:{{item.region}}</view>
+						</view>
 					</view>
 				</view>
+				
+				<uni-load-more :status="pstatus"></uni-load-more>
 			</view>
 		</view>
 
-		<!-- <view class="filterbg">
+		<view class="filterbg" v-if="false">
 			<view class="flex justify-between solids-bottom padding bg-white">
 				<view class="text-bold">推荐</view>
 				<view class="flex justify-end">
@@ -96,7 +118,7 @@
 			</view>
 
 
-		</view> -->
+		</view>
 
 		<view class="bg-white cu-list menu-avatar" v-if="false">
 			<block v-for="(item,index) in plist" :key="index">
@@ -135,7 +157,7 @@
 				</view>
 			</block>
 		</view>
-		<uni-load-more :status="pstatus"></uni-load-more>
+		<!-- <uni-load-more :status="pstatus"></uni-load-more> -->
 
 
 		<view class="cu-modal bottom-modal" :class="modal.name=='detailsbox'?'show':''">
@@ -252,12 +274,15 @@
 				},
 				transform: "rotate(180deg)",
 				transition: "all .3s",
+				mainArea: [],
+				areaItem: "",
 			};
 		},
 		onLoad: function() {
 			_this = this;
 			_this.arealist.data = require('@/common/area.json');
 			_this.getMore();
+			_this.getArea();
 		},
 		onPullDownRefresh: function() {
 			_this.pageRefresh();
@@ -275,6 +300,30 @@
 			}
 		},
 		methods: {
+			selArea(item) {
+				if(item == '全部') {
+					_this.areaItem = ''
+				} else {
+					_this.areaItem = item;
+				}
+				_this.pageRefresh();
+			},
+			
+			getArea() {
+				_this.$req.ajax({
+					path: "index/getStreet"
+				}).then((data) => {
+					_this.mainArea = data;
+					console.log("列表", data, _this.mainArea)
+				}).catch((err) => {
+					uni.showModal({
+						title: '信息提示',
+						content: err,
+						showCancel: false
+					});
+				});
+			},
+
 			showFilter: function(e) {
 				var nowfilterbox = e.currentTarget.dataset.filterbox;
 				if (_this.filterbox == nowfilterbox) {
@@ -332,19 +381,20 @@
 
 			getMore: function() {
 				_this.$req.ajax({
-					path: "broker/getlistbroker",
+					path: "broker/getListBroker",
 					data: {
 						ppage: _this.ppage,
 						psize: _this.psize,
 						searchval: _this.searchval,
-						district: _this.arealist.value
+						// district: _this.arealist.value
+						town: _this.areaItem
 					}
 				}).then((data) => {
 					_this.pstatus = data.pstatus;
 					_this.plist = _this.plist.concat(data.plist);
 					_this.ppage += 1;
 					uni.stopPullDownRefresh();
-					console.log("列表",_this.plist)
+					console.log("列表", _this.plist)
 				}).catch((err) => {
 					uni.showModal({
 						title: '信息提示',
@@ -444,7 +494,43 @@
 		}
 	}
 
+	.mainArea {
+		padding-left: 15rpx;
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.areaList {
+		flex: 1;
+		padding: 30rpx 20rpx 0;
+		background-color: #FFFFFF;
+
+		.areaCard {
+			margin-bottom: 20rpx;
+			height: 50rpx;
+			line-height: 50rpx;
+			font-size: 25rpx;
+			font-weight: 600;
+			text-align: center;
+			border-radius: 25rpx;
+		}
+		
+		.areaCardSel {
+			margin-bottom: 20rpx;
+			height: 50rpx;
+			line-height: 50rpx;
+			font-size: 25rpx;
+			font-weight: 600;
+			text-align: center;
+			border-radius: 25rpx;
+			background-color: #383838;
+			color: #FFFFFF;
+		}
+	}
+
 	.brokerList {
+		flex: 3;
 		padding: 28rpx 26rpx 0;
 
 		.brokerCard {
@@ -455,25 +541,58 @@
 			border-radius: 12rpx;
 
 			.brokerCard-avatar {
-				width: 230rpx;
-				height: 230rpx;
-				
+				width: 170rpx;
+				height: 170rpx;
+				position: relative;
+				display: flex;
+				justify-content: center;
+
 				.brokerCard-avatar-image {
-					width: 230rpx;
-					height: 230rpx;
+					width: 170rpx;
+					height: 170rpx;
+				}
+
+				.avatar-bg {
+					width: 160rpx;
+					height: 40rpx;
+					position: absolute;
+					bottom: 10rpx;
+					background-size: cover;
+					background-position: 0 1rpx;
+					font-size: 13rpx;
+					color: #F9E2AC;
+					display: flex;
+					align-items: center;
+
+
+					.avatar-bg-title {
+						margin-left: 40rpx;
+						line-height: 40rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						-webkit-line-clamp: 1;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+					}
+
+					// .avatar-bg-name {
+					// 	margin-left: 5rpx;
+					// 	line-height: 30rpx;
+
+					// }
 				}
 			}
 
 			.brokerCard-infor {
 				flex: 1;
 				margin-left: 28rpx;
-				height: 230rpx;
+				height: 170rpx;
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
 
 				.infor-header {
-					font-size: 40rpx;
+					font-size: 28rpx;
 					font-weight: 600;
 					color: #383838;
 					display: flex;
@@ -481,23 +600,22 @@
 					justify-content: space-between;
 
 					.infor-header-icon {
-						width: 144rpx;
-						height: 36rpx;
+						width: 100rpx;
 					}
 				}
 
 				.infor-item {
-					font-size: 28rpx;
+					font-size: 22rpx;
 					font-weight: 400;
 					color: #747474;
 					display: flex;
 					align-items: center;
-					
+
 					.infor-item-icon {
 						margin-right: 20rpx;
-						width: 27rpx;
+						width: 22rpx;
 					}
-					
+
 					.infor-item-text {
 						flex: 1;
 						overflow: hidden;

+ 6 - 7
pages/broker/center.vue

@@ -21,32 +21,31 @@
 		</view>
 		<view class="cu-bar bg-white solid-bottom margin-top">
 			<view class="action">
-				<text class="cuIcon-title text-orange "></text> 我发展的用户
+				<text class="cuIcon-title text-orange "></text> 我的下线
 			</view>
 		</view>
 		<view class="lw-table">
 			<view class="lw-table-item padding" @click="goNavPage('/pages/broker/myuser')">
 				<view class="lw-table-value text-bold text-black">{{statistics.user}}</view>
-				<view class="lw-table-title text-gray padding-top-xs">求职用户</view>
+				<view class="lw-table-title text-gray padding-top-xs">我的用户</view>
 			</view>
 			<view class="lw-table-item padding" @click="goNavPage('/pages/broker/myworker')">
 				<view class="lw-table-value text-bold text-black">{{statistics.worker}}</view>
-				<view class="lw-table-title text-gray padding-top-xs">雇主用户</view>
+				<view class="lw-table-title text-gray padding-top-xs">我的雇主</view>
 			</view>
 		</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/myicon02.png')"></image>
-				<text>我的邀请码</text>
+				<text>邀请码</text>
 			</view>
 			<view class="cu-item text-center" @click="goNavPage('/pages/broker/myorder')">
 				<image class="myicon" :src="$getImageUrl('static/images/applet/myicon04.png')"></image>
-				<text>劳务订单</text>
-				<text>(针对劳务机构)</text>
+				<text>订单信息</text>
 			</view>
 			<view class="cu-item text-center" @click="goNavPage('/pages/my/myentry')">
 				<image class="myicon" :src="$getImageUrl('static/images/applet/shebao.png')"></image>
-				<text>悬赏报备记录</text>
+				<text>报备记录</text>
 			</view>
 		</view>
 	</view>

+ 92 - 12
pages/comjobs/comjobs.vue

@@ -14,7 +14,8 @@
 			<view class="flex justify-between solids-bottom padding bg-white">
 				<view class="text-bold"><view class="cu-tag radius bg-red" @tap="resetFilter">重置</view></view>
 				<view class="flex justify-end">
-					<view class="cu-tag radius bg-green" data-filterbox="rectype" @tap="showFilter">{{rectypelist.title}}</view>
+					<view class="cu-tag radius bg-green" data-filterbox="rectype" @click="checkRectype('悬赏招聘',1)">悬赏招聘</view>
+					<!-- <view class="cu-tag radius bg-green" data-filterbox="rectype" @tap="showFilter">{{rectypelist.title}}</view> -->
 					<view class="cu-tag radius bg-green" data-filterbox="wtype" @tap="showFilter">{{wtypelist.title}}</view>
 					<view class="cu-tag radius bg-green" data-filterbox="cate" @tap="showFilter">{{catelist.title}}</view>
 					<view class="cu-tag radius bg-green" data-filterbox="area" @tap="showFilter">{{arealist.title}}</view>
@@ -69,7 +70,28 @@
 			</view>
 		</view>
 		
-		<block v-for="(item,index) in plist" :key="index">
+		<view class="comjobsList">
+			<view class="listCard" v-for="(item,index) in plist" :key="index" @tap="goDetail(item.id)">
+				<view class="listCard-item">
+					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardA.png')" mode="widthFix"></image>
+					<view class="item-content bold">{{item.title}}</view>
+				</view>
+				<view class="listCard-item short">
+					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardA.png')" mode="widthFix"></image>
+					<view class="item-content red">{{item.zwagall}}</view>
+				</view>
+				<view class="listCard-item bottom">
+					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardA.png')" mode="widthFix"></image>
+					<view class="item-content">地点:{{item.address}}</view>
+				</view>
+				<view class="listCard-item short bottom">
+					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardA.png')" mode="widthFix"></image>
+					<view class="item-content">浏览量:{{item.volume}}</view>
+				</view>
+			</view>
+		</view>
+		
+		<block v-for="(item,index) in plist" :key="index" v-if="false">
 			<view class="cu-card dynamic no-card solid-bottom echo-comjobs-item padding-top-sm padding-lr-sm radius">
 				<view class="cu-item shadow padding-top-sm padding-bottom" @tap="goDetail(item.id)">
 					<view class="padding-lr flex justify-between align-center">
@@ -198,16 +220,17 @@
 		onLoad: function(option){
 			_this = this;
 			_this.searchval = option.searchval || "";
-			_this.rectypelist.value = option.rectypelistID || 0;
-			if(_this.rectypelist.value != 0) {
-				_this.rectypelist.title = "悬赏聘";
-			} else {
-				_this.rectypelist.title = "悬赏/普通";
-			}
-			console.log("参数",_this.rectypelist.value)
+			// _this.rectypelist.value = option.rectypelistID || 0;
+			// if(_this.rectypelist.value != 0) {
+			// 	_this.rectypelist.title = "悬赏聘";
+			// } else {
+			// 	_this.rectypelist.title = "悬赏/普通";
+			// }
+			// console.log("参数",_this.rectypelist.value)
 			_this.$req.ajax({
 				path: "comjobs/pagecomjobs",
 			}).then((data) => {
+				console.log("分类",data)
 				_this.catelist.data = data.catelist;
 				_this.wtypelist.data = data.wtypelist;
 				_this.rectypelist.data = data.rectypelist;
@@ -323,7 +346,7 @@
 			resetFilter: function() {
 				_this.searchval = "";
 				_this.rectypelist.title = '悬赏/普通';
-				_this.rectypelist.value = 0;
+				_this.rectypelist.value = 1;
 				_this.wtypelist.title = '类型';
 				_this.wtypelist.value = 0;
 				_this.catelist.title = '岗位';
@@ -350,11 +373,12 @@
 						searchval: _this.searchval,
 						cateid: _this.catelist.value,
 						wtype: _this.wtypelist.value,
-						rectype: _this.rectypelist.value,
+						rectype: 1,
 						district: _this.arealist.value,
 						community: _this.arealist.community
 					}
 				}).then((data) => {
+					console.log("查看数据",data)
 					_this.pstatus = data.pstatus;
 					_this.plist = _this.plist.concat(data.plist);
 					_this.ppage += 1;
@@ -393,5 +417,61 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.comjobsList {
+		padding: 28rpx 26rpx 0;
+		
+		.listCard {
+			margin-bottom: 40rpx;
+			padding: 28rpx 24rpx;
+			background: #FFFFFF;
+			border-radius: 12rpx;
+			display: flex;
+			flex-wrap: wrap;
+			
+			.listCard-item {
+				width: 60%;
+				display: flex;
+				align-items: center;
+				
+				.item-icon {
+					width: 35rpx;
+				}
+				
+				.item-content {
+					flex: 1;
+					margin-left: 15rpx;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #747474;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					-webkit-line-clamp: 1;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+				}
+				
+				.bold {
+					font-size: 28rpx;
+					font-weight: 600;
+					color: #383838;
+				} 
+				
+				.red {
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #CA151C;
+				}
+			}
+			
+			.short {
+				width: 35%;
+				margin-left: 15rpx;
+			}
+			
+			.bottom {
+				margin-top: 28rpx;
+			}
+		}
+	}
 </style>

+ 87 - 60
pages/index/index.vue

@@ -1,13 +1,14 @@
 <template>
 	<view>
 		<view class="topArea">
-			<image class="topArea-Bg" src="../../static/images/index/topBg.png"></image>
+			<image class="topArea-Bg" :src="$getImageUrl('static/images/applet/index/topBg.png')"></image>
 			<view class="topArea-top" :style="{height:navBarTop + 'px',width:navBarWidth + 'px'}"></view>
 			<view class="topArea-nav"
 				:style="{width:navBarWidth + 'px',height:navBarHeight + 'px',lineHeight:navBarHeight + 'px'}">
 				<view class="nav-title">晋江零工服务平台</view>
 				<view class="nav-search" :style="{width:navSearchWidth + 'px', height:navBarHeight+'px'}"><u-search
-						inputAlign="center" :height="navBarHeight-5" placeholder="搜索" :showAction="false" @search="goSearch"></u-search>
+						inputAlign="center" :height="navBarHeight-5" placeholder="搜索" :showAction="false"
+						@search="goSearch"></u-search>
 				</view>
 			</view>
 			<view class="topArea-main">
@@ -16,7 +17,8 @@
 					<view>企业用人新趋势</view>
 				</view>
 				<view class="main-banner">
-					<image class="main-banner-image" src="../../static/images/index/topBanner.png" mode="aspectFit">
+					<image class="main-banner-image" :src="$getImageUrl('static/images/applet/index/topBanner.png')"
+						mode="aspectFit">
 					</image>
 				</view>
 			</view>
@@ -25,29 +27,29 @@
 		<view class="summary">
 
 			<view class="topMenu">
-				<view class="topMenu-item" @tap="goNavPage('/pages/comjobs/comjobs?rectypelistID=2')">
-					<image class="item-icon" src="../../static/images/index/topMenuA.png"></image>
+				<view class="topMenu-item" @tap="develop()">
+					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/topMenuA.png')"></image>
 					<view class="item-title">晋快招</view>
 				</view>
 				<view class="topMenu-item" @tap="develop()">
-					<image class="item-icon" src="../../static/images/index/topMenuB.png"></image>
+					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/topMenuB.png')"></image>
 					<view class="item-title">晋帮家</view>
 				</view>
 				<view class="topMenu-item" @tap="develop()">
-					<image class="item-icon" src="../../static/images/index/topMenuC.png"></image>
+					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/topMenuC.png')"></image>
 					<view class="item-title">晋全能</view>
 				</view>
 				<view class="topMenu-item" @tap="develop()">
-					<image class="item-icon" src="../../static/images/index/topMenuD.png"></image>
+					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/topMenuD.png')"></image>
 					<view class="item-title">晋企帮</view>
 				</view>
 			</view>
-			
+
 			<!-- <view class="topMenu-fill"></view> -->
 
 			<view class="topApply">
 				<view class="topApply-left">
-					<image class="left-icon" src="../../static/images/index/topApplyIcon.png"></image>
+					<image class="left-icon" :src="$getImageUrl('static/images/applet/index/topApplyIcon.png')"></image>
 				</view>
 				<view class="topApply-center">经纪人福利多多</view>
 				<view class="topApply-right" @tap="pageUrl(1,'/pages/broker/brokerform')">立即申请</view>
@@ -55,7 +57,8 @@
 
 			<view class="hot">
 				<view class="hot-left" @tap="develop()">
-					<image class="hot-left-image" src="../../static/images/index/hotLeft.png" mode="aspectFit"></image>
+					<image class="hot-left-image" :src="$getImageUrl('static/images/applet/index/hotLeft.png')"
+						mode="aspectFit"></image>
 				</view>
 				<view class="hot-right">
 					<view class="hot-right-item" @click="goLPage('/pages/train/joinlist')">
@@ -64,50 +67,70 @@
 								<view class="title-first">培训专场</view>
 								<view class="title-second">职场提升小技巧</view>
 							</view>
-							<image class="item-top-hotRightOne" src="../../static/images/index/hotRighrOne.png"></image>
+							<image class="item-top-hotRightOne"
+								:src="$getImageUrl('static/images/applet/index/hotRighrOne.png')"></image>
 						</view>
 						<view class="item-bottom">我要报名</view>
 					</view>
 					<view class="hot-right-item" @tap="develop()">
-						<image class="item-hotRightTwo" src="../../static/images/index/hotRightTwo.png"></image>
+						<image class="item-hotRightTwo"
+							:src="$getImageUrl('static/images/applet/index/hotRightTwo.png')"></image>
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="tabs">
 				<view :class="selectID == 0 ? 'tabs-item-select' : 'tabs-item'" @click="selectTab(0)">
-					<image v-if="selectID != 0" class="item-icon" src="../../static/images/index/tabOneA.png"></image>
-					<image v-if="selectID == 0"  class="item-icon" src="../../static/images/index/tabOneB.png"></image>
+					<image v-if="selectID != 0" class="item-icon"
+						:src="$getImageUrl('static/images/applet/index/tabOneA.png')"></image>
+					<image v-if="selectID == 0" class="item-icon"
+						:src="$getImageUrl('static/images/applet/index/tabOneB.png')"></image>
 					<text class="item-title">悬赏聘</text>
 				</view>
 				<view :class="selectID == 1 ? 'tabs-item-select' : 'tabs-item'" @click="selectTab(1)">
-					<image v-if="selectID != 1" class="item-icon" src="../../static/images/index/tabTwoA.png"></image>
-					<image v-if="selectID == 1" class="item-icon" src="../../static/images/index/tabTwoB.png"></image>
+					<image v-if="selectID != 1" class="item-icon"
+						:src="$getImageUrl('static/images/applet/index/tabTwoA.png')"></image>
+					<image v-if="selectID == 1" class="item-icon"
+						:src="$getImageUrl('static/images/applet/index/tabTwoB.png')"></image>
 					<text class="item-title">超值秒杀</text>
 				</view>
 				<view :class="selectID == 2 ? 'tabs-item-select' : 'tabs-item'" @click="selectTab(2)">
-					<image v-if="selectID != 2" class="item-icon" src="../../static/images/index/tabThreeA.png"></image>
-					<image v-if="selectID == 2" class="item-icon" src="../../static/images/index/tabThreeB.png"></image>
+					<image v-if="selectID != 2" class="item-icon"
+						:src="$getImageUrl('static/images/applet/index/tabThreeA.png')"></image>
+					<image v-if="selectID == 2" class="item-icon"
+						:src="$getImageUrl('static/images/applet/index/tabThreeB.png')"></image>
 					<text class="item-title">推荐服务</text>
 				</view>
-				<view :class="selectID == 3 ? 'tabs-item-select' : 'tabs-item'" @click="selectTab(3)">
-					<image v-if="selectID != 3" class="item-icon" src="../../static/images/index/tabFourA.png"></image>
-					<image v-if="selectID == 3" class="item-icon" src="../../static/images/index/tabFourB.png"></image>
+				<!-- <view :class="selectID == 3 ? 'tabs-item-select' : 'tabs-item'" @click="selectTab(3)">
+					<image v-if="selectID != 3" class="item-icon" :src="$getImageUrl('static/images/applet/index/tabFourA.png')"></image>
+					<image v-if="selectID == 3" class="item-icon" :src="$getImageUrl('static/images/applet/index/tabFourB.png')"></image>
 					<text class="item-title">手工单</text>
-				</view>
+				</view> -->
 			</view>
 		</view>
-		
-		<view class="listContent">
-			<view class="listContent-card"  v-for="(item,index) in plist" :key="index">
+
+		<view class="listContent" v-if="selectID == 0">
+			<view class="listContent-card" v-for="(item,index) in plist" :key="index" @tap="goDetail(item.id)">
 				<view class="card-infor">
 					<view class="card-infor-left">
-						<view class="left-job card-center"><image class="card-icon" src="../../static/images/index/cardA.png"></image><text class="job-title">岗位:{{item.title}}</text></view>
-						<view class="left-time card-center"><image class="card-icon" src="../../static/images/index/cardB.png"></image><text>工作时间:8:00-18:00</text></view>
+						<view class="left-job card-center">
+							<image class="card-icon" :src="$getImageUrl('static/images/applet/index/cardA.png')">
+							</image><text class="job-title">岗位:{{item.title}}</text>
+						</view>
+						<view class="left-time card-center">
+							<image class="card-icon" :src="$getImageUrl('static/images/applet/index/cardB.png')">
+							</image><text>工作时间:8:00-18:00</text>
+						</view>
 					</view>
 					<view class="card-infor-right">
-						<view class="right-money card-center"><image class="card-icon" src="../../static/images/index/cardC.png"></image><text>赏金</text><text class="right-money-num">300元</text></view>
-						<view class="right-place card-center"><image class="card-icon" src="../../static/images/index/cardD.png"></image><text>地点:{{item.district}}</text></view>
+						<view class="right-money card-center">
+							<image class="card-icon" :src="$getImageUrl('static/images/applet/index/cardC.png')">
+							</image><text>赏金</text><text class="right-money-num">300元</text>
+						</view>
+						<view class="right-place card-center">
+							<image class="card-icon" :src="$getImageUrl('static/images/applet/index/cardD.png')">
+							</image><text>地点:{{item.district}}</text>
+						</view>
 					</view>
 				</view>
 				<view class="card-botInfor">
@@ -115,8 +138,11 @@
 					<view class="card-botInfor-more">...</view>
 				</view>
 			</view>
-			
-				<uni-load-more :status="pstatus"></uni-load-more>
+			<uni-load-more :status="pstatus"></uni-load-more>
+		</view>
+		
+		<view class="developing" style="text-align: center;padding: 30rpx 0;color:#797979" v-if="selectID != 0">
+			正在开发中,敬请期待
 		</view>
 
 		<view class="padding-sm"></view>
@@ -187,7 +213,7 @@
 				pstatusn: 'more',
 				ppage: 1,
 				ppagen: 1,
-				psize: 20,
+				psize: 6,
 				psizen: 20,
 				plist: [],
 				plistn: [],
@@ -306,10 +332,10 @@
 			selectTab(id) {
 				_this.selectID = id;
 			},
-			
+
 			goSearch(e) {
 				_this.searchval = e;
-				console.log("搜索",e,_this.searchval)
+				console.log("搜索", e, _this.searchval)
 				if (_this.searchval == "") {
 					uni.showModal({
 						title: '信息提示',
@@ -322,7 +348,7 @@
 					url: '/pages/comjobs/comjobs?searchval=' + _this.searchval
 				});
 			},
-			
+
 			goLPage: function(pageurl) {
 				_this.userinfo = _this.checkLogin("/pages/index/index");
 				if (_this.userinfo === false) {
@@ -337,7 +363,7 @@
 					}
 				});
 			},
-			
+
 			showConcatModel: function() {
 				this.$refs.wxContact.showConcatModel();
 			},
@@ -389,16 +415,17 @@
 				// 热门职位
 				if (_this.status == 0) {
 					_this.$req.ajax({
-						path: "index/listcomjobs",
+						path: "comjobs/listcomjobs",
 						data: {
 							ppage: _this.ppage,
-							psize: _this.psize
+							psize: _this.psize,
+							rectype: 2
 						}
 					}).then((data) => {
 						_this.pstatus = data.pstatus;
 						_this.plist = _this.plist.concat(data.plist);
 						_this.ppage += 1;
-						console.log("列表数据",_this.plist)
+						console.log("列表数据", _this.plist)
 						uni.stopPullDownRefresh();
 					}).catch((err) => {
 						uni.showModal({
@@ -710,7 +737,7 @@
 			}
 		}
 	}
-	
+
 	.summary {
 		width: 100%;
 		margin-top: 60rpx;
@@ -870,13 +897,13 @@
 			}
 		}
 	}
-	
+
 	.tabs {
 		padding-top: 20rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		
+
 		.tabs-item-select {
 			flex: 1;
 			height: 76rpx;
@@ -887,7 +914,7 @@
 			color: #CA151C;
 			border-bottom: 4rpx solid #CA151C;
 		}
-		
+
 		.tabs-item {
 			flex: 1;
 			height: 76rpx;
@@ -898,28 +925,28 @@
 			color: #717171;
 			border-bottom: 4rpx solid transparent;
 		}
-		
+
 		.item-icon {
 			width: 27rpx;
 			height: 27rpx;
 		}
-		
+
 		.item-title {
 			margin-left: 15rpx;
 		}
 	}
-	
+
 	.listContent {
 		width: 100%;
 		padding: 20rpx 26rpx;
-		
+
 		.listContent-card {
 			margin-bottom: 24rpx;
 			width: 100%;
 			height: 268rpx;
 			background-color: #FFFFFF;
 			border-radius: 12rpx;
-			
+
 			.card-infor {
 				height: 182rpx;
 				padding: 0 20rpx;
@@ -929,27 +956,27 @@
 				justify-content: space-between;
 				font-size: 28rpx;
 				color: #747474;
-				
+
 				.card-icon {
 					margin-right: 10rpx;
 					width: 35rpx;
 					height: 35rpx;
 				}
-				
+
 				.card-center {
 					height: 56rpx;
 					display: flex;
 					align-items: center;
 				}
-				
+
 				.card-infor-left {
 					width: 60%;
-					
+
 					.left-job {
 						margin-bottom: 30rpx;
 						color: #383838;
 						font-weight: 600;
-						
+
 						.job-title {
 							width: 340rpx;
 							overflow: hidden;
@@ -960,14 +987,14 @@
 						}
 					}
 				}
-				
-				
+
+
 				.card-infor-right {
 					width: 40%;
-					
+
 					.right-money {
 						margin-bottom: 30rpx;
-						
+
 						.right-money-num {
 							margin-left: 10rpx;
 							font-size: 40rpx;
@@ -977,7 +1004,7 @@
 					}
 				}
 			}
-			
+
 			.card-botInfor {
 				height: 86rpx;
 				padding: 0 20rpx;

+ 26 - 28
pages/my/my.vue

@@ -2,7 +2,7 @@
 	<view class="mypage">
 		<u-sticky>
 			<view class="topArea">
-				<image class="topArea-Bg" src="../../static/images/my/myTopBg.png"></image>
+				<image class="topArea-Bg" :src="$getImageUrl('static/images/applet/my/myTopBg.png')"></image>
 				<view class="topArea-top" :style="{height:navBarTop + 'px'}"></view>
 				<view class="topArea-nav" :style="{height:navBarHeight + 'px',lineHeight:navBarHeight + 'px'}">
 					<view class="nav-title">个人中心</view>
@@ -19,7 +19,7 @@
 								<text class="infor-top-name">{{userinfo.nickname}}</text>
 								<view class="infor-top-verify" v-if="userinfo.authstatus != 1">
 									<view class="verify-icon">
-										<image class="verify-icon-image" src="../../static/images/my/verify.png">
+										<image class="verify-icon-image" :src="$getImageUrl('static/images/applet/my/verify.png')">
 										</image>
 									</view>
 									<view class="verify-text">已实名</view>
@@ -35,88 +35,80 @@
 
 		<view class="topMenu">
 			<view class="topMenu-item" @click="goLPage('/pages/my/myinfo')">
-				<image class="item-icon" src="../../static/images/my/infor.png"></image>
+				<image class="item-image" :src="$getImageUrl('static/images/applet/my/infor.png')" mode="widthFix"></image>
 				<view class="item-title">基本信息</view>
 			</view>
 			<view class="topMenu-item" @click="goLPage('/pages/my/mycode')">
-				<image class="item-icon" src="../../static/images/my/code.png"></image>
+				<image class="item-image" :src="$getImageUrl('static/images/applet/my/code.png')" mode="widthFix"></image>
 				<view class="item-title">我的推广码</view>
 			</view>
 			<view class="topMenu-item" @click="goLPage('/pages/my/myteam')">
-				<image class="item-icon" src="../../static/images/my/invite.png"></image>
-				<view class="item-title">我邀请的人</view>
+				<image class="item-image" :src="$getImageUrl('static/images/applet/my/invite.png')" mode="widthFix"></image>
+				<view class="item-title">我邀请</view>
 			</view>
 		</view>
 
 		<view class="topApply">
 			<view class="topApply-left">
-				<image class="left-icon" src="../../static/images/index/topApplyIcon.png"></image>
+				<image class="left-icon" :src="$getImageUrl('static/images/applet/index/topApplyIcon.png')"></image>
 			</view>
 			<view class="topApply-center">经纪人福利多多</view>
 			<view class="topApply-right" @tap="goUrl(1,'/pages/broker/brokerform')">立即开通</view>
 		</view>
-		
-		<view class="topApply">
-			<view class="topApply-left">
-				<image class="left-icon" src="../../static/images/index/topApplyIcon.png"></image>
-			</view>
-			<view class="topApply-center">经纪人福利多多</view>
-			<view class="topApply-right" @tap="goLPage('/pages/broker/center')">立即开通</view>
-		</view>
 
 		<view class="topMenu">
 			<view class="topMenu-item" @click="goLPage('/pages/my/mybag')">
-				<image class="item-icon" src="../../static/images/my/wallet.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/wallet.png')"></image>
 				<view class="item-titleSmall">我的钱包</view>
 			</view>
 			<view class="topMenu-item" @click="goLPage('/pages/my/myauth')">
-				<image class="item-icon" src="../../static/images/my/verifyName.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/verifyName.png')"></image>
 				<view class="item-titleSmall">实名认证</view>
 			</view>
 			<view class="topMenu-item" @click="goLPage('/pages/comjobs/star')">
-				<image class="item-icon" src="../../static/images/my/collect.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/collect.png')"></image>
 				<view class="item-titleSmall">我的收藏</view>
 			</view>
 			<view class="topMenu-item" @click="goLPage('/pages/my/task')">
-				<image class="item-icon" src="../../static/images/my/task.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/task.png')"></image>
 				<view class="item-titleSmall">任务中心</view>
 			</view>
 		</view>
 
 		<view class="topMenu">
 			<view class="topMenu-item" @click="goPage('/pages/comjobs/log')">
-				<image class="item-icon" src="../../static/images/my/apply.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/apply.png')"></image>
 				<view class="item-titleSmall">我的报名</view>
 			</view>
 			<view class="topMenu-item" @click="goLPage('/pages/resume/log')">
-				<image class="item-icon" src="../../static/images/my/invitation.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/invitation.png')"></image>
 				<view class="item-titleSmall">收到的邀请</view>
 			</view>
 			<view class="topMenu-item" @click="goHome">
-				<image class="item-icon" src="../../static/images/my/recruit.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/recruit.png')"></image>
 				<view class="item-titleSmall">我要招聘</view>
 			</view>
 			<view class="topMenu-item" @click="goLPage('/pages/train/joinlist')">
-				<image class="item-icon" src="../../static/images/my/cultivate.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/cultivate.png')"></image>
 				<view class="item-titleSmall">培训意愿</view>
 			</view>
 		</view>
 
 		<view class="topMenu">
 			<view class="topMenu-item" @click="goLPage('/pages/notice/notice')">
-				<image class="item-icon" src="../../static/images/my/notice.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/notice.png')"></image>
 				<view class="item-titleSmall">通知公告</view>
 			</view>
 			<view class="topMenu-item" @click="goLPage('/pages/my/feedback')">
-				<image class="item-icon" src="../../static/images/my/feedback.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/feedback.png')"></image>
 				<view class="item-titleSmall">意见反馈</view>
 			</view>
 			<view class="topMenu-item" @click="goPage('/pages/my/about')">
-				<image class="item-icon" src="../../static/images/my/about.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/about.png')"></image>
 				<view class="item-titleSmall">关于我们</view>
 			</view>
 			<view class="topMenu-item" @tap="goHome">
-				<image class="item-icon" src="../../static/images/my/exchange.png"></image>
+				<image class="item-icon" :src="$getImageUrl('static/images/applet/my/exchange.png')"></image>
 				<view class="item-titleSmall">切换身份</view>
 			</view>
 		</view>
@@ -779,7 +771,7 @@
 		border-radius: 14rpx;
 		opacity: 1;
 		display: flex;
-		align-items: center;
+		align-items: flex-end;
 		justify-content: space-between;
 
 		.topMenu-item {
@@ -788,6 +780,12 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
+			
+			.item-image {
+				width: 60rpx;
+				height: 60rpx;
+				margin-bottom: 10rpx;
+			}
 
 			.item-icon {
 				width: 60rpx;

+ 111 - 10
pages/train/joinlist.vue

@@ -1,16 +1,39 @@
 <template>
 	<view>
 		<image mode="widthFix" style="width: 100%;" :src="post" v-if="post"></image>
-		<view class="padding flex flex-direction">
+
+		<view class="topArea">
+			<button class="topArea-btn" @tap="addTrain">添加培训意愿</button>
+		</view>
+
+		<view class="course">
+			<view class="courseCard" v-for="(item,index) in plist" :key="index">
+				<!-- <view class="courseLeft"></view> -->
+				<view class="courseRight">
+					<view class="courseCard-header">
+						<view class="header-title">{{item.train.title}}</view>
+						<image class="header-icon" src="../../static/images/index/applyCancel.png" mode="widthFix" @tap="delJoin(index, item.id)">
+						</image>
+					</view>
+					<view class="courseCard-item">{{item.train.contact}}</view>
+					<view class="courseCard-item">{{item.train.mobile}}</view>
+					<view class="courseCard-item">{{item.train.address}}</view>
+				</view>
+
+			</view>
+		</view>
+
+		<view class="padding flex flex-direction" v-if="false">
 			<button class="cu-btn bg-green margin-tb-sm lg" @tap="addTrain">添加培训意愿</button>
 		</view>
-		<block v-for="(item,index) in plist" :key="index">
+		<block v-for="(item,index) in plist" :key="index" v-if="false">
 			<view class="cu-card dynamic no-card solid-bottom echo-comjobs-item padding-top-sm padding-lr-sm radius">
 				<view class="cu-item shadow padding-top-sm padding-bottom">
 					<view class="padding-lr flex justify-between align-center">
 						<view class="basis-lg text-bold text-lg text-cut">{{item.train.title}}</view>
 						<view class="basis-sm text-cut text-right text-gray text-sm">
-							<view class="basis-xs text-cut text-right text-red text-sm" @tap="delJoin(index, item.id)">取消报名</view>
+							<view class="basis-xs text-cut text-right text-red text-sm" @tap="delJoin(index, item.id)">
+								取消报名</view>
 						</view>
 					</view>
 					<view class="padding-lr flex justify-between align-bottom">
@@ -48,13 +71,13 @@
 				post: "",
 			};
 		},
-		onLoad: function(){
+		onLoad: function() {
 			_this = this;
 			_this.userinfo = _this.checkLogin("/pages/train/joinlist");
-			if (_this.userinfo===false){
+			if (_this.userinfo === false) {
 				return false;
 			}
-			
+
 			_this.$req.ajax({
 				path: "index/getConfig",
 				data: {
@@ -89,7 +112,7 @@
 			_this.getMore();
 		},
 		methods: {
-			delJoin: function(index,id) {
+			delJoin: function(index, id) {
 				uni.showModal({
 					title: '温馨提示',
 					content: '确定要取消吗?',
@@ -113,7 +136,7 @@
 						}
 					}
 				});
-				
+
 			},
 			getMore: function() {
 				_this.$req.ajax({
@@ -145,5 +168,83 @@
 	}
 </script>
 
-<style>
-</style>
+<style lang="scss">
+	.topArea {
+		margin-top: 40rpx;
+		padding: 0 26rpx;
+
+		.topArea-btn {
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 10rpx;
+			background-color: #CA151C;
+			color: #FFFFFF;
+			font-size: 33rpx;
+		}
+	}
+
+	.course {
+		margin-top: 48rpx;
+		padding: 0 26rpx;
+
+		.courseCard {
+			margin-bottom: 26rpx;
+			// height: 276rpx;
+			background-color: #FFFFFF;
+			border-radius: 12rpx;
+			display: flex;
+			overflow: hidden;
+			
+			// .courseLeft {
+			// 	width: 8rpx;
+			// 	height: 100%;
+			// 	background-color: #009600;
+			// }
+
+			.courseRight {
+				flex: 1;
+				padding: 22rpx 48rpx;
+				font-size: 28rpx;
+				color: #747474;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				border-left: 5px solid #009600;
+				
+				.courseCard-header {
+					// margin-bottom: 10rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.header-title {
+						width: 70%;
+						font-size: 40rpx;
+						font-weight: 600;
+						color: #383838;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						-webkit-line-clamp: 1;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+					}
+
+					.header-icon {
+						width: 144rpx;
+					}
+				}
+
+				.courseCard-item {
+					margin-top: 25rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					-webkit-line-clamp: 1;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+				}
+			}
+
+
+		}
+	}
+</style>

BIN
static/images/index/applyCancel.png