冲突

h5_web/pages.json

@@ -1,260 +1,259 @@
 {
-	"easycom": {
-		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	},
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationStyle": "custom", // 隐藏系统导航栏
-				"navigationBarTitleText": "首页"
-			}
-		}, {
-			"path": "pages/mycode/mycode",
-			"style": {
-				"navigationBarTitleText": "退役军人码"
-			}
-
+		"easycom": {
+			"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 		},
-		{
-			"path": "pages/authentication/authentication",
-			"style": {
-				"navigationBarTitleText": "退役军人职业教育码申请"
-			}
+		"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+			{
+				"path": "pages/index/index",
+				"style": {
+					"navigationStyle": "custom", // 隐藏系统导航栏
+					"navigationBarTitleText": "首页"
+				}
+			}, {
+				"path": "pages/mycode/mycode",
+				"style": {
+					"navigationBarTitleText": "退役军人码"
+				}
 
-		},
-		{
-			"path": "pages/phoneLogin/phoneLogin",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "手机登录"
-			}
-		},
-		{
-			"path": "pages/bannerDetails/bannerDetails",
-			"style": {
-				"navigationBarTitleText": "详情页"
-			}
+			},
+			{
+				"path": "pages/authentication/authentication",
+				"style": {
+					"navigationBarTitleText": "退役军人职业教育码申请"
+				}
 
-		}, {
-			"path": "pages/policyNews/policyNews",
-			"style": {
-				"navigationBarTitleText": "政策资讯"
+			},
+			{
+				"path": "pages/phoneLogin/phoneLogin",
+				"style": {
+					"navigationStyle": "custom",
+					"navigationBarTitleText": "手机登录"
+				}
+			},
+			{
+				"path": "pages/bannerDetails/bannerDetails",
+				"style": {
+					"navigationBarTitleText": "详情页"
+				}
 
-			}
+			}, {
+				"path": "pages/policyNews/policyNews",
+				"style": {
+					"navigationBarTitleText": "政策资讯"
 
-		}, {
-			"path": "pages/policyNewsDetails/policyNewsDetails",
-			"style": {
-				"navigationBarTitleText": "文章详情"
+				}
 
-			}
+			}, {
+				"path": "pages/policyNewsDetails/policyNewsDetails",
+				"style": {
+					"navigationBarTitleText": "文章详情"
 
-		}, {
-			"path": "pages/newsDetails/newsDetails",
-			"style": {
-				"navigationBarTitleText": "文章详情"
-			}
+				}
 
-		},
-		{
-			"path": "pages/login/code",
-			"style": {
-				"navigationBarTitleText": "验证码"
-			}
-		},
-		{
-			"path": "pages/mine/mine",
-			"style": {
-				"navigationBarTitleText": "个人中心",
-				"navigationStyle": "custom"
-			}
+			}, {
+				"path": "pages/newsDetails/newsDetails",
+				"style": {
+					"navigationBarTitleText": "文章详情"
+				}
 
-		},
-		{
-			"path": "pages/center/center",
-			"style": {
-				"navigationBarTitleText": "中心",
-				"enablePullDownRefresh": false
-			}
+			},
+			{
+				"path": "pages/login/code",
+				"style": {
+					"navigationBarTitleText": "验证码"
+				}
+			},
+			{
+				"path": "pages/mine/mine",
+				"style": {
+					"navigationBarTitleText": "个人中心",
+					"navigationStyle": "custom"
+				}
 
-		}, {
-			"path": "pages/privacyPolicy/privacyPolicy",
-			"style": {
-				"navigationBarTitleText": "隐私政策"
-			}
+			},
+			{
+				"path": "pages/center/center",
+				"style": {
+					"navigationBarTitleText": "中心",
+					"enablePullDownRefresh": false
+				}
 
-		}, {
-			"path": "pages/schools/schools",
-			"style": {
-				"navigationBarTitleText": "学院列表"
-			}
-		}, {
-			"path": "pages/skillsTraining/skillsTraining",
-			"style": {
-				"navigationBarTitleText": "技能培训"
-			}
-		}, {
-			"path": "pages/basicTraining/basicTraining",
-			"style": {
-				"navigationBarTitleText": "适应性培训"
-			}
-		}, {
-			"path": "pages/basicTraining/myBasicTraining/myBasicTraining",
-			"style": {
-				"navigationBarTitleText": "我的适应性培训"
-			}
-		}, {
-			"path": "pages/basicTraining/basicTrainingDetails/basicTrainingDetails",
-			"style": {
-				"navigationBarTitleText": "在线上课"
-			}
-		}, {
-			"path": "pages/upgrade/upgrade",
-			"style": {
-				"navigationBarTitleText": "学历提升"
-			}
-		}, {
-			"path": "pages/inbuild/inbuild",
-			"style": {
-				"navigationBarTitleText": "建设中"
-			}
-		}, {
-			"path": "pages/recruitment/recruitment",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "招聘就业"
-			}
-		}, {
-			"path": "pages/myResume/myResume",
-			"style": {
-				"navigationBarTitleText": "简历",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#2a82e4",
-				"navigationBarTextStyle": "white"
-			}
+			}, {
+				"path": "pages/privacyPolicy/privacyPolicy",
+				"style": {
+					"navigationBarTitleText": "隐私政策"
+				}
 
-		}, {
-			"path": "pages/dynamicTracking/dynamicTracking",
-			"style": {
-				"navigationBarTitleText": "全链条动态跟踪",
-				"enablePullDownRefresh": false
-			}
+			}, {
+				"path": "pages/schools/schools",
+				"style": {
+					"navigationBarTitleText": "学院列表"
+				}
+			}, {
+				"path": "pages/skillsTraining/skillsTraining",
+				"style": {
+					"navigationBarTitleText": "技能培训"
+				}
+			}, {
+				"path": "pages/basicTraining/basicTraining",
+				"style": {
+					"navigationBarTitleText": "适应性培训"
+				}
+			}, {
+				"path": "pages/basicTraining/myBasicTraining/myBasicTraining",
+				"style": {
+					"navigationBarTitleText": "我的适应性培训"
+				}
+			}, {
+				"path": "pages/basicTraining/basicTrainingDetails/basicTrainingDetails",
+				"style": {
+					"navigationBarTitleText": "在线上课"
+				}
+			}, {
+				"path": "pages/upgrade/upgrade",
+				"style": {
+					"navigationBarTitleText": "学历提升"
+				}
+			}, {
+				"path": "pages/inbuild/inbuild",
+				"style": {
+					"navigationBarTitleText": "建设中"
+				}
+			}, {
+				"path": "pages/recruitment/recruitment",
+				"style": {
+					"navigationStyle": "custom",
+					"navigationBarTitleText": "招聘就业"
+				}
+			}, {
+				"path": "pages/myResume/myResume",
+				"style": {
+					"navigationBarTitleText": "简历",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#2a82e4",
+					"navigationBarTextStyle": "white"
+				}
 
-		}, {
-			"path": "pages/personalModify/personalModify",
-			"style": {
-				"navigationBarTitleText": "个人资料修改",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#fff"
-			}
-
-		}, {
-			"path": "pages/evaluationIntention/evaluationIntention",
-			"style": {
-				"navigationBarTitleText": "求职意向自我评价",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
+			}, {
+				"path": "pages/dynamicTracking/dynamicTracking",
+				"style": {
+					"navigationBarTitleText": "全链条动态跟踪",
+					"enablePullDownRefresh": false
+				}
 
-		}, {
-			"path": "pages/myDelivery/myDelivery",
-			"style": {
-				"navigationBarTitleText": "我的投递",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#fff"
-			}
+			}, {
+				"path": "pages/personalModify/personalModify",
+				"style": {
+					"navigationBarTitleText": "个人资料修改",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#fff"
+				}
 
-		}, {
-			"path": "pages/jodDetails/jodDetails",
-			"style": {
-				"navigationBarTitleText": "职位详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#fff"
-			}
+			}, {
+				"path": "pages/evaluationIntention/evaluationIntention",
+				"style": {
+					"navigationBarTitleText": "求职意向自我评价",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
 
-		}, {
-			"path": "pages/myInterview/myInterview",
-			"style": {
-				"navigationBarTitleText": "我的面试",
-				"enablePullDownRefresh": false
-			}
+			}, {
+				"path": "pages/myDelivery/myDelivery",
+				"style": {
+					"navigationBarTitleText": "我的投递",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#fff"
+				}
 
-		}, {
-			"path": "pages/mySkillsTraining/mySkillsTraining",
-			"style": {
-				"navigationBarTitleText": "我的技能培训",
-				"enablePullDownRefresh": false
-			}
+			}, {
+				"path": "pages/myInterview/myInterview",
+				"style": {
+					"navigationBarTitleText": "我的面试",
+					"enablePullDownRefresh": false
+				}
 
-		}, {
-			"path": "pages/myEvaluation/myEvaluation",
-			"style": {
-				"navigationBarTitleText": "我的评价",
-				"enablePullDownRefresh": false
-			}
+			}, {
+				"path": "pages/mySkillsTraining/mySkillsTraining",
+				"style": {
+					"navigationBarTitleText": "我的技能培训",
+					"enablePullDownRefresh": false
+				}
 
-		}, {
-			"path": "pages/setting/setting",
-			"style": {
-				"navigationBarTitleText": "设置",
-				"enablePullDownRefresh": false
-			}
+			}, {
+				"path": "pages/myEvaluation/myEvaluation",
+				"style": {
+					"navigationBarTitleText": "我的评价",
+					"enablePullDownRefresh": false
+				}
 
-		}, {
-			"path": "pages/progressiveIntegral/progressiveIntegral",
-			"style": {
-				"navigationBarTitleText": "进步积分",
-				"enablePullDownRefresh": false
-			}
+			}, {
+				"path": "pages/setting/setting",
+				"style": {
+					"navigationBarTitleText": "设置",
+					"enablePullDownRefresh": false
+				}
 
-		}, {
-			"path": "pages/cooperativeEnterprise/cooperativeEnterprise",
-			"style": {
-				"navigationBarTitleText": "企业列表",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
-			}
+			}, {
+				"path": "pages/progressiveIntegral/progressiveIntegral",
+				"style": {
+					"navigationBarTitleText": "进步积分",
+					"enablePullDownRefresh": false
+				}
 
-		}, {
-			"path": "pages/businessDetails/businessDetails",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white",
-				"backgroundColor": "#f2f2f2"
-			}
+			}, {
+				"path": "pages/cooperativeEnterprise/cooperativeEnterprise",
+				"style": {
+					"navigationBarTitleText": "企业列表",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#3D5D4C",
+					"navigationBarTextStyle": "white"
+				}
 
+			}, {
+				"path": "pages/businessDetails/businessDetails",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#3D5D4C",
+					"navigationBarTextStyle": "white",
+					"backgroundColor": "#f2f2f2"
+				}
+			}, {
+				"path": "pages/jobDetails/jobDetails",
+				"style": {
+					"navigationBarTitleText": "职位详情",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#3D5D4C",
+					"navigationBarTextStyle": "#FFFFFF"
+				}
+			}
+		],
+		"globalStyle": {
+			"navigationBarTextStyle": "black",
+			"navigationBarTitleText": "uni-app",
+			"navigationBarBackgroundColor": "#F2F2F2",
+			"backgroundColor": "#F2F2F2"
+		},
+		"tabBar": {
+			"color": "#909399",
+			"selectedColor": "#303133",
+			"borderStyle": "black",
+			"backgroundColor": "#ffffff",
+			"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/icons/index-gray.png",
+				"selectedIconPath": "static/icons/index.png",
+				"text": "首页"
+			}, {
+				"pagePath": "pages/mycode/mycode",
+				"iconPath": "static/icons/code-gray.png",
+				"selectedIconPath": "static/icons/code.png",
+				"text": "退役军人码"
+			}, {
+				"pagePath": "pages/mine/mine",
+				"iconPath": "static/icons/mine-gray.png",
+				"selectedIconPath": "static/icons/mine.png",
+				"text": "我"
+			}]
 		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F2F2F2",
