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

common/dic.js

@@ -1,4 +1,4 @@
-// 发布岗位和个人招工 参考工资
+// 发布岗位和个体招工 参考工资
 const salary = [{
 		name: "2000元（含）以下/月",
 		label: "2000元（含）以下/月",

pages.json

@@ -233,7 +233,7 @@
         	"path" : "pages/recruit/reform",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "个人招工",
+        		"navigationBarTitleText" : "个体招工",
         		"enablePullDownRefresh" : false
         	}
         },

pages/project/project.vue

@@ -273,7 +273,7 @@ export default {
             getPushListByUserId(params).then((res) => {
                 if(res.data.code === 200 ){
                     const {records, current, total, size } = res.data.data
-                    console.log('个人招工', records, current, total, size)
+                    console.log('个体招工', records, current, total, size)
                     if(!records.length) {
                         return uni.showToast({
                         	icon: "none",

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"
@@ -48,7 +48,7 @@
             text: "发布岗位",
             id: 1
         }, {
-            text: "个人招工",
+            text: "个体招工",
             id: 2
         }
     ];

pages/recruit/subPage/person.vue

@@ -1,4 +1,4 @@
-<!-- 个人招工 -->
+<!-- 个体招工 -->
 <template>
 	<view>
 		<view class="u-demo-block__content">

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,
 			}
 		},

store/models/user.js

@@ -61,7 +61,7 @@ const user = {
 		sendTimes:getStore({//用户发送短信次数
 			name:'setUserSendTimes'
 		}) || 0,
-        seeEnterprise: 0, // 0 个人招工 ； 企业招工
+        seeEnterprise: 0, // 0 个体招工 ； 企业招工
 	},
 	actions: {
 		//用户点击radio按钮
@@ -180,7 +180,7 @@ const user = {
 		},
 	},
 	mutations: {
-        setEnterprise(state, val) { // 0 个人招工 ； 企业招工
+        setEnterprise(state, val) { // 0 个体招工 ； 企业招工
             state.seeEnterprise = val;
         },
 		SET_TOKEN: (state, token) => {