瀏覽代碼

feat: fix same style

王亚超 1 年之前
父節點
當前提交
6bb09334b1
共有 77 個文件被更改,包括 1492 次插入336 次删除
  1. 10 0
      colorui/main.css
  2. 12 0
      pages.json
  3. 67 33
      pages/broker/brokerform.vue
  4. 91 19
      pages/broker/brokerlist.vue
  5. 188 0
      pages/comjobs/businessHelp.vue
  6. 1 1
      pages/comjobs/comjobs.vue
  7. 8 8
      pages/comjobs/detail.vue
  8. 172 0
      pages/comjobs/jobDemands.vue
  9. 144 9
      pages/comjobs/log.vue
  10. 1 1
      pages/comjobs/recruitFast.vue
  11. 6 3
      pages/index/home.vue
  12. 21 5
      pages/index/index.vue
  13. 89 2
      pages/my/feedback.vue
  14. 24 12
      pages/my/my.vue
  15. 96 37
      pages/my/myauth.vue
  16. 332 149
      pages/my/myinfo.vue
  17. 5 5
      pages/my/myteam.vue
  18. 3 3
      pages/my/task.vue
  19. 10 2
      pages/train/joinlist.vue
  20. 212 47
      pages/worker/shop.vue
  21. 二進制
      static/images/broker/broker.png
  22. 二進制
      static/images/broker/contact.png
  23. 二進制
      static/images/broker/组 317@2x.png
  24. 二進制
      static/images/comJobs/apply.png
  25. 二進制
      static/images/index/cardA.png
  26. 二進制
      static/images/index/cardB.png
  27. 二進制
      static/images/index/cardC.png
  28. 二進制
      static/images/index/cardD.png
  29. 二進制
      static/images/index/jobhunter.png
  30. 二進制
      static/images/index/recruiter.png
  31. 二進制
      static/images/index/service.png
  32. 二進制
      static/images/index/tabFourA.png
  33. 二進制
      static/images/index/tabFourB.png
  34. 二進制
      static/images/index/tabOneA.png
  35. 二進制
      static/images/index/tabOneB.png
  36. 二進制
      static/images/index/tabThreeA.png
  37. 二進制
      static/images/index/tabThreeB.png
  38. 二進制
      static/images/index/tabTwoA.png
  39. 二進制
      static/images/index/tabTwoB.png
  40. 二進制
      static/images/index/topMenuA.png
  41. 二進制
      static/images/index/topMenuB.png
  42. 二進制
      static/images/index/topMenuC.png
  43. 二進制
      static/images/index/topMenuD.png
  44. 二進制
      static/images/my/about.png
  45. 二進制
      static/images/my/apply.png
  46. 二進制
      static/images/my/code.png
  47. 二進制
      static/images/my/collect.png
  48. 二進制
      static/images/my/cultivate.png
  49. 二進制
      static/images/my/empty.png
  50. 二進制
      static/images/my/exchange.png
  51. 二進制
      static/images/my/feedback.png
  52. 二進制
      static/images/my/infor.png
  53. 二進制
      static/images/my/invitation.png
  54. 二進制
      static/images/my/invite.png
  55. 二進制
      static/images/my/myTopBg.png
  56. 二進制
      static/images/my/notice.png
  57. 二進制
      static/images/my/recruit.png
  58. 二進制
      static/images/my/task.png
  59. 二進制
      static/images/my/verify.png
  60. 二進制
      static/images/my/verifyName.png
  61. 二進制
      static/images/my/wallet.png
  62. 二進制
      static/images/tabbar/璺緞 -14@3x.png
  63. 二進制
      static/images/tabbar/璺緞 -15@3x.png
  64. 二進制
      static/images/tabbar/璺緞 -16@3x.png
  65. 二進制
      static/images/tabbar/璺緞 -17@3x.png
  66. 二進制
      static/images/tabbar/璺緞 184@3x.png
  67. 二進制
      static/images/tabbar/璺緞 188@3x.png
  68. 二進制
      static/images/tabbar/璺緞 55@3x.png
  69. 二進制
      static/images/tabbar/璺緞 57@3x.png
  70. 二進制
      static/tabbar/broker.png
  71. 二進制
      static/tabbar/brokerSelected.png
  72. 二進制
      static/tabbar/index.png
  73. 二進制
      static/tabbar/indexSelected.png
  74. 二進制
      static/tabbar/jobs.png
  75. 二進制
      static/tabbar/jobsSelected.png
  76. 二進制
      static/tabbar/my.png
  77. 二進制
      static/tabbar/mySelected.png

+ 10 - 0
colorui/main.css

@@ -3403,6 +3403,16 @@ scroll-view.cu-steps .cu-item {
 	border-color: #ffffff;
 }
 
+.bg-themeRed {
+	background-color: #e11c2b;
+	color: #ffffff;
+}
+
+.bg-themeBtn {
+	background-color: #CA151C;
+	color: #ffffff;
+}
+
 .bg-red {
 	background-color: #e54d42;
 	color: #ffffff;

+ 12 - 0
pages.json

@@ -517,6 +517,18 @@
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 50
 			}
+		},{
+			"path": "pages/comjobs/jobDemands",
+			"style": {
+				"navigationBarTitleText": "任何需求"
+			}
+		},{
+			"path": "pages/comjobs/businessHelp",
+			"style": {
+				"navigationBarTitleText": "晋企帮",
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 50
+			}
 		},
 
 		// 常见问题

+ 67 - 33
pages/broker/brokerform.vue

@@ -52,15 +52,22 @@
 			</view>
 			<view class="broKerForm-item">
 				<view class="item-title">工作地点</view>
-				<view class="item-area" style="background-color: #FFFFFF;">
-					<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 class="item-area-column" style="background-color: #FFFFFF;">
+					<view class="item-area-column-input">
+						<input class="item-area-input" placeholder="详细地址" disabled :value="address"></input>
+						<u-icon name="map-fill" color="#8e99a2" size="28" @tap="gpsmap()"></u-icon> 
+					</view>
+					<!-- <button class="cu-btn bg-blue margin-tb-sm lg" style="width: 100%;" @tap="gpsmap()">地图选位置</button> -->
 				</view>
 			</view>
 		</view>
 
-		<view class="bottomArea"></view>
-		<view class="bottomButton" @tap="submit">立即提交</view>
+		<view class="bottomEmpty"></view>
+
+		<view class="bottomArea">
+			<view class="bottomButton" @tap="submit">立即提交</view>
+		</view>
+
 
 		<form v-if="false">
 			<view class="cu-form-group margin-top">