-		"backgroundColor": "#F2F2F2"
-	},
-	"tabBar": {
-		"color": "#909399",
-		"selectedColor": "#303133",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-			"pagePath": "pages/index/index",
-			"iconPath": "static/icons/index-gray.png",
-			"selectedIconPath": "static/icons/index.png",
-			"text": "首页"
-		}, {
-			"pagePath": "pages/mycode/mycode",
-			"iconPath": "static/icons/code-gray.png",
-			"selectedIconPath": "static/icons/code.png",
-			"text": "退役军人码"
-		}, {
-			"pagePath": "pages/mine/mine",
-			"iconPath": "static/icons/mine-gray.png",
-			"selectedIconPath": "static/icons/mine.png",
-			"text": "我"
-		}]
-	}
 }

h5_web/pages/jobDetails/jobDetails.vue

@@ -0,0 +1,30 @@
+<!-- 
+ * @title 职位详情 
+ * @author Rockery(1113269755@qq.com)
+-->
+
+<template>
+	<view class="jobdetails">
+    <view class="">职位详情</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			};
+		},
+		onLoad(param) {
+      console.log("jobDetails-onLoad: ",param);
+		},
+		onShow() {
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+  @import './scss/jobDetails.scss';
+</style>

h5_web/pages/jodDetails/jodDetails.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		职位详情
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

h5_web/pages/recruitment/recruitment.vue

@@ -67,12 +67,21 @@
     
     <view class="recruitment-dataarea">
     	<u-tabs bg-color="transparent" :list="dataAreaTabsList" @change="dataAreaTabsChange" :current="dataAreaTabsCurrent" />
-      <view class="recruitment-dataarea-card">
-        <view class="">
-          djkhdsjkhsd
+      <view class="recruitment-dataarea-card" v-for="(item,index) in recommendListData" :key="index" @tap="tapDataAreaCard(item)">
+        <view class="dataarea-card-left">
+          <u-image width="101rpx" height="101rpx" :src="item.img" mode="aspectFill"></u-image>
         </view>
-        <view class="">
-          sjhjshs
+        <view class="dataarea-card-content">
+          <view class="dataarea-content-left">
+            <view>{{item.postName}}</view>
+            <view class="content">{{item.postContent}}</view>
+            <view >{{item.postCompany}}</view>
+          </view>
+          <view class="dataarea-content-right">
+            <view>{{item.postWage}}</view>
+            <view>&nbsp;</view>
+            <view>{{item.deadline}}</view>
+          </view>
         </view>
       </view>
     </view>
@@ -94,37 +103,67 @@
         		id:1,
         		img:"https://img.xiaopiu.com/userImages/img88517697eccbd8.jpg",
         		subject:"顺丰快递",
-            postNumber: 10
+            postNumber: 10,
+            postCompany: '顺丰速运有限公司贵州分公司',
+            postName: '快递员',
+            postContent: '云岩区｜经验不限｜中等专科',
+            postWage: '4.0k-8.0k',
+            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
         	},
         	{
         		id:2,
         		img:"https://img.xiaopiu.com/userImages/img88317697ec8588.jpg",
         		subject:"中国平安",
-            postNumber: 14
+            postNumber: 14,
+            postCompany: '中国平安贵州分公司',
+            postName: '保险员',
+            postContent: '贵州省｜经验不限｜中等专科',
+            postWage: '4.0k-8.0k',
+            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
         	},
         	{
         		id:3,
         		img:"https://img.xiaopiu.com/userImages/img205717698ca4710.png",
         		subject:"保利贵州",
-            postNumber: 8
+            postNumber: 8,
+            postCompany: '保利贵州酒店管理有限公司',
+            postName: '保安员',
+            postContent: '贵州省｜经验不限｜中等专科',
+            postWage: '4.0k-8.0k',
+            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
         	},
         	{
         		id:4,
         		img:"https://img.xiaopiu.com/userImages/img87917697ec0c70.png",
         		subject:"海大装饰",
-            postNumber: 18
+            postNumber: 18,
+            postCompany: '海大装饰有限公司',
+            postName: '设计师',
+            postContent: '贵州省  | 设计师经验 | 中等专科',
+            postWage: '4.0k-8.0k',
+            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
         	},
         	{
         		id:5,
         		img:"https://img.xiaopiu.com/userImages/img87717697ebe178.jpg",
         		subject:"永辉超市",
-            postNumber: 10
+            postNumber: 10,
+            postCompany: '永辉超市有限公司',
+            postName: '收银员',
+            postContent: '贵州省  | 相关经验 | 中等专科',
+            postWage: '4.0k-8.0k',
+            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
         	},
         	{
         		id:5,
         		img:"https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
         		subject:"研发测试岗位",
-            postNumber: 99
+            postNumber: 99,
+            postCompany: '智能科技有限公司',
+            postName: '研发员',
+            postContent: '贵州省｜经验不限｜中等专科',
+            postWage: '4.0k-8.0k',
+            deadline: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
         	}
         ],
         recommendConfigData:{
@@ -224,6 +263,15 @@
       dataAreaTabsChange(index) {
         console.log("dataAreaTabsChange: ",index);
       	this.dataAreaTabsCurrent = index;
+      },
+      tapDataAreaCard(param){
+        console.log("tapDataAreaCard: ",param);
+        this.$u.route({
+        	url: 'pages/jobDetails/jobDetails',
+        	params: {
+        	  item: JSON.stringify(param)
+        	}
+        });
       }
 		}
 	}

