jiangzixin 1 год назад
Родитель
Сommit
762e971773
41 измененных файлов с 450 добавлено и 185 удалено
  1. 17 16
      main.js
  2. 34 18
      pages/broker/center.vue
  3. 115 58
      pages/comjobs/comjobs.vue
  4. 33 11
      pages/comjobs/log.vue
  5. 1 1
      pages/demand/demand.vue
  6. 154 46
      pages/index/home.vue
  7. 45 2
      pages/my/my.vue
  8. 1 0
      pages/my/myauth.vue
  9. 1 1
      pages/resume/resume.vue
  10. 2 2
      pages/supply/supply.vue
  11. 28 12
      pages/worker/shop.vue
  12. 19 18
      pages/worker/worker.vue
  13. BIN
      static/images/broker/code.png
  14. BIN
      static/images/broker/order.png
  15. BIN
      static/images/broker/record.png
  16. BIN
      static/images/broker/topBg.png
  17. BIN
      static/images/index/employer.png
  18. BIN
      static/images/index/jobhunter.png
  19. BIN
      static/images/index/recruiter.png
  20. BIN
      static/images/worker/verified.png
  21. BIN
      static/images/worker/worker_comjobs.png
  22. BIN
      static/images/worker/worker_demand.png
  23. BIN
      static/images/worker/worker_icon1.png
  24. BIN
      static/images/worker/worker_icon2.png
  25. BIN
      static/images/worker/worker_supply.png
  26. BIN
      static/images/worker/workernav1.png
  27. BIN
      static/images/worker/workernav13.png
  28. BIN
      static/images/worker/workernav2.png
  29. BIN
      static/images/worker/workernav3.png
  30. BIN
      static/images/worker/workernav4.png
  31. BIN
      static/images/worker/workernav6.png
  32. BIN
      static/images/worker/workernav8.png
  33. BIN
      static/images/worker/workernav9.png
  34. BIN
      static/tabbar/resume.png
  35. BIN
      static/tabbar/resumeSelected.png
  36. BIN
      static/tabbar/wdemand.png
  37. BIN
      static/tabbar/wdemandSelected.png
  38. BIN
      static/tabbar/windex.png
  39. BIN
      static/tabbar/windexSelected.png
  40. BIN
      static/tabbar/wsupply.png
  41. BIN
      static/tabbar/wsupplySelected.png

+ 17 - 16
main.js

@@ -14,21 +14,24 @@ Vue.component('wxContact', wxContact);
 App.mpType = 'app';
 
 const app = new Vue({
-    ...App
+	...App
 });
 app.$mount();
 
 // request 接口设置
-import {req} from '@/common/request/request.js';
+import {
+	req
+} from '@/common/request/request.js';
 // let baseUrl = 'http://bd.odd_job.com/';
 let baseUrl = 'https://linggong.jinjianghc.com/';
+// let baseUrl = 'https://linggong.jiangzi.xin/';
 req.baseuUrl = baseUrl + 'mainapp.php/';
 
 req.defaultReq.type = "GET";
