Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

src/api/job.js

@@ -13,6 +13,17 @@ export function JobListApi(data) {
 		data: setqs(data),
 	});
 }
+
+// 获取职位列表
+export function JobListApiYicai(data) {
+	return request({
+		url: "/assistant/custom/job/v2/list",
+		method: "post",
+		// data: setqs(data),
+		// headers: { "Content-Type": "application/x-www-form-urlencoded" },
+		data: setqs(data),
+	});
+}
 // 获取职位详情
 export function getJobDetailApi(data) {
 	return request({
@@ -20,6 +31,13 @@ export function getJobDetailApi(data) {
 		method: "get",
 	});
 }
+// 获取职位详情
+export function getJobDetailYicaiApi(data) {
+	return request({
+		url: `/assistant/custom/job/v2/detail/${data}`,
+		method: "get",
+	});
+}
 // 获取职位特色
 export function getJobSpecialApi() {
 	return request({
@@ -50,6 +68,15 @@ export function recordBillApi(data) {
 		headers: { "Content-Type": "application/x-www-form-urlencoded" },
 	});
 }
+// 一才录单报名
+export function recordBillYicaiApi(data) {
+	return request({
+		url: "/assistant/apply/handler/add",
+		method: "post",
+		data:data,
+		headers: { "Content-Type": "application/x-www-form-urlencoded" },
+	});
+}
 // 报名上传识别身份证信息
 export function getIdCardInfoApi(data) {
 	return request({

src/components/FirstJob/components/recordSuccess.vue

@@ -91,7 +91,7 @@ export default {
   // 组件方法
   methods: {
     onClose() {
-      this.$router.push("/detail?id=" + this.firminfo.id);
+      this.$router.go(-1);
     },
     handleOk() {
       this.$router.push("/mybill");

src/components/FirstJob/joblist.vue

@@ -215,10 +215,10 @@
       <div class="maincontentleft" style="padding-top: 50px">
         <div class="tabBar" @click="changeTab($event)">
           <div class="tabSubset" :class="{ active: signType == '' }" data-type="0">全部</div>
-          <!-- <div class="tabSubset" :class="{ active: signType == 1 }" data-type="1">自营</div> -->
+          <div class="tabSubset" :class="{ active: signType == 1 }" v-if="loginValue.agencyName == '郑州一才工作'" data-type="1">一才</div>
           <!-- <div class="tabSubset" :class="{ active: signType == 2 }" data-type="2">三方</div> -->
         </div>
-        <div class="filter" :class="[filterStatus == 0 ? '' : 'nobd']" style>
+        <div class="filter" v-show="signType == ''" :class="[filterStatus == 0 ? '' : 'nobd']" style>
           <div class="filter-title" :style="{ top: filterStatus == 0 ? '-32px' : '-21px' }">
             <span>
               <span>
@@ -404,11 +404,14 @@
           <div class="subset" v-for="(item, index) in jobMainList" :key="index" :style="{
 							background: item.recruitment == '1' ? '#fff' : '#f5f5f5',
 						}">
-            <router-link target="_blank" :to="'/detail?' + 'id=' + item.id + '&' + 'page=' + formvalue.pageNum" rel="opener">
+
+<!-- v-if="signType == ''" -->
+
+            <router-link target="_blank" :to="signType == '' ? ('/detail?' + 'id=' + item.id + '&' + 'page=' + formvalue.pageNum) : ('/detailYicai?' + 'id=' + item.id)" rel="opener">
               <div class="subsetleft" @click="totop">
                 <div class="imgbox">
                   <img v-if="item.logo.length !== 0" :src="item.logo" />
-                  <div v-else class="default_avatar">{{item.brandName}}</div>
+                  <div v-else class="default_avatar">{{item.brandName || item.jobName}}</div>
                   <!-- <img v-else src="../../../static/img/nopicture.png" /> -->
                 </div>
                 <div class="jobinfobox">
@@ -435,7 +438,7 @@
                     <span v-for="(item1, index) in item.jobSpecialLabelNames" :key="index">{{ item1 }}</span>
                     <span v-if="item.jobSpecialLabelNames.length == 0">暂无特色</span>
                   </div>
-                  <div class="jobpricemonth">
+                  <div class="jobpricemonth" v-if="item.minMonthlyPay">
                     <!-- :style="{ opacity: item.minMonthlyPay ? '1' : '0' }" -->
 
                     <span>{{ item.minMonthlyPay ? item.minMonthlyPay : "" }}</span>-
@@ -471,7 +474,7 @@
 										<span v-if="item.jobDesp" :class="'copyInfo' + index">{{ item.jobDesp }}</span
 										><span v-else>暂无详单</span>
                 </template>-->
-                <router-link target="_blank" :to="'/detail?' + 'id=' + item.id + '&' + 'page=' + formvalue.pageNum" rel="opener">
+                <router-link target="_blank" :to="signType == '' ? ('/detail?' + 'id=' + item.id + '&' + 'page=' + formvalue.pageNum) : ('/detailYicai?' + 'id=' + item.id)"  rel="opener">
                   <button type="primary" class="jobDesp br4" :style="{
 											background: item.recruitment == '1' ? '#fff' : '#f5f5f5',
 										}">更多</button>
@@ -555,7 +558,7 @@ import Clipboard from 'clipboard'
 // import recordbill from "@/components/FirstJob/components/recordbill.vue";
 export default {
   // 注入获取职位列表的方法
-  inject: ['getJobList', 'reload'],
+  inject: ['getJobList','getJobListYicai', 'reload'],
   // 组件名称
   name: '',
   // 局部注册的组件
@@ -623,6 +626,7 @@ export default {
       proxyinfo: JSON.parse(localStorage.getItem('LOGIN_DATA')),
       nationlist: nationlist,
       specialHotTag: [],
+      loginValue:{},
       dateinfo: {
         day: '',
         week: '',
@@ -816,12 +820,18 @@ export default {
     // console.log(this.proxyinfo);
     // console.log(this.$route);
     this.currentPage = this.$route.params.pagenum
+    this.signType = this.$route.params.signType ? this.$route.params.signType : ''
     if (this.currentPage) {
       // console.log(this.currentPage);
       this.formvalue.pageNum = this.currentPage
     }
-    // this.reload();
+    if(this.signType == ''){
       this.getJobList()
+
+    }else{
+      this.getJobListYicai()
+    }
+
     this.getJobSpecial()
     this.getProvince()
     this.getdateinfo()
@@ -843,12 +853,16 @@ export default {
     } else {
       this.getPosition()
     }
+   
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
-  mounted() {},
+  mounted() {
+    this.loginValue = localStorage.getItem('LOGIN_DATA') !== null ? JSON.parse(localStorage.getItem('LOGIN_DATA')) : { tel: '' }
+    console.log(this.loginValue)
+  },
   // 组件方法
   methods: {
     // 处理筛选框的定位
@@ -1067,12 +1081,14 @@ export default {
       if (e.target.dataset.type != undefined) {
         if (e.target.dataset.type != 0) {
           this.formvalue.signType = this.signType = e.target.dataset.type
+          this.getJobListYicai()
         } else {
           this.formvalue.signType = this.signType = ''
-        }
           this.formvalue.pageNum = 1
            this.getJobList()
         }
+      
+      }
     },
     async getJobSpecialList() {
       const { data } = await getJobSpecialApi()
@@ -1334,9 +1350,14 @@ export default {
       // 跳转到路由新页面的方法
       // console.log(item);
       // let userinfo = JSON.stringify(item);
-
+      if(this.signType == ''){
         this.$router.push({ name: 'recordbill', params: item })
         sessionStorage.setItem('CURRENT_FIRM', JSON.stringify(item))
+      }else if(this.signType == '1'){
+        this.$router.push({ name: 'recordbillYicai', params: item })
+        sessionStorage.setItem('CURRENT_FIRM_YICAI', JSON.stringify(item))
+      }
+     
     },
     getSalaryClassifyValue(salaryClassify, salaryClassifyValue) {
       return getSalaryClassifyValue(salaryClassify, salaryClassifyValue)
@@ -1422,7 +1443,9 @@ export default {
           this.classifyList = data.data.labels
           this.$nextTick(() => {
             let fileterContent = document.querySelector('.filter-content')
+            if(isNotEmptyCheck(fileterContent.scrollHeight)){
               this.filterHeight = fileterContent.scrollHeight
+            }
             // fileterContent.style.height = this.filterHeight + "px";
           })
         }

src/router/index.js

@@ -34,6 +34,11 @@ const routes = [
         name: "Detail",
         component: () => import("../components/FirstJob/detail.vue"),
       },
+      {
+        path: "/detailYicai",
+        name: "DetailYicai",
+        component: () => import("../components/FirstJob/detailYicai.vue"),
+      },
       // {
       //   path: "/serviceoutlets",
       //   name: "serviceoutlets",
@@ -58,6 +63,14 @@ const routes = [
         // which is lazy-loaded when the route is visited.
         component: () => import("../components/FirstJob/recordBill.vue"),
       },
+      {
+        path: "/recordbillYicai",
+        name: "recordbillYicai",
+        // route level code-splitting
+        // this generates a separate chunk (about.[hash].js) for this route
+        // which is lazy-loaded when the route is visited.
+        component: () => import("../components/FirstJob/recordBillYicai.vue"),
+      },
       {
         path: "/recordsuccess",
         name: "recordsuccess",

src/utils/commonUtil.js

@@ -1052,7 +1052,7 @@ export function formatDateYMDHM (val) {
 }
 function getJobSpecialLabelNamesArray (jobSpecialLabelNames) {
   if (isNotEmptyCheck(jobSpecialLabelNames)) {
-    return jobSpecialLabelNames.split(", ");
+    return new String(jobSpecialLabelNames).split(", ");
   }
   return [];
 }

src/views/main.vue

@@ -109,7 +109,7 @@
                   </div>
                 </router-link>-->
                 <!-- 2023-11-29 注释该条件 && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 ) -->
-                <router-link to="###" v-if="loginValue.agencyName == '郑州一才工作'">
+                <router-link to="###" v-if="loginValue.agencyName == '郑州一才工作' || loginValue.id == '116253'">
                   <div @click="goAdmin">
                     <span>
                       <i class="iconfont icon-shangjiahoutai"></i>商家后台
@@ -240,17 +240,19 @@
 import Cookies from 'js-cookie'
 import {
   JobListApi,
+  JobListApiYicai
   // getCityApi,
 } from '../api/job'
 
 import { logoutApi } from '../api/login'
-import { disposeJobListData } from '../utils/commonUtil'
+import { disposeJobListData,setReturnFee } from '../utils/commonUtil'
 
 export default {
   inject: ['reload'],
   provide() {
     return {
       getJobList: this.getJobList,
+      getJobListYicai: this.getJobListYicai,
       logout: this.logout,
     }
   },
@@ -400,6 +402,7 @@ export default {
       this.isLogin = true
     }
     this.getJobList()
+    this.getJobListYicai()
     this.isLaoxiangshow()
     this.getRecommendJob()
     this.showfooter()
@@ -517,6 +520,57 @@ export default {
       this.isspinning = false
     },
 
+    // 获取一才工作列表
+    async getJobListYicai(newdata) {
+      this.isspinning = true
+      console.log(this.formvalue)
+      try {
+        newdata = {
+          agencyId: '3087',
+          recruitment:"1",
+          keys: '',
+          pageNum: 1,
+          pageSize: 8,
+          total: null, //分页配置
+        }
+        for (var k in this.formvalue) {
+          // console.log(this.formvalue[k]);
+          if (Array.isArray(this.formvalue[k])) {
+            newdata[k] = this.formvalue[k].length > 0 ? this.formvalue[k].join() : ''
+          } else {
+            newdata[k] = this.formvalue[k]
+          }
+        }
+        // console.log(newdata);
+        // debugger;
+        // console.log(this.isLogin);
+        if (this.isLogin) {
+          const { data } = await JobListApiYicai(newdata)
+          // console.log(data);
+          if (data.status === 200) {
+            this.jobMainList = disposeJobListData(data.data.recordList)
+            this.jobMainList.forEach((item,index) => {
+              item['servetype'] = setReturnFee(item.returnFee,item.returnFeeType);
+            })
+            this.formvalue.total = data.data.recordCount
+            console.log(this.jobMainList)
+          } else {
+            this.$message.info('数据获取失败')
+          }
+        }
+        this.totop()
+        //  = data.data.recordList;
+        // console.log(this.formvalue);
+      } catch (error) {
+        console.log(error)
+      }
+      this.isspinning = false
+    },
+
+
+
+
+
     totop() {
       // console.log(window);
       document.body.scrollTop = 0