h5_web/pages/recruitment/scss/recruitment.scss

@@ -93,12 +93,82 @@ page{background-color: #f2f2f2;}
   
   &-dataarea{
     padding: 0 30rpx;
+    width: 100%;
     
     &-card{
+      display: flex;
+      flex-wrap: wrap;
       margin-top: 20rpx;
+      padding: 5%;
       width: 100%;
       background-color: #FFFFFF;
       border-radius: 10px;
+      
+      .dataarea-card-content{
+        margin-left: 4%;
+        width: 80%;
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        
+        .dataarea-content-left{
+          view:first-child{
+            margin-bottom: 9rpx;
+            font-size: 30rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: bold;
+            color: #000000;
+            line-height: 42rpx;
+            letter-spacing: 1px;
+          }
+          
+          .content{
+            margin-bottom: 9rpx;
+            font-size: 22rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #9B9B9B;
+            line-height: 30rpx;
+            letter-spacing: 1px;
+          }
+          
+          view:last-child{
+            font-size: 22rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #BBBBBB;
+            line-height: 30rpx;
+            letter-spacing: 1px;
+          }
+        }
+        
+        .dataarea-content-right{
+          view:first-child{
+            margin-bottom: 55rpx;
+            text-align: right;
+            font-size: 22rpx;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #EE5A10;
+            line-height: 30rpx;
+            letter-spacing: 1px;
+          }
+          
+          view:last-child{
+            text-align: right;
+            font-size: 22rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #BCBCBC;
+            line-height: 30rpx;
+            letter-spacing: 1px;
+          }
+        }
+      }
+      
+      &:last-child{
+        margin-bottom: 40rpx;
+      }
     }
   }
 }