-req.defaultReq.baseData={      //设置公共参数,默认为空,设置此参数后每次发送请求都会带上此参数
-    access_token: uni.getStorageSync('access_token') || ""
+req.defaultReq.baseData = { //设置公共参数,默认为空,设置此参数后每次发送请求都会带上此参数
+	access_token: uni.getStorageSync('access_token') || ""
 }
-req.defaultReq.beforeFinsh=(res)=>{
+req.defaultReq.beforeFinsh = (res) => {
 	// console.log("res: " + JSON.stringify(res)); 
 	if (res.data.code == 0) {
 		return res.data.data;
@@ -37,22 +40,20 @@ req.defaultReq.beforeFinsh=(res)=>{
 	}
 
 }
-Vue.prototype.$req = req;   //挂载到原型上
+Vue.prototype.$req = req; //挂载到原型上
 
 // 判断登录
-Vue.prototype.checkLogin = function(backpage){
-    const userinfo = uni.getStorageSync('userinfo') || null;
-    if(userinfo == null){
-        uni.navigateTo({
+Vue.prototype.checkLogin = function(backpage) {
+	const userinfo = uni.getStorageSync('userinfo') || null;
+	if (userinfo == null) {
+		uni.navigateTo({
 			url: "/pages/login/login?backpage=" + encodeURIComponent(backpage)
 		});
-        return false;
-    }
-    return userinfo;
+		return false;
+	}
+	return userinfo;
 }
 
 Vue.prototype.$getImageUrl = function(url) {
 	return baseUrl + url;
-}
-
-
+}

+ 34 - 18
pages/broker/center.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image :src="$getImageUrl('static/images/applet/brokerCenter.jpg')" class="header-image" mode="widthFix"></image>
+		<image src="../../static/images/broker/topBg.png" class="header-image" mode="widthFix"></image>
 		<view class="cu-bar bg-white solid-bottom">
 			<view class="action">
 				<text class="cuIcon-title text-orange "></text> 我的收益
@@ -21,31 +21,32 @@
 		</view>
 		<view class="cu-bar bg-white solid-bottom margin-top">
 			<view class="action">
-				<text class="cuIcon-title text-orange "></text> 我的下线
+				<text class="cuIcon-title text-orange "></text> 我发展的用户
 			</view>
 		</view>
 		<view class="lw-table">
 			<view class="lw-table-item padding" @click="goNavPage('/pages/broker/myuser')">
 				<view class="lw-table-value text-bold text-black">{{statistics.user}}</view>
-				<view class="lw-table-title text-gray padding-top-xs">我的用户</view>
+				<view class="lw-table-title text-gray padding-top-xs">求职用户</view>
 			</view>
 			<view class="lw-table-item padding" @click="goNavPage('/pages/broker/myworker')">
 				<view class="lw-table-value text-bold text-black">{{statistics.worker}}</view>
-				<view class="lw-table-title text-gray padding-top-xs">我的雇主</view>
+				<view class="lw-table-title text-gray padding-top-xs">雇主用户</view>
 			</view>
 		</view>
 		<view class="cu-list grid col-3 no-border margin-top">
 			<view class="cu-item text-center" @click="goNavPage('/pages/broker/broker')">
-				<image class="myicon" :src="$getImageUrl('static/images/applet/myicon02.png')"></image>
-				<text>邀请码</text>
+				<image class="myicon" src="../../static/images/broker/code.png" style="width: 50rpx;height: 50rpx;"></image>
+				<text>我的邀请码</text>
 			</view>
 			<view class="cu-item text-center" @click="goNavPage('/pages/broker/myorder')">
-				<image class="myicon" :src="$getImageUrl('static/images/applet/myicon04.png')"></image>
-				<text>订单信息</text>
+				<image class="myicon" src="../../static/images/broker/order.png" style="width: 50rpx;height: 50rpx;"></image>
+				<text>劳务订单</text>
+				<view style="color: #888;font-size: 26rpx;">(针对劳务机构)</view>
 			</view>
 			<view class="cu-item text-center" @click="goNavPage('/pages/my/myentry')">
-				<image class="myicon" :src="$getImageUrl('static/images/applet/shebao.png')"></image>
-				<text>报备记录</text>
+				<image class="myicon" src="../../static/images/broker/record.png" style="width: 50rpx;height: 50rpx;"></image>
+				<text>悬赏报备记录</text>
 			</view>
 		</view>
 	</view>
@@ -66,11 +67,11 @@
 				},
 			};
 		},
-		onLoad: function(){
+		onLoad: function() {
 			_this = this;
 			_this.userinfo = uni.getStorageSync('userinfo') || false;
 			_this.brokerinfo = uni.getStorageSync('brokerinfo') || false;
-			if (_this.userinfo===false || _this.brokerinfo===false){
+			if (_this.userinfo === false || _this.brokerinfo === false) {
 				uni.reLaunch({
 					url: "/pages/my/my"
 				});
@@ -97,7 +98,7 @@
 			},
 			goNavPage: function(pageurl) {
 				_this.userinfo = _this.checkLogin("/pages/my/my");
-				if (_this.userinfo===false){
+				if (_this.userinfo === false) {
 					return false;
 				}
 				uni.navigateTo({
@@ -114,8 +115,23 @@
 </script>
 
 <style scoped>
-	.header-image {width:750rpx;}
-	.lw-table {display: flex;align-items: center;justify-content: space-around;background: white;padding:20rpx 0;}
-	.lw-table .lw-table-item {text-align: center;}
-	.lw-table .lw-table-value {font-size:40rpx;}
-</style>
+	.header-image {
+		width: 750rpx;
+	}
+
+	.lw-table {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		background: white;
+		padding: 20rpx 0;
+	}
+
+	.lw-table .lw-table-item {
+		text-align: center;
+	}
+
+	.lw-table .lw-table-value {
+		font-size: 40rpx;
+	}
+</style>

+ 115 - 58
pages/comjobs/comjobs.vue

@@ -56,7 +56,8 @@
 							<view class="solid-bottom padding-lr-sm padding-tb-sm" @click="checkArea(4,0)">全部</view>
 							<block v-for="(item,index) in arealist.data" :key="index">
 								<view class="solid-bottom padding-lr-sm padding-tb-sm" @click="checkArea(1,index)">
-									{{item.title}}</view>
+									{{item.title}}
+								</view>
 							</block>
 						</scroll-view>
 					</view>
@@ -65,7 +66,8 @@
 							<view class="solid-bottom text-gray padding-lr-sm padding-tb-sm">选择区县</view>
 							<block v-for="(item,index) in arealist.cityarr" :key="index">
 								<view class="solid-bottom padding-lr-sm padding-tb-sm" @click="checkArea(2,index)">
-									{{item.title}}</view>
+									{{item.title}}
+								</view>
 							</block>
 						</scroll-view>
 					</view>
@@ -74,7 +76,8 @@
 							<view class="solid-bottom text-gray padding-lr-sm padding-tb-sm">选择镇街</view>
 							<block v-for="(item,index) in arealist.districtarr" :key="index">
 								<view class="solid-bottom padding-lr-sm padding-tb-sm" @click="checkArea(3,index)">
-									{{item.title}}</view>
+									{{item.title}}
+								</view>
 							</block>
 						</scroll-view>
 					</view>
@@ -85,24 +88,30 @@
 		<view class="comjobsList">
 			<view class="listCard" v-for="(item,index) in plist" :key="index" @tap="goDetail(item.id)">
 				<view class="listCard-item">
-					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardA.png')"
-						mode="widthFix"></image>
-					<view class="item-content bold">{{item.title}}</view>
-				</view>
-				<view class="listCard-item short">
-					<image class="item-icon" src="../../static/images/comJobs/icon-sum.png"
-						mode="widthFix"></image>
-					<view class="item-content red">{{item.zwagall}}</view>
+					<view class="item-left">
+						<image class="item-left-icon" :src="$getImageUrl('static/images/applet/index/cardA.png')"
+							mode="widthFix"></image>
+						<view class="item-left-content bold">{{item.title}}</view>
+					</view>
+					<view class="item-right">
+						<image class="item-right-icon" src="../../static/images/comJobs/icon-sum.png" mode="widthFix"></image>
+						<view class="item-right-content red">{{item.zwagall}}</view>
+					</view>
 				</view>
-				<view class="listCard-item bottom">
-					<image class="item-icon" :src="$getImageUrl('static/images/applet/index/cardD.png')"
-						mode="widthFix"></image>
-					<view class="item-content">地点:{{item.address}}</view>
+				<view class="listCard-itemTag">
+					<view v-for="(titem,tindex) in item.tags" :key="tindex" class="tag-item">{{titem}}</view>
 				</view>
-				<view class="listCard-item short bottom">
-					<image class="item-icon" src="../../static/images/comJobs/icon-pageView.png"
-						mode="widthFix"></image>
-					<view class="item-content">浏览量:{{item.volume}}</view>
+				<view class="listCard-item">
+					<view class="item-left">
+						<image class="item-left-icon" :src="$getImageUrl('static/images/applet/index/cardD.png')"
+							mode="widthFix"></image>
+						<view class="item-left-content">地点:{{item.address}}</view>
+					</view>
+					<view class="item-right">
+						<image class="item-right-icon" src="../../static/images/comJobs/icon-pageView.png" mode="widthFix">
+						</image>
+						<view class="item-right-content">浏览量:{{item.volume}}</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -445,53 +454,101 @@
 			padding: 28rpx 24rpx;
 			background: #FFFFFF;
 			border-radius: 12rpx;
-			display: flex;
-			flex-wrap: wrap;
+			
+			.listCard-itemTag {
+				display: flex;
+				flex-wrap: wrap;
+				margin: 28rpx 0 8rpx;
+			
+				.tag-item {
+					margin-right: 15rpx;
+					background: #E6F2FF;
+					font-size: 20rpx;
+					color: #CA151C;
+					padding: 5rpx 12rpx;
+					margin-bottom: 20rpx;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+				}
+			}
 
 			.listCard-item {
-				width: 60%;
 				display: flex;
 				align-items: center;
-
-				.item-icon {
-					width: 35rpx;
-					height: 35rpx;
+				
+				.item-left {
+					width: 60%;
+					display: flex;
+					
+					.item-left-icon {
+						width: 35rpx;
+						height: 35rpx;
+					}
+					
+					.item-left-content {
+						flex: 1;
+						margin-left: 15rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #747474;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						-webkit-line-clamp: 1;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+					}
+					
+					.bold {
+						font-size: 28rpx;
+						font-weight: 600;
+						color: #383838;
+					}
+					
+					.red {
+						font-size: 28rpx;
+						font-weight: 500;
+						color: #CA151C;
+					}
 				}
-
-				.item-content {
-					flex: 1;
+				
+				.item-right {
+					width: 35%;
 					margin-left: 15rpx;
-					font-size: 28rpx;
-					font-weight: 400;
-					color: #747474;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					-webkit-line-clamp: 1;
-					display: -webkit-box;
-					-webkit-box-orient: vertical;
-				}
-
-				.bold {
-					font-size: 28rpx;
-					font-weight: 600;
-					color: #383838;
-				}
-
-				.red {
-					font-size: 28rpx;
-					font-weight: 500;
-					color: #CA151C;
+					display: flex;
+					
+					.item-right-icon {
+						width: 35rpx;
+						height: 35rpx;
+					}
+					
+					.item-right-content {
+						flex: 1;
+						margin-left: 15rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #747474;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						-webkit-line-clamp: 1;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+					}
+					
+					.bold {
+						font-size: 28rpx;
+						font-weight: 600;
+						color: #383838;
+					}
+					
+					.red {
+						font-size: 28rpx;
+						font-weight: 500;
+						color: #CA151C;
+					}
 				}
 			}
-
-			.short {
-				width: 35%;
-				margin-left: 15rpx;
-			}
-
-			.bottom {
-				margin-top: 28rpx;
-			}
 		}
 	}
 </style>

+ 33 - 11
pages/comjobs/log.vue

@@ -16,10 +16,11 @@
 				<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 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="listCardlog-item">
 				<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>
@@ -30,9 +31,8 @@
 					<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 class="listCardlog-tag">
+				<view v-for="(titem,tindex) in item.comjobs.tags" :key="tindex" class="tag-item">{{titem}}</view>
 			</view>
 			<view class="listCardlog-item">
 				<view class="item-left">
@@ -45,6 +45,7 @@
 					<view class="item-content small">浏览量:{{item.comjobs.volume}}</view>
 				</view>
 			</view>
+			<view style="height: 1rpx;"></view>
 		</view>
 
 		<block v-for="(item,index) in plist" :key="index" v-if="false">
@@ -190,20 +191,41 @@
 <style lang="scss">
 	.listCardlog {
 		margin: 0 20rpx 40rpx;
-		padding: 28rpx 24rpx;
+		padding: 28rpx 24rpx 0;
 		background-color: #FFFFFF;
 		border-radius: 12rpx;
 
+		.listCardlog-tag {
+			display: flex;
+			flex-wrap: wrap;
+
+			.tag-item {
+				margin-left: 15rpx;
+				background: #E6F2FF;
+				font-size: 20rpx;
+				color: #CA151C;
+				padding: 5rpx 12rpx;
+				margin-bottom: 20rpx;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
+		}
+
+
 		.listCardlog-item {
 			display: flex;
+			margin-bottom: 28rpx;
 
 			.item-left {
 				width: 60%;
 				display: flex;
+				align-items: center;
 
 				.item-icon {
-					width: 35rpx;
-					height: 35rpx;
+					width: 30rpx;
+					height: 30rpx;
 					margin-right: 15rpx;
 				}
 
@@ -238,8 +260,8 @@
 				justify-content: flex-end;
 
 				.item-icon {
-					width: 35rpx;
-					height: 35rpx;
+					width: 30rpx;
+					height: 30rpx;
 					margin-right: 15rpx;
 				}
 
@@ -266,7 +288,7 @@
 					font-weight: 600;
 					color: #CA151C;
 				}
-				
+
 				.small {
 					font-size: 24rpx;
 				}

+ 1 - 1
pages/demand/demand.vue

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

+ 154 - 46
pages/index/home.vue

@@ -1,23 +1,45 @@
 <template>
 	<view class="page">
-		
-		<view class="bg-white homepage">
+		<view class="cardList">
+			<view class="card cardBg-bule" @tap="checkWorker">
+				<image class="card-avatar" src="../../static/images/index/employer.png"></image>
+				<view class="card-content">
+					<view class="content-title">我是雇主</view>
+					<view class="content-explain">为企业招聘人才</view>
+				</view>
+			</view>
+			<!-- <view class="card cardBg-green">
+				<image class="card-avatar" src="../../static/images/index/recruiter.png"></image>
+				<view class="card-content">
+					<view class="content-title">我是经纪人</view>
+					<view class="content-explain">推荐人才入职领赏金</view>
+				</view>
+			</view> -->
+			<view class="card cardBg-red" @tap="goUser">
+				<image class="card-avatar" src="../../static/images/index/jobhunter.png"></image>
+				<view class="card-content">
+					<view class="content-title">我是求职者</view>
+					<view class="content-explain">寻找更好的发展</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- <view class="bg-white homepage">
 			<view>
 				<view class="" @tap="checkWorker">
 					<view class="padding"></view>
-					<image mode="widthFix" style="width: 300rpx;" src="../../static/images/index/recruiter.png"></image>
-					<!-- <image mode="widthFix" style="width: 100%;" :src="zqtop"></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: 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> -->
+					<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>
 				</view>
 			</view>
-		</view>
-	
+		</view> -->
+
 		<view class="cu-modal" :class="modalName=='workerModal'?'show':''">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -27,10 +49,11 @@
 					</view>
 				</view>
 				<view class="padding-tb-sm">
-					
+
 					<view class="cu-list menu">
 						<block v-if="workerall!=null">
-							<view class="cu-item arrow" v-for="(item,index) in workerall" :key="index" @tap="goWorker" :data-index="index">
+							<view class="cu-item arrow" v-for="(item,index) in workerall" :key="index" @tap="goWorker"
+								:data-index="index">
 								<view class="content text-left">
 									<text class="cuIcon-settings text-grey"></text>
 									<text>{{item.title}}</text>
@@ -56,11 +79,11 @@
 							</view>
 						</view>
 					</view>
-					
+
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="cu-modal" :class="modalName=='apptreatyModal'?'show':''">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -68,7 +91,8 @@
 				</view>
 				<view class="padding-tb-sm">
 					<scroll-view class="xy-content text-left" scroll-y>
-						<text>请你务必审慎阅读、充分理解“用户服务协议”和“隐私政策”各条款,包括但不限于:为了向你提供即时招聘讯息、内容分享等服务,我们需要收集你的设备信息、操作日志等个人信息。</text> <br/>
+						<text>请你务必审慎阅读、充分理解“用户服务协议”和“隐私政策”各条款,包括但不限于:为了向你提供即时招聘讯息、内容分享等服务,我们需要收集你的设备信息、操作日志等个人信息。</text>
+						<br />
 						<view>你可阅读
 							<text class="text-blue" @tap="goPage('/pages/tool/sinpage?field=service')">《用户服务协议》</text>
 							和<text class="text-blue" @tap="goPage('/pages/tool/sinpage?field=privacy')">《隐私政策》</text>
@@ -85,7 +109,7 @@
 			</view>
 		</view>
 
-		
+
 	</view>
 </template>
 
@@ -98,10 +122,10 @@
 				userinfo: false,
 				workerinfo: null,
 				workerall: null,
-				
+
 				modalName: null,
 				apptreaty: "",
-				
+
 				zqtop: '',
 				zqbottom: ''
 			}
@@ -112,13 +136,13 @@
 			_this.identityinfo = uni.getStorageSync('identityinfo') || false;
 			_this.userinfo = uni.getStorageSync('userinfo') || false;
 			_this.workerinfo = uni.getStorageSync('workerinfo') || null;
-			if (_this.identityinfo==true && _this.workerinfo!=null){
+			if (_this.identityinfo == true && _this.workerinfo != null) {
 				uni.reLaunch({
 					url: "/pages/worker/worker"
 				});
 				return;
 			}
-			if (_this.identityinfo==true){
+			if (_this.identityinfo == true) {
 				uni.reLaunch({
 					url: "/pages/index/index"
 				});
@@ -127,12 +151,12 @@
 			_this.$req.ajax({
 				path: "index/gethomedata",
 				data: {
-					userid: _this.userinfo==false ? 0 : _this.userinfo.id
+					userid: _this.userinfo == false ? 0 : _this.userinfo.id
 				}
 			}).then((data) => {
 				_this.apptreaty = data.apptreaty;
 				_this.workerall = data.workerall;
-				
+
 				// #ifdef APP-PLUS
 				_this.modalName = uni.getStorageSync('apptreatyModal') || "apptreatyModal";
 				// #endif  
@@ -143,13 +167,13 @@
 					showCancel: false
 				});
 			});
-			
+
 		},
 		onShareAppMessage: function(res) {
 			return {
 				title: "晋江人力",
 				path: "/pages/index/home"
-		    }
+			}
 		},
 		methods: {
 			// 获取图片
@@ -167,7 +191,7 @@
 				_this.modalName = null;
 			},
 			outApptreaty: function() {
-				plus.runtime.quit();  
+				plus.runtime.quit();
 			},
 			goPage: function(pageurl) {
 				uni.navigateTo({
@@ -179,10 +203,10 @@
 					}
 				});
 			},
-			
-			
+
+
 			checkWorker: function() {
-				if (_this.workerall=='null'){
+				if (_this.workerall == 'null') {
 					uni.navigateTo({
 						url: "/pages/login/worker"
 					});
@@ -195,7 +219,7 @@
 			},
 			goWorker: function(e) {
 				var index = e.currentTarget.dataset.index;
-				if (_this.workerall[index].status==1){
+				if (_this.workerall[index].status == 1) {
 					// uni.showModal({
 					// 	title: '信息提示',
 					// 	content: "信息审核中,请耐心等待。",
@@ -209,15 +233,15 @@
 					url: "/pages/worker/worker"
 				});
 			},
-			
-			
+
+
 			goLogin: function(wtype) {
 				uni.setStorageSync('identityinfo', true);
 				uni.navigateTo({
-					url: "/pages/login/worker?wtype="+wtype
+					url: "/pages/login/worker?wtype=" + wtype
 				});
 			},
-			
+
 			goUser: function() {
 				_this.userinfo = _this.checkLogin("/pages/index/index");
 				uni.setStorageSync('identityinfo', true);
@@ -230,22 +254,106 @@
 	}
 </script>
 
-<style>
-	page{ background-color:#fffff6; text-align: center;}
-	bg-color{ background-color:#fffff6;}
-	.homepage{ height: calc(100vh); background-repeat: no-repeat; background-size: 100%; background-position: bottom center;  }
-	.homepage image{ width: 100%; }
-	.homepage image.homebg{ width: 750rpx; position: fixed; bottom: 0rpx; }
-	
-	.homebox{  }
-	.homebox image{ width: 280rpx; }
-	
-	.xy-content{padding:10rpx 30rpx; background:#F6F6F6; line-height:50rpx; font-size:28rpx; text-align: justify; box-sizing:border-box;}
-	.padding{ padding: 40rpx;}
+<style lang="scss">
+	page {
+		background-color: #fffff6;
+		text-align: center;
+	}
+
+	bg-color {
+		background-color: #fffff6;
+	}
+
+	.homepage {
+		height: calc(100vh);
+		background-repeat: no-repeat;
+		background-size: 100%;
+		background-position: bottom center;
+	}
+
+	.homepage image {
+		width: 100%;
+	}
+
+	.homepage image.homebg {
+		width: 750rpx;
+		position: fixed;
+		bottom: 0rpx;
+	}
+
+	.homebox {}
+
+	.homebox image {
+		width: 280rpx;
+	}
+
+	.xy-content {
+		padding: 10rpx 30rpx;
+		background: #F6F6F6;
+		line-height: 50rpx;
+		font-size: 28rpx;
+		text-align: justify;
+		box-sizing: border-box;
+	}
+
+	.padding {
+		padding: 40rpx;
+	}
+
 	.padding15 {
 		padding: 15rpx;
 	}
+
 	.padding10 {
 		padding: 10rpx;
 	}
-</style>
+
+	.cardList {
+		padding: 30rpx 18rpx;
+
+		.cardBg-bule {
+			box-shadow: 0rpx 0rpx 10rpx 2rpx rgba(73, 128, 209, 0.3);
+		}
+
+		.cardBg-green {
+			box-shadow: 0rpx 0rpx 10rpx 2rpx rgba(19, 192, 180, 0.3);
+		}
+
+		.cardBg-red {
+			box-shadow: 0rpx 0rpx 10rpx 2rpx rgba(230, 66, 88, 0.3);
+		}
+
+		.card {
+			margin-bottom: 16rpx;
+			padding: 0 46rpx;
+			width: 100%;
+			height: 224rpx;
+			background: #FFFFFF;
+			border-radius: 14rpx;
+			display: flex;
+			align-items: center;
+
+			.card-avatar {
+				width: 172rpx;
+				height: 172rpx;
+			}
+
+			.card-content {
+				margin-left: 54rpx;
+
+				.content-title {
+					margin-bottom: 12rpx;
+					font-size: 30rpx;
+					font-weight: 600;
+					color: #747474;
+				}
+
+				.content-explain {
+					font-size: 24rpx;
+					font-weight: normal;
+					color: #747474;
+				}
+			}
+		}
+	}
+</style>

+ 45 - 2
pages/my/my.vue

@@ -61,6 +61,13 @@
 			<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="teacher" @click="goLPage('/pages/resident/resident')" v-if="resident != null">
+			<view class="teacher-left">
+				<image class="left-icon" :src="$getImageUrl('static/images/applet/index/topApplyIcon.png')"></image>
+			</view>
+			<view class="teacher-center">驻场老师</view>
+		</view>
 
 		<view class="topMenu">
 			<view class="topMenu-item" @click="goLPage('/pages/my/mybag')">
@@ -826,7 +833,7 @@
 		border-radius: 15rpx;
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
+		// justify-content: space-between;
 
 		.topApply-left {
 			width: 62rpx;
@@ -843,7 +850,8 @@
 		}
 
 		.topApply-center {
-			margin-left: -120rpx;
+			flex: 1;
+			margin-left: 20rpx;
 			height: 50rpx;
 			padding: 0 20rpx;
 			border-left: 2rpx solid rgba(255, 232, 171, 0.16);
@@ -864,4 +872,39 @@
 			color: #3F3852;
 		}
 	}
+	
+	.teacher {
+		margin: 30rpx 20rpx;
+		padding: 10rpx 30rpx;
+		// height: 141rpx;
+		background: linear-gradient(270deg, #484353 0%, #6F6F6F 100%);
+		border-radius: 15rpx;
+		display: flex;
+		align-items: center;
+		// justify-content: space-between;
+		
+		.teacher-left {
+			width: 62rpx;
+			height: 62rpx;
+			border-radius: 50%;
+			box-shadow: 0rpx 4rpx 8rpx 2rpx rgba(0, 0, 0, 0.3);
+			opacity: 1;
+		
+			.left-icon {
+				width: 62rpx;
+				height: 62rpx;
+				border-radius: 50%;
+			}
+		}
+		
+		.teacher-center {
+			margin-left: 20rpx;
+			height: 50rpx;
+			padding: 0 20rpx;
+			border-left: 2rpx solid rgba(255, 232, 171, 0.16);
+			font-size: 26rpx;
+			line-height: 50rpx;
+			color: #E0E0E0;
+		}
+	}
 </style>

+ 1 - 0
pages/my/myauth.vue

@@ -340,6 +340,7 @@
 		color: #ff1a25;
 		border-radius: 50rpx;
 		border: 1rpx solid #ff1a25;
+		box-shadow: 0rpx 0rpx 10rpx 4rpx rgba(255, 73, 100, 0.3);
 	}
 	
 	.bottomEmpty {

+ 1 - 1
pages/resume/resume.vue

@@ -87,7 +87,7 @@
 				录视频
 			</view>
 			<!-- #endif -->
-			<view class="action text-blue" @tap="goNavPage('/pages/resume/resume')">
+			<view class="action text-red" @tap="goNavPage('/pages/resume/resume')">
 				<view class="cuIcon-cu-image">
 					<image src="../../static/tabbar/resumeSelected.png"></image>
 				</view>

+ 2 - 2
pages/supply/supply.vue

@@ -66,7 +66,7 @@
 				</view>
 				简历
 			</view>
-			<view class="action text-blue" @tap="goNavPage('/pages/supply/supply')">
+			<view class="action text-red" @tap="goNavPage('/pages/supply/supply')">
 				<view class="cuIcon-cu-image">
 					<image src="../../static/tabbar/wsupplySelected.png"></image>
 				</view>
@@ -78,7 +78,7 @@
 					<image src="../../static/tabbar/wworker.png"></image>
 				</view>
 				企业1
-			</view>
+			</view> 
 			-->
 		</view>
 		<wxContact></wxContact>

+ 28 - 12
pages/worker/shop.vue

@@ -93,8 +93,8 @@
 					</view>
 					<view class="listCard-item">
 						<view class="item-left">
-							<image class="item-icon" src="../../static/images/comJobs/icon-sum.png"
-								mode="widthFix"></image>
+							<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>
@@ -105,9 +105,8 @@
 							<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 class="listCard-tag">
+						<view v-for="(titem,tindex) in item.tags" :key="tindex" class="tag-item">{{titem}}</view>
 					</view>
 				</view>
 				<!-- <view class="cu-card dynamic no-card solid-bottom echo-comjobs-item" v-for="(item,index) in plist"
@@ -148,8 +147,8 @@
 					</view>
 					<view class="listCard-item">
 						<view class="item-left">
-							<image class="item-icon" src="../../static/images/comJobs/icon-sum.png"
-								mode="widthFix"></image>
+							<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>
@@ -160,9 +159,8 @@
 							<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 class="listCard-tag">
+						<view v-for="(titem,tindex) in item.tags" :key="tindex" class="tag-item">{{titem}}</view>
 					</view>
 				</view>
 				<!-- <view class="cu-card dynamic no-card solid-bottom echo-demand-item" v-for="(item,index) in plist"
@@ -389,11 +387,29 @@
 	}
 
 	.listCard {
-		margin: 0 20rpx 40rpx;
-		padding: 28rpx 24rpx 0;
+		margin: 0 20rpx 20rpx;
+		padding: 20rpx 24rpx 0;
 		background: #FFFFFF;
 		border-radius: 12rpx;
 
+		.listCard-tag {
+			display: flex;
+			flex-wrap: wrap;
+
+			.tag-item {
+				margin-right: 15rpx;
+				background: #E6F2FF;
+				font-size: 20rpx;
+				color: #CA151C;
+				padding: 5rpx 12rpx;
+				margin-bottom: 20rpx;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
+		}
+
 		.listCard-item {
 			display: flex;
 			margin-bottom: 28rpx;

+ 19 - 18
pages/worker/worker.vue

@@ -16,18 +16,19 @@
 						</view>
 					</view>
 					<view class="text-gray text-sm flex" v-else>
-						<view class="cu-capsule round margin-right-sm">
+						<image src="../../static/images/worker/verified.png" style="width: 120rpx;" mode="widthFix"></image>
+						<!-- <view class="cu-capsule round margin-right-sm">
 							<view class="cu-tag sm bg-blue">
 								<text class="cuIcon-safe"></text>
 							</view>
 							<view class="cu-tag sm line-blue">已认证</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="btnbox action text-right text-lg">
-					<image :src="$getImageUrl('static/images/applet/worker_icon1.png')" class="iconimage"
+					<image src="../../static/images/worker/worker_icon1.png" class="iconimage"
 						@tap="getShopCode" v-if="appplatform!='ios'"></image>
-					<image :src="$getImageUrl('static/images/applet/worker_icon2.png')" class="iconimage"
+					<image src="../../static/images/worker/worker_icon2.png" class="iconimage"
 						data-pageurl="/pages/worker/winfo" @click="goPage"></image>
 
 					<!-- <text class="cuIcon cuIcon-share padding-xs round" @tap="getShopCode"></text>
@@ -67,7 +68,7 @@
 			<view class="cu-list grid col-1 no-border shadow shadow-lg radius echo-grid"
 				style="padding: 0rpx !important;" v-if="workerinfo.wtype==1">
 				<view class="cu-item" data-pageurl="/pages/worker/wcomform" @tap="goPage">
-					<image :src="$getImageUrl('static/images/applet/worker_comjobs.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/worker_comjobs.png" mode="scaleToFill"></image>
 					<text>发布招聘</text>
 				</view>
 				<!-- <view class="cu-item" data-pageurl="/pages/mall/mall" @tap="goPage">
@@ -79,15 +80,15 @@
 			<view class="cu-list grid col-3 no-border shadow shadow-lg radius echo-grid"
 				style="padding: 0rpx !important;" v-else>
 				<view class="cu-item" data-pageurl="/pages/worker/wcomform" @tap="goPage">
-					<image :src="$getImageUrl('static/images/applet/worker_comjobs.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/worker_comjobs.png" mode="scaleToFill"></image>
 					<text>发布招聘</text>
 				</view>
 				<view class="cu-item" data-pageurl="/pages/demand/demandform" @tap="goPage">
-					<image :src="$getImageUrl('static/images/applet/worker_demand.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/worker_demand.png" mode="scaleToFill"></image>
 					<text>发布派遣</text>
 				</view>
 				<view class="cu-item" data-pageurl="/pages/supply/supplyform" @tap="goPage">
-					<image :src="$getImageUrl('static/images/applet/worker_supply.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/worker_supply.png" mode="scaleToFill"></image>
 					<text>发布供人</text>
 				</view>
 				<!-- <view class="cu-item" data-pageurl="/pages/mall/mall" @tap="goPage">
@@ -105,37 +106,37 @@
 		<view class="padding-lr margin-tb-sm">
 			<view class="cu-list grid col-3 no-border shadow shadow-lg radius echo-grid workernav-grid">
 				<view class="cu-item" data-pageurl="/pages/worker/wcomlist" @tap="goPage">
-					<image :src="$getImageUrl('static/images/applet/workernav1.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/workernav1.png" mode="scaleToFill"></image>
 					<text>我的招聘</text>
 				</view>
 
 				<view class="cu-item" data-pageurl="/pages/worker/invite" @tap="goPage">
-					<image :src="$getImageUrl('static/images/applet/workernav8.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/workernav8.png" mode="scaleToFill"></image>
 					<text>我的邀请</text>
 				</view>
 
 				<view v-if="workerinfo.wtype==2" class="cu-item" data-pageurl="/pages/demand/wdemandlist" @tap="goPage">
-					<image :src="$getImageUrl('static/images/applet/workernav3.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/workernav3.png" mode="scaleToFill"></image>
 					<text>派遣订单</text>
 				</view>
 
 				<view class="cu-item" data-pageurl="/pages/supply/wsupplylist" @tap="goPage" v-if="workerinfo.wtype==2">
-					<image :src="$getImageUrl('static/images/applet/workernav2.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/workernav2.png" mode="scaleToFill"></image>
 					<text>我的供人</text>
 				</view>
 
 				<view class="cu-item" data-pageurl="/pages/worker/wcomlog" @tap="goPage">
-					<image :src="$getImageUrl('static/images/applet/workernav6.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/workernav6.png" mode="scaleToFill"></image>
 					<text>招聘报名记录</text>
 				</view>
 
 				<view class="cu-item" data-pageurl="/pages/worker/wreportlist" @tap="goPage">
-					<image :src="$getImageUrl('static/images/applet/workernav3.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/workernav13.png" mode="scaleToFill"></image>
 					<text>悬赏记录</text>
 				</view>
 
 				<view class="cu-item" data-pageurl="/pages/demand/snatch" @tap="goPage" v-if="workerinfo.wtype==2">
-					<image :src="$getImageUrl('static/images/applet/workernav4.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/workernav4.png" mode="scaleToFill"></image>
 					<text>我接的派遣</text>
 				</view>
 
@@ -167,7 +168,7 @@
 				</view>
 				-->
 				<view class="cu-item" data-pageurl="/pages/worker/wshare" @tap="goPage" v-if="appplatform!='ios'">
-					<image :src="$getImageUrl('static/images/applet/workernav9.png')" mode="scaleToFill"></image>
+					<image src="../../static/images/worker/workernav9.png" mode="scaleToFill"></image>
 					<text>获客海报</text>
 				</view>
 
@@ -189,7 +190,7 @@
 		<!-- <view class="padding-sm"></view> -->
 		<view class="padding-lg"></view>
 		<view class="cu-bar tabbar bg-white foot">
-			<view class="action text-blue" @tap="goNavPage('/pages/worker/worker')">
+			<view class="action text-red" @tap="goNavPage('/pages/worker/worker')">
 				<view class="cuIcon-cu-image">
 					<image src="../../static/tabbar/windexSelected.png"></image>
 				</view>
@@ -231,7 +232,7 @@
 			-->
 		</view>
 
-		<button class="cu-btn bg-blue lg shadow echo-gohome" @tap="goHome"> 切换身份 </button>
+		<button class="cu-btn bg-themeBtn lg shadow echo-gohome" @tap="goHome"> 切换身份 </button>
 
 		<wxContact></wxContact>
 		<view class="padding-xl"></view>

BIN
static/images/broker/code.png


BIN
static/images/broker/order.png


BIN
static/images/broker/record.png


BIN
static/images/broker/topBg.png


BIN
static/images/index/employer.png


BIN
static/images/index/jobhunter.png


BIN
static/images/index/recruiter.png


BIN
static/images/worker/verified.png


BIN
static/images/worker/worker_comjobs.png


BIN
static/images/worker/worker_demand.png


BIN
static/images/worker/worker_icon1.png


BIN
static/images/worker/worker_icon2.png


BIN
static/images/worker/worker_supply.png


BIN
static/images/worker/workernav1.png


BIN
static/images/worker/workernav13.png


BIN
static/images/worker/workernav2.png


BIN
static/images/worker/workernav3.png


BIN
static/images/worker/workernav4.png


BIN
static/images/worker/workernav6.png


BIN
static/images/worker/workernav8.png


BIN
static/images/worker/workernav9.png


BIN
static/tabbar/resume.png


BIN
static/tabbar/resumeSelected.png


BIN
static/tabbar/wdemand.png


BIN
static/tabbar/wdemandSelected.png


BIN
static/tabbar/windex.png


BIN
static/tabbar/windexSelected.png


BIN
static/tabbar/wsupply.png


BIN
static/tabbar/wsupplySelected.png