@@ -197,6 +204,7 @@
 			gpsmap: function() {
 				uni.chooseLocation({
 					success: function(res) {
+						console.log("选择位置", res)
 						_this.address = res.address;
 						_this.forminfo.latitude = res.latitude;
 						_this.forminfo.longitude = res.longitude;
@@ -266,10 +274,6 @@
 		min-width: calc(4em + 15px);
 	}
 
-	page {
-		background-color: #FFFFFF
-	}
-
 	.header {
 		width: 100%;
 		height: 266rpx;
@@ -289,27 +293,46 @@
 
 	.broKerForm {
 		padding: 40rpx 70rpx;
+		background-color: #FFFFFF;
 
 		.broKerForm-item {
 			margin-bottom: 35rpx;
 
+			.item-area-column {
+				margin-top: 15rpx;
+				width: 100%;
+				font-size: 28rpx;
+				color: #979797;
+				display: flex;
+				flex-direction: column;
+
+				.item-area-column-input {
+					margin-bottom: 20rpx;
+					padding: 0 36rpx;
+					height: 100rpx;
+					background: #F7F7F7;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.item-area-input {
+						flex: 1;
+						height: 100rpx;
+					}
+				}
+			}
+
 			.item-area {
 				margin-top: 15rpx;
-				padding: 15rpx 36rpx;
+				padding: 0 36rpx;
 				width: 100%;
-				// height: 66rpx;
+				height: 100rpx;
 				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;
+					height: 100rpx;
 				}
 
 				picker {
@@ -319,7 +342,7 @@
 					position: relative;
 
 					.picker {
-						// line-height: 100rpx;
+						line-height: 100rpx;
 						font-size: 28rpx;
 						text-overflow: ellipsis;
 						white-space: nowrap;
@@ -337,7 +360,7 @@
 					position: absolute;
 					font-size: 34rpx;
 					color: #8799a3;
-					// line-height: 100rpx;
+					line-height: 100rpx;
 					width: 60rpx;
 					text-align: center;
 					top: 0;
@@ -350,22 +373,33 @@
 	}
 
 
-	.bottomArea {
-		height: 120rpx;
+	.bottomEmpty {
+		margin-top: 80rpx;
+		height: 130rpx;
 	}
 
-	.bottomButton {
+	.bottomArea {
 		position: fixed;
-		bottom: 30rpx;
+		bottom: 0;
 		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;
+		width: 100%;
+		height: 130rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+		box-shadow: -10rpx -12rpx 12rpx 2rpx rgba(52, 85, 73, 0.16);
+
+		.bottomButton {
+			margin: 0 28rpx;
+			width: 696rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			background: #CA151C;
+			font-size: 33rpx;
+			text-align: center;
+			color: #FFFFFF;
+			border-radius: 10rpx;
+		}
 	}
 </style>

+ 91 - 19
pages/broker/brokerlist.vue

@@ -175,43 +175,65 @@
 		</view>
 		<!-- <uni-load-more :status="pstatus"></uni-load-more> -->
 
-
 		<view class="cu-modal bottom-modal" :class="modal.name=='detailsbox'?'show':''">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white">
-					<view class="action text-green">确定</view>
+					<view class="action text-green" @tap="hideModal">确定</view>
 					<view class="action text-blue" @tap="hideModal">取消</view>
 				</view>
 				<view class="padding-tb">
 					<scroll-view scroll-y="true" style="height: 800rpx;">
 						<view class="itembox text-left">
-							<view class="itembox-til text-right">姓名:</view>
-							<view class="itembox-con text-gray">{{modal.brokerinfo.title}}</view>
+							<view class="itemboxLeft">
+								<view class="itembox-til text-right">姓名:</view>
+								<view class="itembox-con text-gray">{{modal.brokerinfo.title}}</view>
+							</view>
 						</view>
 						<view class="itembox text-left">
-							<view class="itembox-til text-right">手机号:</view>
-							<view class="itembox-con text-gray">{{modal.brokerinfo.mobile}}</view>
+							<view class="itemboxLeft">
+								<view class="itembox-til text-right">手机号:</view>
+								<view class="itembox-con text-gray">{{modal.brokerinfo.mobile}}</view>
+							</view>
+							<view class="itembox-btn" :data-telephone="modal.brokerinfo.mobile" @tap="makeTelephone">拨打
+							</view>
 						</view>
 						<view class="itembox text-left">
-							<view class="itembox-til text-right">微信号:</view>
-							<view class="itembox-con text-gray">{{modal.brokerinfo.weixin}}</view>
+							<view class="itemboxLeft">
+								<view class="itembox-til text-right">微信号:</view>
+								<view class="itembox-con text-gray">{{modal.brokerinfo.weixin}}</view>
+							</view>
 						</view>
 						<view class="itembox text-left">
-							<view class="itembox-til text-right">QQ号:</view>
-							<view class="itembox-con text-gray">{{modal.brokerinfo.qq}}</view>
+							<view class="itemboxLeft">
+								<view class="itembox-til text-right">QQ号:</view>
+								<view class="itembox-con text-gray">{{modal.brokerinfo.qq}}</view>
+							</view>
 						</view>
 
 						<view class="itembox text-left">
-							<view class="itembox-til text-right">服务区域:</view>
-							<view class="itembox-con text-gray">{{modal.brokerinfo.province}} -
-								{{modal.brokerinfo.city}}
+							<view class="itemboxLeft">
+								<view class="itembox-til text-right">服务区域:</view>
+								<view class="itembox-con text-gray">{{modal.brokerinfo.province}} -
+									{{modal.brokerinfo.city}}
+								</view>
 							</view>
 						</view>
+						<view class="itembox text-left">
+							<view class="itemboxLeft">
+								<view class="itembox-til text-right">工作地点:</view>
+								<view class="itembox-con text-gray">{{modal.brokerinfo.district}} -
+									{{modal.brokerinfo.town}}-{{modal.brokerinfo.village}}
+								</view>
+							</view>
+							<view class="itembox-btn" @tap="openMap">导航</view>
+						</view>
 						<view class="itembox text-left" style="padding-bottom: 30rpx;" :data-index="index"
 							@tap="showModal">
-							<view class="itembox-til text-right">基本介绍:</view>
-							<view class="itembox-con text-gray">
-								<text>{{modal.brokerinfo.details}}</text>
+							<view class="itemboxLeft">
+								<view class="itembox-til text-right">基本介绍:</view>
+								<view class="itembox-con text-gray">
+									<text>{{modal.brokerinfo.details}}</text>
+								</view>
 							</view>
 						</view>
 					</scroll-view>
@@ -243,7 +265,7 @@
 			</view>
 			<!-- #endif -->
 
-			<view class="action text-blue" @tap="goNavPage('/pages/broker/brokerlist')">
+			<view class="action text-red" @tap="goNavPage('/pages/broker/brokerlist')">
 				<view class="cuIcon-cu-image">
 					<image src="../../static/tabbar/brokerSelected.png"></image>
 				</view>
@@ -351,6 +373,22 @@
 			})
 		},
 		methods: {
+			openMap(e) {
+				uni.openLocation({
+					longitude: Number(_this.modal.brokerinfo.longitude),
+					latitude: Number(_this.modal.brokerinfo.latitude),
+					name: _this.modal.brokerinfo.village,
+					address: _this.modal.brokerinfo.province + _this.modal.brokerinfo.city + _this.modal.brokerinfo
+						.town + _this.modal.brokerinfo.village,
+					success: function(res) {
+						console.log('打开系统位置地图成功')
+					},
+					fail: function(error) {
+						console.log(error)
+					}
+				})
+			},
+
 			brokerListLower() {
 				if (_this.pstatus !== 'more') {
 					return;
@@ -537,7 +575,26 @@
 		padding: 10rpx 30rpx;
 		width: 100%;
 		display: flex;
-		justify-content: start;
+		// justify-content: start;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.itemboxLeft {
+		display: flex;
+		align-items: center;
+	}
+
+	.itembox-btn {
+		padding: 0 20rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		border: 1rpx solid #00aa00;
+		color: #00aa00;
+		font-size: 25rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 
 	.itembox-til {
@@ -545,7 +602,7 @@
 	}
 
 	.itembox-con {
-		width: 530rpx;
+		width: 430rpx;
 	}
 
 	.menu {
@@ -719,4 +776,19 @@
 			}
 		}
 	}
+
+	.detailBox {
+		padding: 0 30rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.detailBox-item {
+			.detailBox-item-button {
+				width: 100rpx;
+				height: 30rpx;
+				background-color: #cd0000;
+			}
+		}
+	}
 </style>

+ 188 - 0
pages/comjobs/businessHelp.vue

@@ -0,0 +1,188 @@
+<template>
+	<view>
+		<view class="header">
+			<view class="cu-bar search bg-gray">
+				<view class="search-form round text-center">
+					<text class="cuIcon-search"></text>
+					<input v-model="searchval" :adjust-position="false" type="text" placeholder="请输入关键字"
+						confirm-type="search" @confirm="btnSearch()"></input>
+				</view>
+				<view class="action" v-if="searchval!==''">
+					<button class="cu-btn bg-white shadow-blur round" @click="btnSearch()">搜索</button>
+				</view>
+			</view>
+			<view class="screen">
+				<image class="screen-icon" src="../../static/images/comJobs/screen.png"></image>
+				<view class="">筛选</view>
+			</view>
+		</view>
+
+		<view class="list">
+			<view class="card" v-for="(item,index) in 3" :key="index">
+				<view class="cardBox">
+					<view class="cardBox-image"></view>
+					<view class="cardBox-content">
+						<view class="content-header">
+							<view class="header-title">雨伞组装</view>
+							<image class="header-icon" src="../../static/images/comJobs/apply.png" mode="widthFix"></image>
+						</view>
+						<view class="header-item red">1元/把</view>
+						<view class="header-item">外包需求:10000把</view>
+						<view class="header-item">晋江XXXX伞业制造有限公司</view>
+					</view>
+				</view>
+			</view>
+
+			<uni-load-more :status="pstatus"></uni-load-more>
+		</view>
+	</view>
+</template>
+
+<script>
+	var _this;
+	export default {
+		data() {
+			return {
+				searchval: "",
+				ppage: 1,
+				psize: 20,
+				plist: [],
+				pstatus: 'more',
+			}
+		},
+		onLoad() {
+			_this = this;
+			_this.getMore();
+		},
+		methods: {
+
+			getMore() {
+				_this.$req.ajax({
+					path: "comjobs/listcomjobs",
+					data: {
+						ppage: _this.ppage,
+						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)
+					uni.stopPullDownRefresh();
+				}).catch((err) => {
+					uni.showModal({
+						title: '信息提示',
+						content: err,
+						showCancel: false
+					});
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f0f0f0;
+	}
+
+	.header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.search {
+			flex: 1;
+		}
+
+		.screen {
+			width: 150rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #191919;
+
+			.screen-icon {
+				margin-right: 10rpx;
+				width: 28rpx;
+				height: 28rpx;
+			}
+		}
+	}
+
+	.list {
+		padding: 0 26rpx;
+
+		.card {
+			margin-bottom: 30rpx;
+			background: #FFFFFF;
+			border-radius: 12rpx;
+			display: flex;
+			overflow: hidden;
+			
+			.cardBox {
+				width: 100%;
+				padding: 22rpx 30rpx;
+				font-size: 28rpx;
+				color: #747474;
+				display: flex;
+				align-items: center;
+				justify-content: flex-start;
+				border-left: 5px solid #CA151C;
+				
+				.cardBox-image {
+					width: 228rpx;
+					height: 228rpx;
+					background: #ff5500;
+					border-radius: 8rpx;
+				}
+				
+				.cardBox-content {
+					margin-left: 30rpx;
+					flex: 1;
+					height: 228rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					
+					.content-header {
+						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;
+						}
+					}
+					
+					.red {
+						color: #CA151C;
+					}
+					
+					.header-item {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						-webkit-line-clamp: 1;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 1 - 1
pages/comjobs/comjobs.vue

@@ -161,7 +161,7 @@
 				</view>
 				首页
 			</view>
-			<view class="action text-blue" @tap="goNavPage('/pages/comjobs/comjobs')">
+			<view class="action text-red" @tap="goNavPage('/pages/comjobs/comjobs')">
 				<view class="cuIcon-cu-image">
 					<image src="../../static/tabbar/jobsSelected.png"></image>
 				</view>

+ 8 - 8
pages/comjobs/detail.vue

@@ -26,7 +26,7 @@
 		<block v-if="comjobs.recruitment_cate==2">
 			<view class="cu-bar bg-white">
 				<view class="action">
-					<text class="cuIcon-titles text-blue"></text> 推广介绍
+					<text class="cuIcon-titles text-red"></text> 推广介绍
 				</view>
 			</view>
 			<view class="echo-article-details bg-white solids-bottom flex justify-between" style="padding-top: 0rpx;">
@@ -45,7 +45,7 @@
 		
 		<view class="cu-bar bg-white">
 			<view class="action">
-				<text class="cuIcon-titles text-blue"></text> 职位详情
+				<text class="cuIcon-titles text-red"></text> 职位详情
 			</view>
 		</view>
 		<view class="echo-article-details bg-white solids-bottom" style="padding-top: 0rpx;">
@@ -54,7 +54,7 @@
 		
 		<view class="cu-bar bg-white">
 			<view class="action">
-				<text class="cuIcon-titles text-blue"></text> 任职要求
+				<text class="cuIcon-titles text-red"></text> 任职要求
 			</view>
 		</view>
 		<view class="echo-article-details bg-white solids-bottom" style="padding-top: 0rpx;">
@@ -63,7 +63,7 @@
 		
 		<view class="cu-bar bg-white">
 			<view class="action">
-				<text class="cuIcon-titles text-blue"></text> 环境图片
+				<text class="cuIcon-titles text-red"></text> 环境图片
 			</view>
 			<view class="action" data-modalname="picallModal" @tap="showModal">
 				<text class="text-df">查看全部 </text>
@@ -83,7 +83,7 @@
 		
 		<view class="cu-bar bg-white solids-top">
 			<view class="action">
-				<text class="cuIcon-titles text-blue"></text> 企业介绍
+				<text class="cuIcon-titles text-red"></text> 企业介绍
 			</view>
 		</view>
 		<view class="echo-article-details bg-white" style="padding-top: 0rpx;">
@@ -103,13 +103,13 @@
 						进店
 					</view>
 				</view>
-				<view class="text-gray" @tap="setAddress()"><text class="cuIcon-locationfill text-blue margin-right-xs"></text> {{comjobs.worker.city}} {{comjobs.worker.district}} {{comjobs.worker.address}}</view>
+				<view class="text-gray" @tap="setAddress()"><text class="cuIcon-locationfill text-red margin-right-xs"></text> {{comjobs.worker.city}} {{comjobs.worker.district}} {{comjobs.worker.address}}</view>
 			</view>
 		</view>
 		
 		<view class="cu-bar bg-white">
 			<view class="action">
-				<text class="cuIcon-titles text-blue"></text> 服务流程
+				<text class="cuIcon-titles text-red"></text> 服务流程
 			</view>
 		</view>
 		<view class="echo-article-details bg-white solids-bottom" style="padding-top: 0rpx;">
@@ -131,7 +131,7 @@
 				</view>
 				{{comjobsstar==0 ? '收藏' : '已收藏'}}
 			</button>
-			<view class="bg-blue submit echo-foot-button" @tap="setComjobsLog" v-if="comjobs.status==3"> <text>立即报名</text> </view>
+			<view class="bg-themeBtn submit echo-foot-button" @tap="setComjobsLog" v-if="comjobs.status==3"> <text>立即报名</text> </view>
 			<view class="bg-grey submit echo-foot-button" v-else> <text>已招满</text> </view>
 		</view>
 		

+ 172 - 0
pages/comjobs/jobDemands.vue

@@ -0,0 +1,172 @@
+<template>
+	<view>
+		<view class="demandForm">
+			<view class="form-item">
+				<view class="item-title">需求分类</view>
+				<view class="item-area">
+					<input class="item-area-input" placeholder="请选择" placeholder-style="color: #979797;"></input>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="item-title">您的需求</view>
+				<view class="item-area">
+					<input class="item-area-input" placeholder="请输入您的要求" placeholder-style="color: #979797;"></input>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="item-title">期望价格</view>
+				<view class="item-area-mult">
+					<view class="item-area-mult-box">
+						<input class="item-area-input" type="digit" placeholder="请输入"
+							placeholder-style="color: #979797;"></input>
+					</view>
+					<view>元</view>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="item-title">服务地址</view>
+				<view class="item-area">
+					<input class="item-area-input" placeholder="请选择地址" placeholder-style="color: #979797;"></input>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="item-title">期望服务时间</view>
+				<view class="item-area">
+					<input class="item-area-input" placeholder="请选择时间" placeholder-style="color: #979797;"></input>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="item-title">添加图片</view>
+				<view class="item-area-image">
+					<view class="item-area-imageBox">
+						<u-icon name="plus" color="#B4B5B5" size="40"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="bottomEmpty"></view>
+		<view class="bottomArea">
+			<view class="bottomLeft">
+				<text class="bottomLeft-title">应付金额:</text>
+				<text style="font-weight: 600;color: #CA151C;">¥</text>
+				<text class="bottomLeft-money">300</text>
+			</view>
+			<view class="bottomButton" @tap="submit">确认提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			submit() {
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.demandForm {
+		padding: 40rpx 70rpx 10rpx;
+		background-color: #FFFFFF;
+
+		.form-item {
+			margin-bottom: 35rpx;
+
+			.item-area-mult {
+				margin-top: 15rpx;
+				width: 100%;
+				display: flex;
+				align-items: center;
+				// justify-content: space-between;
+				font-size: 28rpx;
+				color: #979797;
+
+
+				.item-area-mult-box {
+					width: 90%;
+					height: 100rpx;
+					margin-right: 15rpx;
+					padding: 0 36rpx;
+					background: #F7F7F7;
+
+					.item-area-input {
+						height: 100rpx;
+					}
+				}
+			}
+
+			.item-area-image {
+				margin-top: 15rpx;
+
+				.item-area-imageBox {
+					width: 200rpx;
+					height: 200rpx;
+					background: #F7F7F7;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+			}
+
+			.item-area {
+				margin-top: 15rpx;
+				padding: 0 36rpx;
+				width: 100%;
+				height: 100rpx;
+				background: #F7F7F7;
+				font-size: 28rpx;
+				color: #979797;
+
+				.item-area-input {
+					height: 100rpx;
+				}
+			}
+		}
+	}
+
+	.bottomEmpty {
+		margin-top: 80rpx;
+		height: 130rpx;
+	}
+
+	.bottomArea {
+		position: fixed;
+		bottom: 0;
+		z-index: 100;
+		width: 100%;
+		height: 130rpx;
+		padding: 0 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		background-color: #FFFFFF;
+		box-shadow: -10rpx -12rpx 12rpx 2rpx rgba(52, 85, 73, 0.16);
+
+		.bottomLeft {
+			.bottomLeft-money {
+				font-size: 40rpx;
+				font-weight: 600;
+				color: #CA151C;
+			}
+		}
+
+		.bottomButton {
+			width: 360rpx;
+			height: 88rpx;
+			background-color: #CA151C;
+			border-radius: 54rpx;
+			color: #FFFFFF;
+			font-size: 36rpx;
+			line-height: 88rpx;
+			text-align: center;
+		}
+	}
+</style>

+ 144 - 9
pages/comjobs/log.vue

@@ -1,6 +1,53 @@
 <template>
 	<view>
-		<block v-for="(item,index) in plist" :key="index">
+		<view class="listCardlog" v-for="(item,index) in plist" :key="index" @tap="goDetail(item.comjobs.id)">
+			<view class="listCardlog-item">
+				<view class="item-left">
+					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardA.png')"
+						mode="widthFix"></image>
+					<view class="item-content bold">
+						{{item.comjobs.title}}
+						<text class="text-red text-sm">(按月)</text>
+						<text class="text-red text-sm" v-if="item.comjobs.wtype==2">(按时)</text>
+						<text class="text-red text-sm" v-if="item.comjobs.wtype==3">(按件)</text>
+						<text class="text-red text-sm" v-if="item.comjobs.wtype==4">(按项目)</text>
+					</view>
+				</view>
+				<view class="item-right">
+					<!-- <image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardD.png')"
+							mode="widthFix"></image> -->
+					<view class="item-content small" style="color: #c3c3c3;" @tap.stop="delLog(index, item.id)">取消报名</view>
+				</view>
+			</view>
+			<view class="listCardlog-item" style="margin: 28rpx 0;">
+				<view class="item-left">
+					<image class="item-icon" src="../../static/images/comJobs/icon-sum.png" mode="widthFix"></image>
+					<view class="item-content red">{{item.comjobs.zwagall}}</view>
+				</view>
+				<view class="item-right">
+					<!-- <image class="item-icon" src="../../static/images/comJobs/icon-pageView.png" mode="widthFix">
+						</image> -->
+					<view class="item-content red small">{{item.status_text}}</view>
+				</view>
+			</view>
+			<view class="listCardlog-item" v-if="item.comjobs.tags.length != 0">
+				<view v-for="(titem,tindex) in item.comjobs.tags" :key="tindex"
+					class="cu-tag light bg-blue lg echo-tags-item">{{titem}}</view>
+			</view>
+			<view class="listCardlog-item">
+				<view class="item-left">
+					<!-- <image class="item-icon" src="../../static/images/comJobs/icon-sum.png" mode="widthFix"></image> -->
+					<view class="item-content bold">{{item.comjobs.worker.title}}</view>
+				</view>
+				<view class="item-right">
+					<image class="item-icon" src="../../static/images/comJobs/icon-pageView.png" mode="widthFix">
+					</image>
+					<view class="item-content small">浏览量:{{item.comjobs.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.comjobs.id)">
 					<view class="padding-lr flex justify-between align-center">
@@ -12,7 +59,8 @@
 							<text class="text-red text-sm" v-if="item.comjobs.wtype==4">(按项目)</text>
 						</view>
 						<view class="basis-sm text-cut text-right text-gray text-sm">
-							<view class="basis-xs text-cut text-right text-gray text-sm" @tap.stop="delLog(index, item.id)">取消报名</view>
+							<view class="basis-xs text-cut text-right text-gray text-sm"
+								@tap.stop="delLog(index, item.id)">取消报名</view>
 						</view>
 					</view>
 					<view class="padding-lr flex justify-between align-bottom">
@@ -24,7 +72,8 @@
 						</view>
 					</view>
 					<view class="padding-lr padding-tb-xs text-cut">
-						<view v-for="(titem,tindex) in item.comjobs.tags" :key="tindex" class="cu-tag light bg-blue lg echo-tags-item">{{titem}}</view>
+						<view v-for="(titem,tindex) in item.comjobs.tags" :key="tindex"
+							class="cu-tag light bg-blue lg echo-tags-item">{{titem}}</view>
 					</view>
 					<view class="padding-lr text-cut text-sm flex justify-between align-center">
 						<view class="basis-lg text-df text-cut">{{item.comjobs.worker.title}}</view>
@@ -55,10 +104,10 @@
 				plist: []
 			};
 		},
-		onLoad: function(){
+		onLoad: function() {
 			_this = this;
 			_this.userinfo = _this.checkLogin("/pages/comjobs/log");
-			if (_this.userinfo===false){
+			if (_this.userinfo === false) {
 				return false;
 			}
 			_this.getMore();
@@ -76,7 +125,7 @@
 			_this.getMore();
 		},
 		methods: {
-			delLog: function(index,logid) {
+			delLog: function(index, logid) {
 				uni.showModal({
 					title: '温馨提示',
 					content: '确定要删除吗?',
@@ -100,7 +149,7 @@
 						}
 					}
 				});
-				
+
 			},
 			getMore: function() {
 				_this.$req.ajax({
@@ -114,6 +163,7 @@
 					_this.pstatus = data.pstatus;
 					_this.plist = _this.plist.concat(data.plist);
 					_this.ppage += 1;
+					console.log("数据", _this.plist)
 					uni.stopPullDownRefresh();
 				}).catch((err) => {
 					uni.showModal({
@@ -137,5 +187,90 @@
 	}
 </script>
 
-<style>
-</style>
+<style lang="scss">
+	.listCardlog {
+		margin: 0 20rpx 40rpx;
+		padding: 28rpx 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 12rpx;
+
+		.listCardlog-item {
+			display: flex;
+
+			.item-left {
+				width: 60%;
+				display: flex;
+
+				.item-icon {
+					width: 35rpx;
+					height: 35rpx;
+					margin-right: 15rpx;
+				}
+
+				.item-content {
+					flex: 1;
+					font-size: 28rpx;
+					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: 600;
+					color: #CA151C;
+				}
+			}
+
+			.item-right {
+				width: 35%;
+				margin-left: 15rpx;
+				display: flex;
+				justify-content: flex-end;
+
+				.item-icon {
+					width: 35rpx;
+					height: 35rpx;
+					margin-right: 15rpx;
+				}
+
+				.item-content {
+					// flex: 1;
+					font-size: 28rpx;
+					line-height: 35rpx;
+					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: 600;
+					color: #CA151C;
+				}
+				
+				.small {
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
+</style>

+ 1 - 1
pages/comjobs/recruitFast.vue

@@ -38,7 +38,7 @@
 					</view>
 					<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">300元</text></view>
+						<view class="item-text">赏金<text class="item-text-money">{{item.retmoney}}元</text></view>
 					</view>
 					<view class="card-top-item long">
 						<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardB.png')"></image>

+ 6 - 3
pages/index/home.vue

@@ -5,12 +5,15 @@
 			<view>
 				<view class="" @tap="checkWorker">
 					<view class="padding"></view>
-					<image mode="widthFix" style="width: 100%;" :src="zqtop"></image>
+					<image mode="widthFix" style="width: 300rpx;" src="../../static/images/index/recruiter.png"></image>
+					<!-- <image mode="widthFix" style="width: 100%;" :src="zqtop"></image> -->
 					<view class="padding text-center text-blue">我要招聘</view>
 				</view>
 				<view class="" @tap="goUser">
-					<image mode="widthFix" style="width: 100%; position: fixed; left: 0; bottom: 160rpx;" :src="zqbottom"></image>
-					<view class="padding text-center text-blue" style="width: 100%; position: fixed; left: 0; bottom: 40rpx;">我要求职</view>
+					<image mode="widthFix" style="width: 300rpx; position: fixed; left: 50%; bottom: 360rpx; margin-left: -150rpx;" src="../../static/images/index/jobhunter.png"></image>
+					<!-- <image mode="widthFix" style="width: 100%; position: fixed; left: 0; bottom: 160rpx;" :src="zqbottom"></image> -->
+					<view class="padding text-center text-blue" style="width: 100%; position: fixed; left: 0; bottom: 240rpx;">我要求职</view>
+					<!-- <view class="padding text-center text-blue" style="width: 100%; position: fixed; left: 0; bottom: 40rpx;">我要求职</view> -->
 				</view>
 			</view>
 		</view>

+ 21 - 5
pages/index/index.vue

@@ -30,18 +30,22 @@
 				<view class="topMenu-item"  @click="goLPage('/pages/comjobs/recruitFast')">
 					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/topMenuA.png')"></image>
 					<view class="item-title">晋快招</view>
+					<view class="item-explain">悬赏招聘</view>
 				</view>
 				<view class="topMenu-item" @tap="develop()">
 					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/topMenuB.png')"></image>
 					<view class="item-title">晋帮家</view>
+					<view class="item-explain">家政服务</view>
 				</view>
-				<view class="topMenu-item" @tap="develop()">
+				<view class="topMenu-item" @tap="goLPage('/pages/comjobs/jobDemands')">
 					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/topMenuC.png')"></image>
 					<view class="item-title">晋全能</view>
+					<view class="item-explain">零工服务</view>
 				</view>
-				<view class="topMenu-item" @tap="develop()">
+				<view class="topMenu-item" @tap="goLPage('/pages/comjobs/businessHelp')">
 					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/topMenuD.png')"></image>
 					<view class="item-title">晋企帮</view>
+					<view class="item-explain">订单分包</view>
 				</view>
 			</view>
 
@@ -125,7 +129,7 @@
 					<view class="card-infor-right">
 						<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>
+							</image><text>赏金</text><text class="right-money-num">{{item.retmoney}}元</text>
 						</view>
 						<view class="right-place card-center">
 							<image class="card-icon" :src="$getImageUrl('static/images/applet/index/cardD.png')">
@@ -148,7 +152,7 @@
 		<view class="padding-sm"></view>
 		<view class="padding-xl"></view>
 		<view class="cu-bar tabbar bg-white foot">
-			<view class="action text-blue" @tap="goNavPage('/pages/index/index')">
+			<view class="action text-red" @tap="goNavPage('/pages/index/index')">
 				<view class="cuIcon-cu-image">
 					<image src="../../static/tabbar/indexSelected.png"></image>
 				</view>
@@ -763,6 +767,7 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
+			justify-content: center;
 			color: #707070;
 			font-size: 32rpx;
 			font-weight: 400;
@@ -770,7 +775,18 @@
 			.item-icon {
 				width: 60rpx;
 				height: 60rpx;
-				margin-bottom: 15rpx;
+				margin-bottom: 20rpx;
+			}
+			
+			.item-title {
+				font-weight: 600;
+				color: #000000;
+			}
+			
+			.item-explain {
+				margin-top: 10rpx;
+				font-size: 23rpx;
+				color: #a1a1a1;
 			}
 		}
 	}

+ 89 - 2
pages/my/feedback.vue

@@ -1,6 +1,32 @@
 <template>
 	<view>
-		<form>
+		<view class="broKerForm">
+			<view class="broKerForm-item">
+				<view class="item-title">姓名</view>
+				<view class="item-area">
+					<input class="item-area-input" placeholder="请输入姓名" data-field="name" @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-field="mobile" @input="bindInput"
+						placeholder-style="color: #979797;"></input>
+				</view>
+			</view>
+			<view class="broKerForm-item-bg">
+				<textarea maxlength="-1" @input="bindInput" data-field="content" placeholder="请输入您的意见和建议"></textarea>
+			</view>
+		</view>
+		
+		<view class="bottomEmpty"></view>
+		
+		<view class="bottomArea">
+			<view class="bottomButton" @tap="subModal">确定</view>
+		</view>
+		
+		<form v-if="false">
 			<view class="cu-form-group margin-top">
 				<view class="title">姓名</view>
 				<input placeholder="请输入姓名" data-field="name" @input="bindInput"></input>
@@ -90,8 +116,69 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.cu-form-group .title {
 		min-width: calc(4em + 30rpx);
 	}
+	
+	.broKerForm {
+		padding: 40rpx 70rpx;
+		background-color: #FFFFFF;
+		
+		.broKerForm-item-bg {
+			padding: 20rpx 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background-color: #F7F7F7;
+		}
+	
+		.broKerForm-item {
+			margin-bottom: 35rpx;
+	
+			.item-area {
+				margin-top: 15rpx;
+				padding: 0 36rpx;
+				width: 100%;
+				height: 100rpx;
+				background: #F7F7F7;
+				font-size: 28rpx;
+				color: #979797;
+	
+				.item-area-input {
+					height: 100rpx;
+				}
+			}
+		}
+	}
+	
+	.bottomEmpty {
+		margin-top: 80rpx;
+		height: 130rpx;
+	}
+	
+	.bottomArea {
+		position: fixed;
+		bottom: 0;
+		z-index: 100;
+		width: 100%;
+		height: 130rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+		box-shadow: -10rpx -12rpx 12rpx 2rpx rgba(52, 85, 73, 0.16);
+	
+		.bottomButton {
+			margin: 0 28rpx;
+			width: 696rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			background: #CA151C;
+			font-size: 33rpx;
+			text-align: center;
+			color: #FFFFFF;
+			border-radius: 10rpx;
+		}
+	}
 </style>

+ 24 - 12
pages/my/my.vue

@@ -17,12 +17,13 @@
 						<view class="login-infor">
 							<view class="infor-top">
 								<text class="infor-top-name">{{userinfo.nickname}}</text>
-								<view class="infor-top-verify" v-if="userinfo.authstatus != 1">
+								<view class="infor-top-verify" v-if="brokerall != null">
 									<view class="verify-icon">
-										<image class="verify-icon-image" :src="$getImageUrl('static/images/applet/my/verify.png')">
+										<image class="verify-icon-image"
+											:src="$getImageUrl('static/images/applet/my/verify.png')">
 										</image>
 									</view>
-									<view class="verify-text">已实名</view>
+									<view class="verify-text">经纪人</view>
 								</view>
 								<text class="infor-top-noVerify" v-if="userinfo.authstatus == 1">(未实名)</text>
 							</view>
@@ -35,15 +36,18 @@
 
 		<view class="topMenu">
 			<view class="topMenu-item" @click="goLPage('/pages/my/myinfo')">
-				<image class="item-image" :src="$getImageUrl('static/images/applet/my/infor.png')" mode="widthFix"></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-image" :src="$getImageUrl('static/images/applet/my/code.png')" mode="widthFix"></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-image" :src="$getImageUrl('static/images/applet/my/invite.png')" mode="widthFix"></image>
+				<image class="item-image" :src="$getImageUrl('static/images/applet/my/invite.png')" mode="widthFix">
+				</image>
 				<view class="item-title">我的邀请</view>
 			</view>
 		</view>
@@ -52,8 +56,10 @@
 			<view class="topApply-left">
 				<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 class="topApply-center" v-if="brokerall == null">经纪人福利多多</view>
+			<view class="topApply-center" v-if="brokerall != null">经纪人中心</view>
+			<view class="topApply-right" v-if="brokerall == null" @tap="goLPage('/pages/broker/brokerform')">立即开通</view>
+			<view class="topApply-right" v-if="brokerall != null" @tap="goLPage('/pages/broker/center')">进入工作台</view>
 		</view>
 
 		<view class="topMenu">
@@ -113,7 +119,13 @@
 			</view>
 		</view>
 
-		<view style="margin-top: 40rpx; text-align: center; font-size: 24rpx; color: #B4B5B5;">没有更多数据了</view>
+
+		<view style="margin-top: 60rpx; display: flex;justify-content: center;">
+			<image style=" width: 127rpx;" src="../../static/images/my/empty.png" mode="widthFix">
+			</image>
+		</view>
+
+		<view style="margin-top: 34rpx; text-align: center; font-size: 24rpx; color: #B4B5B5;">没有更多数据了</view>
 
 
 		<view class="margin-bottom" style="position: relative;" v-if="false">
@@ -365,7 +377,7 @@
 				经纪人
 			</view>
 
-			<view class="action text-blue" @tap="goNavPage('/pages/my/my')">
+			<view class="action text-red" @tap="goNavPage('/pages/my/my')">
 				<view class="cuIcon-cu-image">
 					<image src="../../static/tabbar/mySelected.png"></image>
 				</view>
@@ -373,7 +385,7 @@
 			</view>
 		</view>
 
-		<button class="cu-btn bg-blue lg shadow echo-gohome" @tap="goHome"> 切换身份 </button>
+		<!-- <button class="cu-btn bg-blue lg shadow echo-gohome" @tap="goHome"> 切换身份 </button> -->
 
 		<wxContact></wxContact>
 
@@ -780,7 +792,7 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			
+
 			.item-image {
 				width: 60rpx;
 				height: 60rpx;

+ 96 - 37
pages/my/myauth.vue

@@ -3,20 +3,26 @@
 		<form v-if="userinfo.authstatus==1">
 			<view class="bg-white padding-tb grid margin-bottom text-center col-2">
 				<view class="bg-white">
-					<avatar selWidth="660rpx" selHeight="440rpx" @upload="setIdcardZpic" :avatarSrc="userinfo.idcardzpic ? userinfo.idcardzpic : $getImageUrl('static/images/applet/idcardzpic.png')" noTab="true" avatarStyle="width: 330rpx; height: 220rpx; border-radius: 0rpx;"></avatar>
+					<avatar selWidth="660rpx" selHeight="440rpx" @upload="setIdcardZpic"
+						:avatarSrc="userinfo.idcardzpic ? userinfo.idcardzpic : $getImageUrl('static/images/applet/idcardzpic.png')"
+						noTab="true" avatarStyle="width: 330rpx; height: 220rpx; border-radius: 0rpx;"></avatar>
 					<view class="text-sm text-grey padding-top-sm"> 上传身份证(头像页) </view>
 				</view>
 				<view class="bg-white">
-					<avatar selWidth="660rpx" selHeight="440rpx" @upload="setIdcardFpic" :avatarSrc="userinfo.idcardfpic ? userinfo.idcardfpic : $getImageUrl('static/images/applet/idcardfpic.png')" noTab="true" avatarStyle="width: 330rpx; height: 220rpx; border-radius: 0rpx;"></avatar>
+					<avatar selWidth="660rpx" selHeight="440rpx" @upload="setIdcardFpic"
+						:avatarSrc="userinfo.idcardfpic ? userinfo.idcardfpic : $getImageUrl('static/images/applet/idcardfpic.png')"
+						noTab="true" avatarStyle="width: 330rpx; height: 220rpx; border-radius: 0rpx;"></avatar>
 					<view class="text-sm text-grey padding-top-sm"> 上传身份证(国徽页) </view>
 				</view>
 			</view>
 			<ocr-navigator @onSuccess="idCardSuccess" certificateType="idCard" :opposite="false">
-			    <button type="primary">点击识别身份证</button>
+				<!-- <button type="primary">点击识别身份证</button> -->
+				<view class="Identification">点击识别身份证</view>
 			</ocr-navigator>
 			<view class="cu-list menu margin-top-sm">
-				<view class="cu-item arrow" data-title="姓名" data-infobox="input" data-field="nickname" :data-value="userinfo.nickname" @click="showModal">
-				<!-- <view class="cu-item"> -->
+				<view class="cu-item arrow" data-title="姓名" data-infobox="input" data-field="nickname"
+					:data-value="userinfo.nickname" @click="showModal">
+					<!-- <view class="cu-item"> -->
 					<view class="content">
 						<text>姓名</text>
 					</view>
@@ -24,8 +30,9 @@
 						<text class="text-grey">{{userinfo.nickname}}</text>
 					</view>
 				</view>
-				<view class="cu-item arrow" data-title="身份证号" data-infobox="input" data-field="idcard" :data-value="userinfo.idcard" @click="showModal">
-				<!-- <view class="cu-item"> -->
+				<view class="cu-item arrow" data-title="身份证号" data-infobox="input" data-field="idcard"
+					:data-value="userinfo.idcard" @click="showModal">
+					<!-- <view class="cu-item"> -->
 					<view class="content">
 						<text>身份证号</text>
 					</view>
@@ -38,8 +45,12 @@
 						<text>性别</text>
 					</view>
 					<view class="action">
-						<picker mode="selector" @change="genderChange" :value="userinfo.gender" :range="sex_list" :range-key="index">
-							<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{userinfo.gender ? sex_list[userinfo.gender - 1] : '请选择'}}</view>
+						<picker mode="selector" @change="genderChange" :value="userinfo.gender" :range="sex_list"
+							:range-key="index">
+							<view class="picker padding-tb text-right text-grey"
+								style="width: 280rpx;line-height: 40rpx;">
+								{{userinfo.gender ? sex_list[userinfo.gender - 1] : '请选择'}}
+							</view>
 						</picker>
 						<!-- <text class="text-grey">{{userinfo.gender==1 ? '男' : '女'}}</text> -->
 					</view>
@@ -50,17 +61,25 @@
 					</view>
 					<view class="action">
 						<picker mode="date" @change="birthdayChange">
-							<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{userinfo.birthday ? userinfo.birthday : '请选择'}}</view>
+							<view class="picker padding-tb text-right text-grey"
+								style="width: 280rpx;line-height: 40rpx;">
+								{{userinfo.birthday ? userinfo.birthday : '请选择'}}
+							</view>
 						</picker>
 					</view>
 				</view>
 				<view v-if="userinfo.authremark" class="padding text-red">{{userinfo.authremark}}</view>
 			</view>
-			<view class="padding flex flex-direction">
+			<!-- <view class="padding flex flex-direction">
 				<button class="cu-btn bg-blue margin-tb-sm lg" @tap="setAuthStatus">提交审核</button>
+			</view> -->
+			<view class="bottomEmpty"></view>
+			
+			<view class="bottomArea">
+				<view class="bottomButton" @tap="setAuthStatus">提交审核</view>
 			</view>
 		</form>
-		
+
 		<view v-else>
 			<view v-if="userinfo.authstatus==2" class="bg-white padding-tb grid text-center col-2 margin-bottom-sm">
 				<view class="bg-white">
@@ -72,7 +91,7 @@
 					<view class="text-sm text-grey padding-top-sm"> 身份证(国徽页) </view>
 				</view>
 			</view>
-			
+
 			<view class="cu-list menu">
 				<view class="cu-item">
 					<view class="content">
@@ -110,7 +129,7 @@
 				<view v-if="userinfo.authstatus==3" class="padding text-green">实名认证信息已通过审核。</view>
 			</view>
 		</view>
-			
+
 		<view class="cu-modal" :class="forminfo.isshow">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -130,7 +149,7 @@
 				</view>
 			</view>
 		</view>
-			
+
 		<view class="padding"></view>
 	</view>
 </template>
@@ -145,14 +164,14 @@
 		data() {
 			return {
 				userinfo: {},
-				
+
 				forminfo: {
 					isshow: "",
 					title: "",
 					field: "",
 					value: ""
 				},
-				sex_list: ['男','女'],
+				sex_list: ['男', '女'],
 			}
 		},
 		onLoad: function() {
@@ -211,16 +230,16 @@
 				_this.forminfo.value = e.detail.value;
 			},
 			subModal: function() {
-				_this.editFiled( _this.forminfo.field, _this.forminfo.value );
+				_this.editFiled(_this.forminfo.field, _this.forminfo.value);
 			},
-			
+
 			// 上传身份证
 			setIdcardZpic: function(rsp) {
 				_this.$req.ajaxFile({
 					path: "attachment/tplfieldimage",
-					title:'正在上传',
+					title: '正在上传',
 					filePath: rsp.path,
-					fileName:'file',
+					fileName: 'file',
 				}).then((filedata) => {
 					var data = JSON.parse(filedata.data);
 					_this.editFiled('idcardzpic', data.data.src);
@@ -235,9 +254,9 @@
 			setIdcardFpic: function(rsp) {
 				_this.$req.ajaxFile({
 					path: "attachment/tplfieldimage",
-					title:'正在上传',
+					title: '正在上传',
 					filePath: rsp.path,
-					fileName:'file',
+					fileName: 'file',
 				}).then((filedata) => {
 					var data = JSON.parse(filedata.data);
 					_this.editFiled('idcardfpic', data.data.src);
@@ -249,9 +268,9 @@
 					});
 				});
 			},
-			
+
 			// 更新用户字段
-			editFiled: function (field, value) {
+			editFiled: function(field, value) {
 				_this.$req.ajax({
 					path: "my/edituserinfo",
 					data: {
@@ -271,9 +290,9 @@
 					});
 				});
 			},
-			
+
 			// 提交审核
-			setAuthStatus: function () {
+			setAuthStatus: function() {
 				_this.$req.ajax({
 					path: "my/setauthstatus",
 					data: {
@@ -283,12 +302,12 @@
 					_this.userinfo = data;
 					uni.setStorageSync('userinfo', data);
 					uni.showModal({
-						title:'提示',
-						content: '提交成功,请等待审核!', 
-						showCancel: false,   
-						success: (res) => {  
+						title: '提示',
+						content: '提交成功,请等待审核!',
+						showCancel: false,
+						success: (res) => {
 							uni.navigateBack();
-						}  
+						}
 					});
 				}).catch((err) => {
 					uni.showModal({
@@ -298,18 +317,58 @@
 					});
 				});
 			},
-			
+
 			genderChange: function(e) {
 				_this.userinfo.gender = e.detail.value - 0 + 1;
-				_this.editFiled( 'gender', _this.userinfo.gender );
+				_this.editFiled('gender', _this.userinfo.gender);
 			},
 			birthdayChange: function(e) {
 				_this.userinfo.birthday = e.detail.value
-				_this.editFiled( 'birthday', _this.userinfo.birthday );
+				_this.editFiled('birthday', _this.userinfo.birthday);
 			}
 		}
 	}
 </script>
 
-<style>	
-</style>
+<style lang="scss">
+	.Identification {
+		margin: 0 auto;
+		width: 50%;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		color: #ff1a25;
+		border-radius: 50rpx;
+		border: 1rpx solid #ff1a25;
+	}
+	
+	.bottomEmpty {
+		margin-top: 80rpx;
+		height: 130rpx;
+	}
+	
+	.bottomArea {
+		position: fixed;
+		bottom: 0;
+		z-index: 100;
+		width: 100%;
+		height: 130rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+		box-shadow: -10rpx -12rpx 12rpx 2rpx rgba(52, 85, 73, 0.16);
+	
+		.bottomButton {
+			margin: 0 28rpx;
+			width: 696rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			background: #CA151C;
+			font-size: 33rpx;
+			text-align: center;
+			color: #FFFFFF;
+			border-radius: 10rpx;
+		}
+	}
+</style>

+ 332 - 149
pages/my/myinfo.vue

@@ -4,7 +4,8 @@
 			<button class="cu-form-group" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
 				<view class="title">头像</view>
 				<view class="cu-avatar radius bg-gray">
-					<avatar selWidth="640rpx" selHeight="640rpx" :avatarSrc="userinfo.avatar" noTab="true" avatarStyle="top:16rpx;width: 75rpx; height: 75rpx; border-radius: 5%;"></avatar>
+					<avatar selWidth="640rpx" selHeight="640rpx" :avatarSrc="userinfo.avatar" noTab="true"
+						avatarStyle="top:16rpx;width: 75rpx; height: 75rpx; border-radius: 5%;"></avatar>
 				</view>
 			</button>
 			<!-- <view class="cu-form-group">
@@ -13,9 +14,10 @@
 					<avatar selWidth="640rpx" selHeight="640rpx" @upload="setAvatar" :avatarSrc="userinfo.avatar" noTab="true" avatarStyle="width: 75rpx; height: 75rpx; border-radius: 5%;"></avatar>
 				</view>
 			</view> -->
-			
+
 			<view class="cu-list menu margin-top">
-				<view class="cu-item arrow" data-title="昵称" data-infobox="input" data-field="nickname" :data-value="userinfo.nickname" @click="showModalNickname">
+				<view class="cu-item arrow" data-title="昵称" data-infobox="input" data-field="nickname"
+					:data-value="userinfo.nickname" @click="showModalNickname">
 					<view class="content">
 						<text>昵称</text>
 					</view>
@@ -36,13 +38,16 @@
 						<text>公开电话</text>
 					</view>
 					<view class="action">
-						<picker mode="selector" @change="isPublicPickerChange" :value="isPublicIndex" :range="isPublicPickerList" :range-key="`text`">
-							<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{isPublicIndex>-1 ? isPublicPickerList[isPublicIndex].text : ("请选择...")}}</view>
+						<picker mode="selector" @change="isPublicPickerChange" :value="isPublicIndex"
+							:range="isPublicPickerList" :range-key="`text`">
+							<view class="picker padding-tb text-right text-grey"
+								style="width: 280rpx;line-height: 40rpx;">
+								{{isPublicIndex>-1 ? isPublicPickerList[isPublicIndex].text : ("请选择...")}}</view>
 						</picker>
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="cu-list menu margin-top" v-if="userinfo.authstatus==3">
 				<view class="cu-item">
 					<view class="content">
@@ -77,15 +82,19 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="cu-list menu margin-top">
 				<view class="cu-item arrow" data-title="岗位设置方式">
 					<view class="content">
 						<text>岗位设置方式</text>
 					</view>
 					<view class="action">
-						<picker mode="selector" @change="comCateTypePickerChange" :value="comCateTypeIndex" :range="comCateTypePickerList" :range-key="`text`">
-							<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{comCateTypeIndex>-1 ? comCateTypePickerList[comCateTypeIndex].text : ("请选择...")}}</view>
+						<picker mode="selector" @change="comCateTypePickerChange" :value="comCateTypeIndex"
+							:range="comCateTypePickerList" :range-key="`text`">
+							<view class="picker padding-tb text-right text-grey"
+								style="width: 280rpx;line-height: 40rpx;">
+								{{comCateTypeIndex>-1 ? comCateTypePickerList[comCateTypeIndex].text : ("请选择...")}}
+							</view>
 						</picker>
 					</view>
 				</view>
@@ -94,10 +103,12 @@
 						<text>岗位类型</text>
 					</view>
 					<view class="action">
-						<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{userinfo.com_cate.length > 0 ? userinfo.com_cate : "请选择..."}}</view>
+						<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">
+							{{userinfo.com_cate.length > 0 ? userinfo.com_cate : "请选择..."}}</view>
 					</view>
 				</view>
-				<view class="cu-item arrow" data-title="岗位类型" data-infobox="input" data-field="com_cate_other" :data-value="userinfo.com_cate_other" @click="showModal" v-if="userinfo.com_cate_type == 2">
+				<view class="cu-item arrow" data-title="岗位类型" data-infobox="input" data-field="com_cate_other"
+					:data-value="userinfo.com_cate_other" @click="showModal" v-if="userinfo.com_cate_type == 2">
 					<view class="content">
 						<text>岗位类型</text>
 					</view>
@@ -106,7 +117,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="cu-list menu margin-top solid-bottom">
 				<view class="cu-item arrow" data-title="求职意向">
 					<view class="content">
@@ -114,20 +125,27 @@
 						<text>求职意向</text>
 					</view>
 					<view class="action">
-						<picker mode="selector" @change="jobintentiontypePickerChange" :value="jobintentiontypePickIndex" :range="jobintentiontypePickerList" :range-key="`title`">
-							<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{jobintentiontypePickIndex>-1 ? jobintentiontypePickerList[jobintentiontypePickIndex].title : ("请选择...")}}</view>
+						<picker mode="selector" @change="jobintentiontypePickerChange"
+							:value="jobintentiontypePickIndex" :range="jobintentiontypePickerList" :range-key="`title`">
+							<view class="picker padding-tb text-right text-grey"
+								style="width: 280rpx;line-height: 40rpx;">
+								{{jobintentiontypePickIndex>-1 ? jobintentiontypePickerList[jobintentiontypePickIndex].title : ("请选择...")}}
+							</view>
 						</picker>
 					</view>
 				</view>
-				<view class="cu-item arrow" @click="toggleFilter(true)" :style="userinfo.jobintention == 3 ? '' : 'display:none;'">
+				<view class="cu-item arrow" @click="toggleFilter(true)"
+					:style="userinfo.jobintention == 3 ? '' : 'display:none;'">
 					<view class="content">
 						<text>用工时间</text>
 					</view>
 					<view class="action">
-						<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{userinfo.emp_time.length > 0 ? userinfo.emp_time : "请选择..."}}</view>
+						<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">
+							{{userinfo.emp_time.length > 0 ? userinfo.emp_time : "请选择..."}}</view>
 					</view>
 				</view>
-				<view class="cu-item arrow" data-title="现居住地" data-infobox="input" data-field="address" :data-value="userinfo.address" @click="showModal">
+				<view class="cu-item arrow" data-title="现居住地" data-infobox="input" data-field="address"
+					:data-value="userinfo.address" @click="showModal">
 					<view class="content">
 						<text class="text-red">*</text>
 						<text>现居住地</text>
@@ -141,11 +159,12 @@
 						<text>上班地点</text>
 					</view>
 					<view class="action">
-						<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{userinfo.work_place.length > 0 ? userinfo.work_place : "请选择..."}}</view>
+						<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">
+							{{userinfo.work_place.length > 0 ? userinfo.work_place : "请选择..."}}</view>
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="cu-list menu margin-top solid-bottom">
 				<!-- <view class="cu-item arrow" data-title="健康状况">
 					<view class="content">
@@ -163,8 +182,12 @@
 						<text>工作经验</text>
 					</view>
 					<view class="action">
-						<picker mode="selector" @change="workexperiencePickerChange" :value="workexperiencePickIndex" :range="workexperiencePickerList" :range-key="`text`">
-							<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{workexperiencePickIndex>-1 ? workexperiencePickerList[workexperiencePickIndex].text : ("请选择...")}}</view>
+						<picker mode="selector" @change="workexperiencePickerChange" :value="workexperiencePickIndex"
+							:range="workexperiencePickerList" :range-key="`text`">
+							<view class="picker padding-tb text-right text-grey"
+								style="width: 280rpx;line-height: 40rpx;">
+								{{workexperiencePickIndex>-1 ? workexperiencePickerList[workexperiencePickIndex].text : ("请选择...")}}
+							</view>
 						</picker>
 					</view>
 				</view>
@@ -174,8 +197,12 @@
 						<text>学历</text>
 					</view>
 					<view class="action">
-						<picker mode="selector" @change="educationPickerChange" :value="educationPickIndex" :range="educationPickerList" :range-key="`text`">
-							<view class="picker padding-tb text-right text-grey" style="width: 280rpx;line-height: 40rpx;">{{educationPickIndex>-1 ? educationPickerList[educationPickIndex].text : ("请选择...")}}</view>
+						<picker mode="selector" @change="educationPickerChange" :value="educationPickIndex"
+							:range="educationPickerList" :range-key="`text`">
+							<view class="picker padding-tb text-right text-grey"
+								style="width: 280rpx;line-height: 40rpx;">
+								{{educationPickIndex>-1 ? educationPickerList[educationPickIndex].text : ("请选择...")}}
+							</view>
 						</picker>
 					</view>
 				</view>
@@ -195,7 +222,8 @@
 						</view>
 					</view>
 				</view>
-				<view class="cu-item arrow" data-title="个人描述" data-infobox="textarea" data-field="eduexperience" :data-value="userinfo.eduexperience" @click="showModal">
+				<view class="cu-item arrow" data-title="个人描述" data-infobox="textarea" data-field="eduexperience"
+					:data-value="userinfo.eduexperience" @click="showModal">
 					<view class="content">
 						<text>个人描述</text>
 					</view>
@@ -203,10 +231,17 @@
 			</view>
 			<view class="padding bg-white">
 				<text>{{userinfo.eduexperience}}</text>
-			</view>	
-			<view class="padding text-center">
+			</view>
+
+			<view class="bottomEmpty"></view>
+			<view class="bottomArea">
+				<view class="bottomButton" @tap="goCDetail()">已确认完善信息,返回!</view>
+			</view>
+
+			<view class="padding text-center" v-if="false">
 				<button class="cu-btn bg-orange margin-tb-sm lg" @tap="goCDetail()">已确认完善信息,返回!</button>
 			</view>
+
 			<!-- <view class="padding text-center" v-if="userinfo.authstatus == 1">
 				<button class="cu-btn bg-orange margin-tb-sm lg" @tap="goLPage('/pages/my/myauth')">您还未进行实名认证,请实名认证!</button>
 			</view>
@@ -214,8 +249,8 @@
 				<button class="cu-btn bg-orange margin-tb-sm lg" @tap="goLPage('/pages/my/myauth')">您的实名认证已提交,正在等待审核!</button>
 			</view> -->
 		</form>
-		
-			
+
+
 		<view class="cu-modal" :class="forminfo.isshow">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -225,8 +260,10 @@
 					</view>
 				</view>
 				<view class="padding-xl bg-white text-left solid-top solid-bottom">
-					<input v-if="forminfo.infobox=='input'" :placeholder="'请输入'+forminfo.title+'...'" @input="bindInput" :value="forminfo.value"></input>
-					<textarea v-if="forminfo.infobox=='textarea'" :placeholder="'请输入'+forminfo.title+'...'" @input="bindInput" maxlength="-1" :value="forminfo.value"></textarea>
+					<input v-if="forminfo.infobox=='input'" :placeholder="'请输入'+forminfo.title+'...'" @input="bindInput"
+						:value="forminfo.value"></input>
+					<textarea v-if="forminfo.infobox=='textarea'" :placeholder="'请输入'+forminfo.title+'...'"
+						@input="bindInput" maxlength="-1" :value="forminfo.value"></textarea>
 				</view>
 				<view class="cu-bar bg-white justify-end">
 					<view class="action">
@@ -236,7 +273,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="cu-modal" :class="formavatar">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -256,54 +293,60 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="filteremp" v-if="empTimeModal">
 			<view class="padding bg-white emp-box">
 				<block v-for="(item,index) in empTime" :key="index">
-					<button class="cu-btn margin-lr-xs margin-tb-xs" v-if="!userinfo.emp_time.includes(item.name)" @click="selectEmpTime(item.name,'add')">
+					<button class="cu-btn margin-lr-xs margin-tb-xs" v-if="!userinfo.emp_time.includes(item.name)"
+						@click="selectEmpTime(item.name,'add')">
 						{{item.name}}
 					</button>
-					<button class="cu-btn margin-lr-xs margin-tb-xs bg-red" v-else @click="selectEmpTime(item.name,'del')">
+					<button class="cu-btn margin-lr-xs margin-tb-xs bg-red" v-else
+						@click="selectEmpTime(item.name,'del')">
 						{{item.name}}
 					</button>
 				</block>
 				<view class="padding flex flex-wrap justify-between align-center">
-				  <button class="cu-btn bg-red lg" @click="subFilter()">确定</button>
-				  <button class="cu-btn bg-gray lg" @click="toggleFilter(false)">取消</button>
+					<button class="cu-btn bg-red lg" @click="subFilter()">确定</button>
+					<button class="cu-btn bg-gray lg" @click="toggleFilter(false)">取消</button>
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="filteremp" v-if="communityModal">
 			<view class="padding bg-white emp-box">
 				<block v-for="(item,index) in community" :key="index">
-					<button class="cu-btn margin-lr-xs margin-tb-xs" v-if="!userinfo.work_place.includes(item.name)" @click="selectCommunity(item.name,'add')">
+					<button class="cu-btn margin-lr-xs margin-tb-xs" v-if="!userinfo.work_place.includes(item.name)"
+						@click="selectCommunity(item.name,'add')">
 						{{item.name}}
 					</button>
-					<button class="cu-btn margin-lr-xs margin-tb-xs bg-red" v-else @click="selectCommunity(item.name,'del')">
+					<button class="cu-btn margin-lr-xs margin-tb-xs bg-red" v-else
+						@click="selectCommunity(item.name,'del')">
 						{{item.name}}
 					</button>
 				</block>
 				<view class="padding flex flex-wrap justify-between align-center">
-				  <button class="cu-btn bg-red lg" @click="subCommunity()">确定</button>
-				  <button class="cu-btn bg-gray lg" @click="toggleCommunity(false)">取消</button>
+					<button class="cu-btn bg-red lg" @click="subCommunity()">确定</button>
+					<button class="cu-btn bg-gray lg" @click="toggleCommunity(false)">取消</button>
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="filteremp" v-if="comCateModal">
 			<view class="padding bg-white emp-box">
 				<block v-for="(item,index) in comCate" :key="index">
-					<button class="cu-btn margin-lr-xs margin-tb-xs" v-if="!userinfo.com_cate.includes(item.title)" @click="selectComCate(item.title,'add')">
+					<button class="cu-btn margin-lr-xs margin-tb-xs" v-if="!userinfo.com_cate.includes(item.title)"
+						@click="selectComCate(item.title,'add')">
 						{{item.title}}
 					</button>
-					<button class="cu-btn margin-lr-xs margin-tb-xs bg-red" v-else @click="selectComCate(item.title,'del')">
+					<button class="cu-btn margin-lr-xs margin-tb-xs bg-red" v-else
+						@click="selectComCate(item.title,'del')">
 						{{item.title}}
 					</button>
 				</block>
 				<view class="padding flex flex-wrap justify-between align-center">
-				  <button class="cu-btn bg-red lg" @click="subComCate()">确定</button>
-				  <button class="cu-btn bg-gray lg" @click="toggleComCate(false)">取消</button>
+					<button class="cu-btn bg-red lg" @click="subComCate()">确定</button>
+					<button class="cu-btn bg-gray lg" @click="toggleComCate(false)">取消</button>
 				</view>
 			</view>
 		</view>
@@ -313,52 +356,137 @@
 <script>
 	var _this;
 	import avatar from "@/components/yq-avatar/yq-avatar.vue";
-	var sexPickerList = [
-		{id: 0, text: '保密'},
-		{id: 1, text: '男'},
-		{id: 2, text: '女'},
+	var sexPickerList = [{
+			id: 0,
+			text: '保密'
+		},
+		{
+			id: 1,
+			text: '男'
+		},
+		{
+			id: 2,
+			text: '女'
+		},
 	];
-	var educationPickerList = [
-		{id: 1, text: '初中及以下'},
-		{id: 2, text: '高中'},
-		{id: 3, text: '中技'},
-		{id: 4, text: '中专'},
-		{id: 5, text: '大专'},
-		{id: 6, text: '本科'},
-		{id: 7, text: '硕士'},
-		{id: 8, text: '博士'},
+	var educationPickerList = [{
+			id: 1,
+			text: '初中及以下'
+		},
+		{
+			id: 2,
+			text: '高中'
+		},
+		{
+			id: 3,
+			text: '中技'
+		},
+		{
+			id: 4,
+			text: '中专'
+		},
+		{
+			id: 5,
+			text: '大专'
+		},
+		{
+			id: 6,
+			text: '本科'
+		},
+		{
+			id: 7,
+			text: '硕士'
+		},
+		{
+			id: 8,
+			text: '博士'
+		},
 	];
-	var workexperiencePickerList = [
-		{id: 1, text: '无经验'},
-		{id: 2, text: '一年以下'},
-		{id: 3, text: '1-3年'},
-		{id: 4, text: '3-5年'},
-		{id: 5, text: '5-10年'},
-		{id: 6, text: '10年以上'}
+	var workexperiencePickerList = [{
+			id: 1,
+			text: '无经验'
+		},
+		{
+			id: 2,
+			text: '一年以下'
+		},
+		{
+			id: 3,
+			text: '1-3年'
+		},
+		{
+			id: 4,
+			text: '3-5年'
+		},
+		{
+			id: 5,
+			text: '5-10年'
+		},
+		{
+			id: 6,
+			text: '10年以上'
+		}
 	];
-	var healthPickerList = [
-		{id:1, text: '健康或良好'},
-		{id:2, text: '一般或较弱'},
-		{id:3, text: '有慢性病'},
-		{id:4, text: '残疾'}
+	var healthPickerList = [{
+			id: 1,
+			text: '健康或良好'
+		},
+		{
+			id: 2,
+			text: '一般或较弱'
+		},
+		{
+			id: 3,
+			text: '有慢性病'
+		},
+		{
+			id: 4,
+			text: '残疾'
+		}
 	];
-	var healthPickerList = [
-		{id:1, text: '健康或良好'},
-		{id:2, text: '一般或较弱'},
-		{id:3, text: '有慢性病'},
-		{id:4, text: '残疾'}
+	var healthPickerList = [{
+			id: 1,
+			text: '健康或良好'
+		},
+		{
+			id: 2,
+			text: '一般或较弱'
+		},
+		{
+			id: 3,
+			text: '有慢性病'
+		},
+		{
+			id: 4,
+			text: '残疾'
+		}
 	];
-	var comCateTypePickerList = [
-		{id:1, text: '选择项方式'},
-		{id:2, text: '手工填写方式'},
+	var comCateTypePickerList = [{
+			id: 1,
+			text: '选择项方式'
+		},
+		{
+			id: 2,
+			text: '手工填写方式'
+		},
 	];
-	var comCateTypePickerList = [
-		{id:1, text: '选择项方式'},
-		{id:2, text: '手工填写方式'},
+	var comCateTypePickerList = [{
+			id: 1,
+			text: '选择项方式'
+		},
+		{
+			id: 2,
+			text: '手工填写方式'
+		},
 	];
-	var isPublicPickerList = [
-		{id:1, text: '是'},
-		{id:2, text: '否'},
+	var isPublicPickerList = [{
+			id: 1,
+			text: '是'
+		},
+		{
+			id: 2,
+			text: '否'
+		},
 	];
 	export default {
 		components: {
@@ -367,9 +495,9 @@
 		data() {
 			return {
 				userinfo: {},
-				
+
 				formavatar: false,
-				
+
 				forminfo: {
 					isshow: "",
 					infobox: "input",
@@ -377,7 +505,7 @@
 					field: "",
 					value: ""
 				},
-				
+
 				jobintentiontypePickIndex: -1,
 				jobintentiontypePickerList: [],
 				jobintentiontypeValue: {
@@ -433,36 +561,36 @@
 			_this.getCommunity();
 			_this.getComCate();
 			_this.healthPickerList = healthPickerList;
-			if(_this.userinfo.health >= 1) {
+			if (_this.userinfo.health >= 1) {
 				_this.healthPickIndex = _this.userinfo.health - 1;
 				_this.healthValue.text = _this.healthPickerList[_this.healthPickIndex].text;
 				_this.healthValue.id = _this.healthPickerList[_this.healthPickIndex].id;
 			}
 			_this.educationPickerList = educationPickerList;
-			if(_this.userinfo.education >= 1) {
+			if (_this.userinfo.education >= 1) {
 				_this.educationPickIndex = _this.userinfo.education - 1;
 				_this.educationValue.text = _this.educationPickerList[_this.educationPickIndex].text;
 				_this.educationValue.id = _this.educationPickerList[_this.educationPickIndex].id;
 			}
 			_this.workexperiencePickerList = workexperiencePickerList;
-			if(_this.userinfo.workexperience >= 1) {
+			if (_this.userinfo.workexperience >= 1) {
 				_this.workexperiencePickIndex = _this.userinfo.workexperience - 1;
 				_this.workexperienceValue.text = _this.workexperiencePickerList[_this.workexperiencePickIndex].text;
 				_this.workexperienceValue.id = _this.workexperiencePickerList[_this.workexperiencePickIndex].id;
 			}
 			_this.comCateTypePickerList = comCateTypePickerList;
-			if(_this.userinfo.com_cate_type >= 1) {
+			if (_this.userinfo.com_cate_type >= 1) {
 				_this.comCateTypeIndex = _this.userinfo.com_cate_type - 1;
 				_this.comCateTypeValue.text = _this.comCateTypePickerList[_this.comCateTypeIndex].text;
 				_this.comCateTypeValue.id = _this.comCateTypePickerList[_this.comCateTypeIndex].id;
 			}
 			_this.isPublicPickerList = isPublicPickerList;
-			if(_this.userinfo.is_public >= 1) {
+			if (_this.userinfo.is_public >= 1) {
 				_this.isPublicIndex = _this.userinfo.is_public - 1;
 				_this.isPublicValue.text = _this.isPublicPickerList[_this.isPublicIndex].text;
 				_this.isPublicValue.id = _this.isPublicPickerList[_this.isPublicIndex].id;
 			}
-			
+
 			//数组删除值
 			Array.prototype.remove = function(val) {
 				var index = this.indexOf(val);
@@ -475,9 +603,9 @@
 			onChooseAvatar: function(e) {
 				_this.$req.ajaxFile({
 					path: "attachment/tplfieldimage",
-					title:'正在上传',
+					title: '正在上传',
 					filePath: e.detail.avatarUrl,
-					fileName:'file',
+					fileName: 'file',
 				}).then((filedata) => {
 					var data = JSON.parse(filedata.data);
 					if (data.code == 1) {
@@ -504,12 +632,14 @@
 					data: {}
 				}).then((data) => {
 					_this.jobintentiontypePickerList = data.plist;
-					if(_this.userinfo.jobintention > 0) {
-						_this.jobintentiontypePickerList.forEach((item,index) => {
-							if(item.id == _this.userinfo.jobintention) {
+					if (_this.userinfo.jobintention > 0) {
+						_this.jobintentiontypePickerList.forEach((item, index) => {
+							if (item.id == _this.userinfo.jobintention) {
 								_this.jobintentiontypePickIndex = index;
-								_this.jobintentiontypeValue.title = _this.jobintentiontypePickerList[_this.jobintentiontypePickIndex].title;
-								_this.jobintentiontypeValue.id = _this.jobintentiontypePickerList[_this.jobintentiontypePickIndex].id;
+								_this.jobintentiontypeValue.title = _this.jobintentiontypePickerList[
+									_this.jobintentiontypePickIndex].title;
+								_this.jobintentiontypeValue.id = _this.jobintentiontypePickerList[_this
+									.jobintentiontypePickIndex].id;
 							}
 						});
 					}
@@ -525,9 +655,11 @@
 			getEmpTime: function() {
 				_this.$req.ajax({
 					path: "index/getRensheCode",
-					data: {type:"emp_time"}
+					data: {
+						type: "emp_time"
+					}
 				}).then((data) => {
-					
+
 					_this.empTime = data;
 				}).catch((err) => {
 					uni.showModal({
@@ -541,9 +673,15 @@
 			getCommunity: function() {
 				_this.$req.ajax({
 					path: "index/getRensheCode",
-					data: {type:"community"}
+					data: {
+						type: "community"
+					}
 				}).then((data) => {
-					data.push({code:0,id:0,name:"不限"});
+					data.push({
+						code: 0,
+						id: 0,
+						name: "不限"
+					});
 					_this.community = data;
 				}).catch((err) => {
 					uni.showModal({
@@ -571,44 +709,45 @@
 			// 求职意向岗位修改
 			jobintentiontypePickerChange: function(e) {
 				_this.jobintentiontypePickIndex = e.detail.value;
-				_this.jobintentiontypeValue.title = _this.jobintentiontypePickerList[_this.jobintentiontypePickIndex].title;
+				_this.jobintentiontypeValue.title = _this.jobintentiontypePickerList[_this.jobintentiontypePickIndex]
+					.title;
 				_this.jobintentiontypeValue.id = _this.jobintentiontypePickerList[_this.jobintentiontypePickIndex].id;
-				_this.editFiled( "jobintention", _this.jobintentiontypeValue.id );
+				_this.editFiled("jobintention", _this.jobintentiontypeValue.id);
 			},
 			// 工作经验修改
 			workexperiencePickerChange: function(e) {
 				_this.workexperiencePickIndex = e.detail.value;
 				_this.workexperienceValue.text = _this.workexperiencePickerList[_this.workexperiencePickIndex].text;
 				_this.workexperienceValue.id = _this.workexperiencePickerList[_this.workexperiencePickIndex].id;
-				_this.editFiled( "workexperience", _this.workexperienceValue.id );
+				_this.editFiled("workexperience", _this.workexperienceValue.id);
 			},
 			// 学历修改
 			educationPickerChange: function(e) {
 				_this.educationPickIndex = e.detail.value;
 				_this.educationValue.text = _this.educationPickerList[_this.educationPickIndex].text;
 				_this.educationValue.id = _this.educationPickerList[_this.educationPickIndex].id;
-				_this.editFiled( "education", _this.educationValue.id );
+				_this.editFiled("education", _this.educationValue.id);
 			},
 			// 健康状况修改
 			healthPickerChange: function(e) {
 				_this.healthPickIndex = e.detail.value;
 				_this.healthValue.text = _this.healthPickerList[_this.healthPickIndex].text;
 				_this.healthValue.id = _this.healthPickerList[_this.healthPickIndex].id;
-				_this.editFiled( "health", _this.healthValue.id );
+				_this.editFiled("health", _this.healthValue.id);
 			},
 			// 岗位类型设置
 			comCateTypePickerChange: function(e) {
 				_this.comCateTypeIndex = e.detail.value;
 				_this.comCateTypeValue.text = _this.comCateTypePickerList[_this.comCateTypeIndex].text;
 				_this.comCateTypeValue.id = _this.comCateTypePickerList[_this.comCateTypeIndex].id;
-				_this.editFiled( "com_cate_type", _this.comCateTypeValue.id );
+				_this.editFiled("com_cate_type", _this.comCateTypeValue.id);
 			},
 			//公开电话
 			isPublicPickerChange: function(e) {
 				_this.isPublicIndex = e.detail.value;
 				_this.isPublicValue.text = _this.isPublicPickerList[_this.isPublicIndex].text;
 				_this.isPublicValue.id = _this.isPublicPickerList[_this.isPublicIndex].id;
-				_this.editFiled( "is_public", _this.isPublicValue.id );
+				_this.editFiled("is_public", _this.isPublicValue.id);
 			},
 			// 填写字段
 			hideModal: function() {
@@ -638,16 +777,16 @@
 				_this.forminfo.value = e.detail.value;
 			},
 			subModal: function() {
-				_this.editFiled( _this.forminfo.field, _this.forminfo.value );
+				_this.editFiled(_this.forminfo.field, _this.forminfo.value);
 			},
-			
+
 			// 修改头像
 			setAvatar: function(rsp) {
 				_this.$req.ajaxFile({
 					path: "attachment/tplfieldimage",
-					title:'正在上传',
+					title: '正在上传',
 					filePath: rsp.path,
-					fileName:'file',
+					fileName: 'file',
 				}).then((filedata) => {
 					var data = JSON.parse(filedata.data);
 					_this.editFiled('avatar', data.data.src);
@@ -660,39 +799,39 @@
 				});
 			},
 			//返回招聘详情
-			goCDetail: function() {				
+			goCDetail: function() {
 				_this.checkLogin("/pages/my/my");
-				if (_this.userinfo===false){
+				if (_this.userinfo === false) {
 					return false;
 				}
-				if(_this.userinfo.address==""){
+				if (_this.userinfo.address == "") {
 					uni.showToast({
 						title: '请完善您的现居住地',
-						icon:'none',
+						icon: 'none',
 						duration: 2000
 					});
 					return false;
 				}
-				if(_this.userinfo.jobintention==""){
+				if (_this.userinfo.jobintention == "") {
 					uni.showToast({
 						title: '请选择您的求职意向',
-						icon:'none',
+						icon: 'none',
 						duration: 2000
 					});
 					return false;
 				}
-				if(_this.userinfo.workexperience==""){
+				if (_this.userinfo.workexperience == "") {
 					uni.showToast({
 						title: '请选择您的工作经验',
-						icon:'none',
+						icon: 'none',
 						duration: 2000
 					});
 					return false;
 				}
-				if(_this.userinfo.education==""){
+				if (_this.userinfo.education == "") {
 					uni.showToast({
 						title: '请选择您的学历',
-						icon:'none',
+						icon: 'none',
 						duration: 2000
 					});
 					return false;
@@ -701,35 +840,36 @@
 					path: "my/perfectUserInfo",
 					data: {
 						userid: _this.userinfo.id,
-						skill_cert: _this.userinfo.skill_cert ? _this.userinfo.skill_cert.join(",") : _this.userinfo.skill_cert,
+						skill_cert: _this.userinfo.skill_cert ? _this.userinfo.skill_cert.join(",") : _this
+							.userinfo.skill_cert,
 					}
 				})
 				uni.showToast({
 					title: '修改成功',
-					icon:'none',
+					icon: 'none',
 					duration: 2000
 				});
-				setTimeout(function () {
+				setTimeout(function() {
 					uni.navigateBack();
 				}, 1500);
 			},
 			//跳转 
 			goLPage: function(pageurl) {
 				_this.userinfo = _this.checkLogin("/pages/my/my");
-				if (_this.userinfo===false){
+				if (_this.userinfo === false) {
 					return false;
 				}
 				uni.navigateTo({
 					url: pageurl,
-					fail: function(){
+					fail: function() {
 						uni.switchTab({
-						    url: pageurl
+							url: pageurl
 						});
 					}
 				});
 			},
 			// 更新用户字段
-			editFiled: function (field, value) {
+			editFiled: function(field, value) {
 				_this.$req.ajax({
 					path: "my/edituserinfo",
 					data: {
@@ -749,21 +889,21 @@
 					});
 				});
 			},
-			selectEmpTime: function (name, option) {
+			selectEmpTime: function(name, option) {
 				if (option == 'add') {
 					_this.userinfo.emp_time.push(name);
 				} else if (option == 'del') {
 					_this.userinfo.emp_time.remove(name);
 				}
 			},
-			selectCommunity: function (name, option) {
+			selectCommunity: function(name, option) {
 				if (option == 'add') {
 					_this.userinfo.work_place.push(name);
 				} else if (option == 'del') {
 					_this.userinfo.work_place.remove(name);
 				}
 			},
-			toggleFilter: function (value) {
+			toggleFilter: function(value) {
 				if (value) {
 					_this.empTimeOrigin = [..._this.userinfo.emp_time];
 				} else {
@@ -771,14 +911,14 @@
 				}
 				_this.empTimeModal = value;
 			},
-			selectComCate: function (name, option) {
+			selectComCate: function(name, option) {
 				if (option == 'add') {
 					_this.userinfo.com_cate.push(name);
 				} else if (option == 'del') {
 					_this.userinfo.com_cate.remove(name);
 				}
 			},
-			toggleComCate: function (value) {
+			toggleComCate: function(value) {
 				if (value) {
 					_this.comCateOrigin = [..._this.userinfo.com_cate];
 				} else {
@@ -786,7 +926,7 @@
 				}
 				_this.comCateModal = value;
 			},
-			toggleCommunity: function (value) {
+			toggleCommunity: function(value) {
 				if (value) {
 					_this.communityOrigin = [..._this.userinfo.work_place];
 				} else {
@@ -794,16 +934,16 @@
 				}
 				_this.communityModal = value;
 			},
-			subFilter: function () {
-				_this.editFiled( 'emp_time',_this.userinfo.emp_time );
+			subFilter: function() {
+				_this.editFiled('emp_time', _this.userinfo.emp_time);
 				_this.empTimeModal = false;
 			},
-			subCommunity: function () {
-				_this.editFiled( 'work_place',_this.userinfo.work_place );
+			subCommunity: function() {
+				_this.editFiled('work_place', _this.userinfo.work_place);
 				_this.communityModal = false;
 			},
-			subComCate: function () {
-				_this.editFiled( 'com_cate',_this.userinfo.com_cate );
+			subComCate: function() {
+				_this.editFiled('com_cate', _this.userinfo.com_cate);
 				_this.comCateModal = false;
 			},
 			// 图片上传
@@ -844,7 +984,50 @@
 	}
 </script>
 
-<style>
-	.filteremp{ width: 750rpx; position: fixed;top: 0; z-index: 999; height: 100vh; background-color:#000;background: rgba(0, 0, 0, 0.5); }
-	.filteremp .emp-box{ width: 750rpx; position: absolute;bottom: 0;}
-</style>
+<style lang="scss">
+	.filteremp {
+		width: 750rpx;
+		position: fixed;
+		top: 0;
+		z-index: 999;
+		height: 100vh;
+		background-color: #000;
+		background: rgba(0, 0, 0, 0.5);
+	}
+
+	.filteremp .emp-box {
+		width: 750rpx;
+		position: absolute;
+		bottom: 0;
+	}
+
+	.bottomEmpty {
+		margin-top: 80rpx;
+		height: 130rpx;
+	}
+
+	.bottomArea {
+		position: fixed;
+		bottom: 0;
+		z-index: 100;
+		width: 100%;
+		height: 130rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+		box-shadow: -10rpx -12rpx 12rpx 2rpx rgba(52, 85, 73, 0.16);
+
+		.bottomButton {
+			margin: 0 28rpx;
+			width: 696rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			background: #CA151C;
+			font-size: 33rpx;
+			text-align: center;
+			color: #FFFFFF;
+			border-radius: 10rpx;
+		}
+	}
+</style>

+ 5 - 5
pages/my/myteam.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		
-		<view class="padding bg-blue">
+		<view class="padding bg-themeRed">
 			<view class="text-center padding-tb">
 				<view class="text-sl padding-bottom-xs">{{redmoneyarr.status0}}</view>
 				<view>累计获得奖励(积分)</view>
@@ -14,10 +14,10 @@
 		
 		<scroll-view scroll-x class="bg-white nav solid-bottom">
 			<view class="flex text-center">
-				<view class="cu-item flex-sub" :class="status==0?'text-blue cur':''" @tap="tabSelect" data-status="0">全部</view>
-				<view class="cu-item flex-sub" :class="status==1?'text-blue cur':''" @tap="tabSelect" data-status="1">未入职</view>
-				<view class="cu-item flex-sub" :class="status==2?'text-blue cur':''" @tap="tabSelect" data-status="2">已入职</view>
-				<view class="cu-item flex-sub" :class="status==3?'text-blue cur':''" @tap="tabSelect" data-status="3">已发放</view>
+				<view class="cu-item flex-sub" :class="status==0?'text-red cur':''" @tap="tabSelect" data-status="0">全部</view>
+				<view class="cu-item flex-sub" :class="status==1?'text-red cur':''" @tap="tabSelect" data-status="1">未入职</view>
+				<view class="cu-item flex-sub" :class="status==2?'text-red cur':''" @tap="tabSelect" data-status="2">已入职</view>
+				<view class="cu-item flex-sub" :class="status==3?'text-red cur':''" @tap="tabSelect" data-status="3">已发放</view>
 			</view>
 		</scroll-view>
 

+ 3 - 3
pages/my/task.vue

@@ -20,7 +20,7 @@
 					</view>
 				</view>
 				<view class="action">
-					<button role="button" class="cu-btn bg-blue shadow" @click="goPage('/pages/my/myinfo')" v-if="is_perfect == 2">马上完善</button>
+					<button role="button" class="cu-btn bg-themeBtn shadow" @click="goPage('/pages/my/myinfo')" v-if="is_perfect == 2">马上完善</button>
 					<button role="button" class="cu-btn bg-gray shadow" v-if="is_perfect == 1">已完善</button>
 				</view>
 			</view>
@@ -36,7 +36,7 @@
 					</view>
 				</view>
 				<view class="action">
-					<button role="button" class="cu-btn bg-blue shadow" @click="goPage('/pages/my/myauth')" v-if="is_auth == 2">马上认证</button>
+					<button role="button" class="cu-btn bg-themeBtn shadow" @click="goPage('/pages/my/myauth')" v-if="is_auth == 2">马上认证</button>
 					<button role="button" class="cu-btn bg-gray shadow" v-if="is_auth == 1">已认证</button>
 				</view>
 			</view>
@@ -52,7 +52,7 @@
 					</view>
 				</view>
 				<view class="action">
-					<button role="button" class="cu-btn bg-blue shadow" @click="goNavPage('/pages/comjobs/comjobs')">找工作</button>
+					<button role="button" class="cu-btn bg-themeBtn shadow" @click="goNavPage('/pages/comjobs/comjobs')">找工作</button>
 				</view>
 			</view>
 		</view>

+ 10 - 2
pages/train/joinlist.vue

@@ -12,7 +12,7 @@
 		<view class="course">
 			<view class="courseCard" v-for="(item,index) in plist" :key="index">
 				<!-- <view class="courseLeft"></view> -->
-				<view class="courseRight">
+				<view class="courseRight" :class="index % 2 != 0 ? 'greenBorder' : 'redBorder'">
 					<view class="courseCard-header">
 						<view class="header-title">{{item.train.title}}</view>
 						<image class="header-icon" src="../../static/images/index/applyCancel.png" mode="widthFix"
@@ -219,6 +219,14 @@
 			// 	height: 100%;
 			// 	background-color: #009600;
 			// }
+			
+			.greenBorder {
+				border-left: 5px solid #009600;
+			}
+			
+			.redBorder {
+				border-left: 5px solid #CA151C;
+			}
 
 			.courseRight {
 				flex: 1;
@@ -228,7 +236,7 @@
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
-				border-left: 5px solid #009600;
+				
 
 				.courseCard-header {
 					// margin-bottom: 10rpx;

+ 212 - 47
pages/worker/shop.vue

@@ -1,10 +1,11 @@
 <template>
 	<view>
-		<view class="bg-blue" style="position: relative; height: 130rpx;">
+		<view class="bg-themeRed" style="position: relative; height: 130rpx;">
 			<view class="text-center padding-tb-lg padding-lr" style="position: absolute;">
 				<view class="cu-list menu-avatar codebox">
 					<view class="cu-item">
-						<view class="cu-avatar radius lg" v-if="shopworker!=false" :style="'background-image:url('+shopworker.tilpic+');'"></view>
+						<view class="cu-avatar radius lg" v-if="shopworker!=false"
+							:style="'background-image:url('+shopworker.tilpic+');'"></view>
 						<view class="content">
 							<view class="text-pink">
 								<view class="text-cut text-black">{{shopworker.ftitle}}</view>
@@ -14,7 +15,7 @@
 							</view>
 						</view>
 						<view class="action">
-							<button class="cu-btn bg-blue cuIcon" @tap="setAddress">
+							<button class="cu-btn bg-red cuIcon" @tap="setAddress">
 								<text class="cuIcon-locationfill"></text>
 							</button>
 						</view>
@@ -23,17 +24,17 @@
 			</view>
 		</view>
 		<view class="padding-tb-lg"></view>
-		
-		
+
+
 		<view class="cu-bar bg-white solids-bottom margin-top-sm">
 			<view class="action">
-				<text class="cuIcon-titles text-blue"></text> 企业介绍
+				<text class="cuIcon-titles text-red"></text> 企业介绍
 			</view>
 		</view>
 		<view class="padding-tb-sm padding-lr bg-white margin-bottom-sm">
 			<text>{{shopworker.details}}</text>
 		</view>
-		
+
 		<!-- <view class="padding grid flex justify-between">
 			<view class="padding-lr-xs bg-white echo-grid-item" @tap="makeTelephone" :data-telephone="shopworker.mobile">
 				<view class="bg-white padding-bottom-xs padding-top-sm padding-lr-sm"><text class="padding-right-xs cuIcon-dianhua text-orange"></text> 拨打电话</view>
@@ -50,30 +51,70 @@
 				<view class="bg-white padding-top-sm padding-bottom-xs padding-lr-sm text-sm text-gray">{{shopworker.city}} {{shopworker.district}}</view>
 			</view>
 		</view> -->
-		
-		
+
+
 		<view class="cu-bar bg-white solids-bottom" v-if="workerinfo==false">
 			<view class="action">
-				<text class="cuIcon-titles text-blue"></text> 招聘推荐
+				<text class="cuIcon-titles text-red"></text> 招聘推荐
 			</view>
 			<view class="action">
 				<text class="text-df">共 {{countarr.comjobs}} 条 </text>
 				<view class="cuIcon-right"></view>
 			</view>
 		</view>
-		
+
 		<scroll-view scroll-x class="bg-white nav" v-if="workerinfo!=false">
 			<view class="flex text-center">
-				<view class="cu-item flex-sub" :class="tablename=='comjobs'?'text-blue cur':''" @tap="tabSelect" data-tablename="comjobs">招聘 <text class="cu-tag bg-blue sm round margin-lr-sm">{{countarr.comjobs}}</text></view>
-				<view class="cu-item flex-sub" :class="tablename=='demand'?'text-blue cur':''" @tap="tabSelect" data-tablename="demand">订单 <text class="cu-tag bg-blue sm round margin-lr-sm">{{countarr.demand}}</text></view>
-				<view class="cu-item flex-sub" :class="tablename=='supply'?'text-blue cur':''" @tap="tabSelect" data-tablename="supply">供人 <text class="cu-tag bg-blue sm round margin-lr-sm">{{countarr.supply}}</text></view>
+				<view class="cu-item flex-sub" :class="tablename=='comjobs'?'text-red cur':''" @tap="tabSelect"
+					data-tablename="comjobs">招聘 <text
+						class="cu-tag bg-red sm round margin-lr-sm">{{countarr.comjobs}}</text></view>
+				<view class="cu-item flex-sub" :class="tablename=='demand'?'text-red cur':''" @tap="tabSelect"
+					data-tablename="demand">订单 <text
+						class="cu-tag bg-red sm round margin-lr-sm">{{countarr.demand}}</text></view>
+				<view class="cu-item flex-sub" :class="tablename=='supply'?'text-red cur':''" @tap="tabSelect"
+					data-tablename="supply">供人 <text
+						class="cu-tag bg-red sm round margin-lr-sm">{{countarr.supply}}</text></view>
 			</view>
 		</scroll-view>
 		<view class="solids-top">
 			<block v-if="tablename=='comjobs'">
-				<view class="cu-card dynamic no-card solid-bottom echo-comjobs-item" v-for="(item,index) in plist" :key="index">
+				<view class="listCard" v-for="(item,index) in plist" :key="index" @tap="goDetail(item.id)">
+					<view class="listCard-item">
+						<view class="item-left">
+							<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="item-right">
+							<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardD.png')"
+								mode="widthFix"></image>
+							<view class="item-content">{{item.city}}</view>
+						</view>
+					</view>
+					<view class="listCard-item">
+						<view class="item-left">
+							<image class="item-icon" src="../../static/images/comJobs/icon-sum.png"
+								mode="widthFix"></image>
+							<view class="item-content red" v-if="item.wtype==1">{{item.zwagall}}</view>
+							<view class="item-content red" v-else-if="item.wtype==5">其他</view>
+							<view class="item-content red" v-else>{{item.bwagall}}</view>
+						</view>
+						<view class="item-right">
+							<image class="item-icon" src="../../static/images/comJobs/icon-pageView.png"
+								mode="widthFix"></image>
+							<view class="item-content red">{{item.fwagall}}</view>
+						</view>
+					</view>
+					<view class="listCard-item">
+						<view v-for="(titem,tindex) in item.tags" :key="tindex"
+							class="cu-tag light bg-gray text-grey sm">{{titem}}</view>
+					</view>
+				</view>
+				<!-- <view class="cu-card dynamic no-card solid-bottom echo-comjobs-item" v-for="(item,index) in plist"
+					:key="index">
 					<view class="cu-item shadow padding-top-sm padding-bottom">
-						<view class="padding-lr padding-bottom-xs flex justify-between align-center" @tap="goDetail(item.id)">
+						<view class="padding-lr padding-bottom-xs flex justify-between align-center"
+							@tap="goDetail(item.id)">
 							<view class="basis-xl text-bold text-lg text-cut">{{item.title}}</view>
 							<view class="basis-xs text-cut text-right text-gray text-sm">{{item.city}}</view>
 						</view>
@@ -84,16 +125,51 @@
 							<view class="text-red">{{item.fwagall}}</view>
 						</view>
 						<view class="padding-lr text-cut" @tap="goDetail(item.id)">
-							<view v-for="(titem,tindex) in item.tags" :key="tindex" class="cu-tag light bg-blue sm echo-tags-item">{{titem}}</view>
+							<view v-for="(titem,tindex) in item.tags" :key="tindex"
+								class="cu-tag light bg-red sm echo-tags-item">{{titem}}</view>
 						</view>
 					</view>
-				</view>
+				</view> -->
 			</block>
-			
+
 			<block v-if="tablename=='demand'">
-				<view class="cu-card dynamic no-card solid-bottom echo-demand-item" v-for="(item,index) in plist" :key="index">
+				<view class="listCard" v-for="(item,index) in plist" :key="index" @tap="goDetail(item.id)">
+					<view class="listCard-item">
+						<view class="item-left">
+							<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="item-right">
+							<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardD.png')"
+								mode="widthFix"></image>
+							<view class="item-content">{{item.city}}</view>
+						</view>
+					</view>
+					<view class="listCard-item">
+						<view class="item-left">
+							<image class="item-icon" src="../../static/images/comJobs/icon-sum.png"
+								mode="widthFix"></image>
+							<view class="item-content red" v-if="item.wtype==1">{{item.zwagall}}</view>
+							<view class="item-content red" v-else-if="item.wtype==5">其他</view>
+							<view class="item-content red" v-else>{{item.bwagall}}</view>
+						</view>
+						<!-- <view class="item-right">
+							<image class="item-icon" src="../../static/images/comJobs/icon-pageView.png"
+								mode="widthFix"></image>
+							<view class="item-content red">{{item.fwagall}}</view>
+						</view> -->
+					</view>
+					<view class="listCard-item">
+						<view v-for="(titem,tindex) in item.tags" :key="tindex"
+							class="cu-tag light bg-gray text-grey sm">{{titem}}</view>
+					</view>
+				</view>
+				<!-- <view class="cu-card dynamic no-card solid-bottom echo-demand-item" v-for="(item,index) in plist"
+					:key="index">
 					<view class="cu-item shadow padding-top-sm padding-bottom">
-						<view class="padding-lr padding-bottom-xs flex justify-between align-center" @tap="goDetail(item.id)">
+						<view class="padding-lr padding-bottom-xs flex justify-between align-center"
+							@tap="goDetail(item.id)">
 							<view class="basis-lg text-bold text-lg text-cut">{{item.title}}</view>
 							<view class="basis-sm text-cut text-right text-gray text-sm">{{item.city}}</view>
 						</view>
@@ -103,21 +179,26 @@
 							<view v-else><text class="text-red text-bold">{{item.bwagall}}</text></view>
 						</view>
 						<view class="padding-lr text-cut" @tap="goDetail(item.id)">
-							<view v-for="(titem,tindex) in item.tags" :key="tindex" class="cu-tag light bg-gray text-grey sm">{{titem}}</view>
+							<view v-for="(titem,tindex) in item.tags" :key="tindex"
+								class="cu-tag light bg-gray text-grey sm">{{titem}}</view>
 						</view>
 					</view>
-				</view>
+				</view> -->
 			</block>
-			
+
 			<block v-if="tablename=='supply'">
-				<view class="cu-card dynamic no-card solid-bottom echo-supply-item" v-for="(item,index) in plist" :key="index">
+				<view class="cu-card dynamic no-card solid-bottom echo-supply-item" v-for="(item,index) in plist"
+					:key="index">
 					<view class="cu-item shadow padding-top-sm padding-bottom" @tap="goDetail(item.id)">
 						<view class="padding-lr padding-bottom-sm flex justify-between align-center">
-							<view class="basis-xl text-bold text-lg text-cut"><text v-if="item.mnumber>0"> 男{{item.mnumber}}人,</text><text v-if="item.wnumber>0"> 女{{item.wnumber}}人</text>【{{item.agegroup}}】</view>
+							<view class="basis-xl text-bold text-lg text-cut"><text v-if="item.mnumber>0">
+									男{{item.mnumber}}人,</text><text v-if="item.wnumber>0">
+									女{{item.wnumber}}人</text>【{{item.agegroup}}】</view>
 							<view class="basis-xs text-cut text-right text-gray text-sm">{{item.updatetime_text}}</view>
 						</view>
 						<view class="padding-lr padding-bottom-sm text-cut text-gray text-sm">
-							{{item.province}} {{item.city}} <text class="cuIcon-move margin-lr-xs text-gray"></text> {{item.descity}}
+							{{item.province}} {{item.city}} <text class="cuIcon-move margin-lr-xs text-gray"></text>
+							{{item.descity}}
 						</view>
 						<view class="padding-lr text-sm text-gray"> 可到岗日期:{{item.candate}} </view>
 					</view>
@@ -139,15 +220,15 @@
 			return {
 				userinfo: false,
 				workerinfo: false,
-				
+
 				shopworker: false,
 				countarr: {
 					comjobs: 0,
 					demand: 0,
 					supply: 0
 				},
-				
-				
+
+
 				tablename: 'comjobs',
 				pstatus: 'more',
 				ppage: 1,
@@ -195,8 +276,9 @@
 		onShareAppMessage: function(res) {
 			return {
 				title: _this.shopworker.title,
-				path: "/pages/worder/shop?workerid=" + _this.shopworker.id + "&parentid=" + _this.userinfo == false ? 0 : _this.userinfo.id
-		    }
+				path: "/pages/worder/shop?workerid=" + _this.shopworker.id + "&parentid=" + _this.userinfo == false ?
+					0 : _this.userinfo.id
+			}
 		},
 		onPullDownRefresh: function() {
 			_this.pageRefresh();
@@ -216,9 +298,9 @@
 			},
 			getMore: function() {
 				var path = "worker/shopcomjobs";
-				if (_this.tablename=="demand"){
+				if (_this.tablename == "demand") {
 					path = "worker/shopdemand";
-				}else if(_this.tablename=="supply"){
+				} else if (_this.tablename == "supply") {
 					path = "worker/shopsupply";
 				}
 				_this.$req.ajax({
@@ -241,22 +323,22 @@
 					});
 				});
 			},
-			
+
 			tabSelect: function(e) {
 				_this.tablename = e.currentTarget.dataset.tablename;
 				_this.pageRefresh();
 			},
-			
+
 			goDetail: function(id) {
-				if (_this.tablename=="demand"){
+				if (_this.tablename == "demand") {
 					uni.navigateTo({
 						url: '/pages/demand/detail?demandid=' + id
 					});
-				}else if(_this.tablename=="supply"){
+				} else if (_this.tablename == "supply") {
 					uni.navigateTo({
 						url: '/pages/supply/detail?supplyid=' + id
 					});
-				}else{
+				} else {
 					uni.navigateTo({
 						url: '/pages/comjobs/detail?comjobsid=' + id
 					});
@@ -272,8 +354,9 @@
 					latitude: parseFloat(_this.shopworker.latitude),
 					longitude: parseFloat(_this.shopworker.longitude),
 					name: _this.shopworker.title,
-					address: _this.shopworker.city + " " + _this.shopworker.district + " " + _this.shopworker.address,
-					success: function () {
+					address: _this.shopworker.city + " " + _this.shopworker.district + " " + _this.shopworker
+						.address,
+					success: function() {
 						console.log('success');
 					}
 				});
@@ -288,20 +371,102 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.codebox {
 		width: 690rpx;
 		margin: 0rpx auto 0rpx auto;
 		border-radius: 8rpx;
 		overflow: hidden;
 	}
-	
-	.codebox>view{
+
+	.codebox>view {
 		margin-top: 20rpx;
 	}
-	
-	.echo-grid-item{
+
+	.echo-grid-item {
 		width: 220rpx;
 		height: 140rpx;
 	}
-</style>
+
+	.listCard {
+		margin: 0 20rpx 40rpx;
+		padding: 28rpx 24rpx 0;
+		background: #FFFFFF;
+		border-radius: 12rpx;
+
+		.listCard-item {
+			display: flex;
+			margin-bottom: 28rpx;
+
+			.item-left {
+				width: 60%;
+				display: flex;
+
+				.item-icon {
+					width: 35rpx;
+					height: 35rpx;
+				}
+
+				.item-content {
+					flex: 1;
+					margin-left: 15rpx;
+					font-size: 28rpx;
+					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: 600;
+					color: #CA151C;
+				}
+			}
+
+			.item-right {
+				width: 35%;
+				margin-left: 15rpx;
+				display: flex;
+
+				.item-icon {
+					width: 35rpx;
+					height: 35rpx;
+				}
+
+				.item-content {
+					flex: 1;
+					margin-left: 15rpx;
+					font-size: 28rpx;
+					line-height: 35rpx;
+					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: 600;
+					color: #CA151C;
+				}
+			}
+		}
+	}
+</style>

二進制
static/images/broker/broker.png


二進制
static/images/broker/contact.png


二進制
static/images/broker/组 317@2x.png


二進制
static/images/comJobs/apply.png


二進制
static/images/index/cardA.png


二進制
static/images/index/cardB.png


二進制
static/images/index/cardC.png


二進制
static/images/index/cardD.png


二進制
static/images/index/jobhunter.png


二進制
static/images/index/recruiter.png


二進制
static/images/index/service.png


二進制
static/images/index/tabFourA.png


二進制
static/images/index/tabFourB.png


二進制
static/images/index/tabOneA.png


二進制
static/images/index/tabOneB.png


二進制
static/images/index/tabThreeA.png


二進制
static/images/index/tabThreeB.png


二進制
static/images/index/tabTwoA.png


二進制
static/images/index/tabTwoB.png


二進制
static/images/index/topMenuA.png


二進制
static/images/index/topMenuB.png


二進制
static/images/index/topMenuC.png


二進制
static/images/index/topMenuD.png


二進制
static/images/my/about.png


二進制
static/images/my/apply.png


二進制
static/images/my/code.png


二進制
static/images/my/collect.png


二進制
static/images/my/cultivate.png


二進制
static/images/my/empty.png


二進制
static/images/my/exchange.png


二進制
static/images/my/feedback.png


二進制
static/images/my/infor.png


二進制
static/images/my/invitation.png


二進制
static/images/my/invite.png


二進制
static/images/my/myTopBg.png


二進制
static/images/my/notice.png


二進制
static/images/my/recruit.png


二進制
static/images/my/task.png


二進制
static/images/my/verify.png


二進制
static/images/my/verifyName.png


二進制
static/images/my/wallet.png


二進制
static/images/tabbar/璺緞 -14@3x.png


二進制
static/images/tabbar/璺緞 -15@3x.png


二進制
static/images/tabbar/璺緞 -16@3x.png


二進制
static/images/tabbar/璺緞 -17@3x.png


二進制
static/images/tabbar/璺緞 184@3x.png


二進制
static/images/tabbar/璺緞 188@3x.png


二進制
static/images/tabbar/璺緞 55@3x.png


二進制
static/images/tabbar/璺緞 57@3x.png


二進制
static/tabbar/broker.png


二進制
static/tabbar/brokerSelected.png


二進制
static/tabbar/index.png


二進制
static/tabbar/indexSelected.png


二進制
static/tabbar/jobs.png


二進制
static/tabbar/jobsSelected.png


二進制
static/tabbar/my.png


二進制
static/tabbar/mySelected.png