Merge branch 'master' of https://gitee.com/beiwu/jobslink-user-clent

pages/news/policyList.vue

@@ -11,7 +11,7 @@
 		<view class="newPeojectList">
 			<view style="background-color: #fff;padding: 20rpx 30rpx;">
 				<view v-for="(item,index) in policyContentList" :key="index" style="display: flex;align-items: center;padding: 20rpx 0;border-bottom:1rpx solid #ddd;" @click="toArticleDetail(item.id)">
-					<!-- <image :src="item.headPic" style="width: 80rpx;height: 80rpx;margin-right: 20rpx;border-radius: 10rpx;" mode=""></image> -->
+					<image src="../../static/img/policy_icon.png" style="width: 60rpx;height:60rpx;margin-right: 20rpx;border-radius: 10rpx;" mode=""></image>
 					<view style="font-size: 32rpx;">{{ item.name }}</view>
 				</view>
 			</view>

pages/project/project.vue

@@ -164,7 +164,7 @@ export default {
 			open: false,
 			showPopUp: false,
 
-			nonReactiveArray: ["推荐任务", "推荐岗位", "推荐招工"],
+			nonReactiveArray: ["推荐任务", "推荐岗位", "个体户招工"],
 		}
 	},
 	onLoad: function () {
@@ -499,7 +499,7 @@ export default {
 
 .typeButton {
 	font-size: 14px;
-	padding: 10rpx 40rpx;
+	padding: 10rpx 30rpx;
 	background: #fff;
 	border-radius: 50px;
 	margin-right: 10rpx;

pages/recruit/recruit.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="container">
 		<view class="select">请选择</view>
-		<view class="select-text">您是个体招工还是企业招工</view>
+		<view class="select-text">您是个体户招工还是企业招工</view>
 		<view class="block" @click="next(0)">
 			<img src="../../static/img/zhao_icon1.png" alt="" />
-			<view class="block-text">个体招工</view>
+			<view class="block-text">个体户招工</view>
 		</view>
 		<view class="block" @click="next(1)">
 			<img src="../../static/img/zhao_icon2.png" alt="" />

pages/recruit/subPage/index.vue

@@ -16,7 +16,7 @@
                 </view>
             </view>
             <view class="cond_list" v-else>
-               <view style="font-weight: 700;">个体招工</view>
+               <view style="font-weight: 700;">个体户招工</view>
             </view>
             <view 
                 class="cond_item item_com"
@@ -47,10 +47,11 @@
         }, {
             text: "发布岗位",
             id: 1
-        }, {
-            text: "个体招工",
-            id: 2
         }
+		// , {
+  //           text: "个体户招工",
+  //           id: 2
+  //       }
     ];
     let reviewStatus = {
         '-1': '全部',
@@ -162,7 +163,7 @@
                 display: flex;
                 flex-wrap: nowrap;
                 flex: 1;
-                justify-content: space-between;
+                // justify-content: space-between;
             }
             .cond_item{
                 font-size: 14px;

pages/recruit/subPage/person.vue

@@ -1,4 +1,4 @@
-<!-- 个体招工 -->
+<!-- 个体户招工 -->
 <template>
 	<view>
 		<view class="u-demo-block__content">
@@ -72,6 +72,18 @@
 						border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
+				<u-form-item label="联系人" prop="callName" borderBottom labelWidth="80" ref="item1">
+					<u--input v-model="info.callName" border="none" placeholder="请输入联系人"></u--input>
+				</u-form-item>
+				<u-form-item label="手机号" prop="callTel" borderBottom labelWidth="80" ref="item1">
+					<u--input v-model="info.callTel" border="none" placeholder="请输入手机号"></u--input>
+				</u-form-item>
+				<u-form-item label="座机" prop="callNumber" borderBottom labelWidth="80" ref="item1">
+					<u--input v-model="info.callNumber" border="none" placeholder="请输入座机"></u--input>
+				</u-form-item>
+				<u-form-item label="详细地址" prop="address" borderBottom labelWidth="80" ref="item1">
+					<u--input v-model="info.address" border="none" placeholder="请输入详细地址"></u--input>
+				</u-form-item>
 				<map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
 			</u--form>
 			<u-button type="primary" text="提交" customStyle="margin-top: 50px" @click="submit"></u-button>
@@ -147,6 +159,10 @@
 					education: '', // 学历要求
 					educationLabel: '', // 学历要求前端显示
 					experienceDesc: '', // 经验要求
+					callName: '', // 联系人
+					callTel: '', // 手机号
+					callNumber: '', // 座机
+					address: '', // 公司详细地址
 					// userInfo: {
 					// 	name: '楼兰',
 					// 	sex: '',
@@ -396,7 +412,11 @@
 					'ageDesc',
 					'education',
 					'educationLabel',
-					'experienceDesc'
+					'experienceDesc',
+					'callName',
+					'callTel',
+					'callNumber',
+					'address'
 				]
 				this.$refs.form1.resetFields()
 				this.$refs.form1.clearValidate()

pages/recruit/subPage/recruit.vue

@@ -82,7 +82,7 @@
     import CustomTabbar from '@/components/CustomTabbar/custom_tabbar.vue'
 	import Task from './task.vue' // 发布任务
 	import Work from './work.vue' // 发布岗位
-	import Person from './person.vue' // 个体招工
+	import Person from './person.vue' // 个体户招工
 	import { mapState } from 'vuex'
 	export default {
         components: {CustomTabbar, CustomNavbar, Task, Work, Person},
@@ -91,7 +91,7 @@
 				value2: '招工内容',
 				pageType: null, // null： 个人 enterprise： 企业
 				fileList1: [],
-				nonReactiveArray: ["发布任务", "发布岗位", "个体招工"],
+				nonReactiveArray: ["发布任务", "发布岗位", "个体户招工"],
 				activeTab: 0,
 			}
 		},

pages/user/policyDetail.vue

@@ -14,7 +14,6 @@
 			}
 		},
 		onLoad(option) {
-			console.log('1111111111')
 			getPolicyDetail (option.id).then(res => {
 			  let htmlString = res.data.data.guidelineContent
 				this.strings = htmlString.replace(/width=\"\d+\" height=\"\d+\"/g, 'width="100%" height="auto"');