Merge branch 'develop' of http://101.37.147.115:3000/mz666/bocai_supplyChain into develop

pages/firstBill/index.js

@@ -2814,19 +2814,19 @@ Page({
         that.data.recordList.forEach((item, index) => {
           // console.log(item);
           // item.logoStr = item.jobName.slice(0,2)
-          if (
-            app.isNotEmptyCheck(item.returnFeeType) ||
-            item.returnFeeType == "0" ||
-            item.returnFee == "0"
-          ) {
-            item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById(
-              item.returnFeeType,
-              item.returnFee / 100
-            );
-
-          } else {
-            item["fuWuFei"] = "";
-          }
+          // if (
+          //   app.isNotEmptyCheck(item.returnFeeType) ||
+          //   item.returnFeeType == "0" ||
+          //   item.returnFee == "0"
+          // ) {
+          //   item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById(
+          //     item.returnFeeType,
+          //     item.returnFee / 100
+          //   );
+
+          // } else {
+          //   item["fuWuFei"] = "";
+          // }
           // 简版弹窗通告显示
           if (item.id == that.data.currentJobDrawer.id) {
             item["jobDesp"] = item.jobDesp
@@ -4333,6 +4333,7 @@ Page({
         storeJobListSearchForm: that.data.storeJobListSearchForm,
         recordList: [],
         hasMoreData: true,
+        // topNum: 1,
       });
       that.getJobList();
     }

pages/shareList/index.js

@@ -1349,7 +1349,7 @@ Page({
     // debugger
     let that = this;
     that.setData({
-      isLogin: app.globalData.isLogin
+      isLogin: wx.getStorageSync('loginUser') ? true : false
     });
     that.getJobList();
   },
@@ -1588,13 +1588,29 @@ Page({
         title: "加载中...",
       });
       console.log(that.data.storeJobListSearchForm);
-      customRequest("/yishoudan/store/job/getShareJobs?storeJobIds=" + app.globalData.sceneStoreJobId, { header: 'headers', method: 'POST', data: {} }).then((res) => {
+      customRequest("/yishoudan/custom/job/getShareJobsV2?storeJobIds=" + app.globalData.sceneStoreJobId, { header: 'headers', method: 'get', data: {} }).then((res) => {
         setTimeout(function () {
           that.setData({
             triggered: false,
           });
         }, 1000);
         // var jobListTemp = commonUtil.disposeJobListData();
+        if (res.data.data.list) {
+          res.data.data.list.forEach((i) => {
+
+            i.minMonthlyPay = i.minMonthlyPay / 100
+            i.maxMonthlyPay = i.maxMonthlyPay / 100
+            if (i.jobSpecialLabelNames && i.jobSpecialLabelNames.length > 0) {
+              i.labelGroup = i.jobSpecialLabelNames.split(', ').filter((itm, inx) => {
+                return inx < 6
+              }).map(itm => {
+                return itm
+              })
+            } else {
+              i.labelGroup = [];
+            }
+          })
+        }
         var jobListTemp = commonUtil.disposeJobListData(res.data.data.list);
         that.data.recordList = jobListTemp;
 
@@ -1617,11 +1633,11 @@ Page({
 
         that.data.recordList.forEach((item, index) => {
           // console.log(item);
-          if (app.isNotEmptyCheck(item.returnFeeType) || item.returnFeeType == "0" || item.returnFee == "0") {
-            item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById(item.returnFeeType, item.returnFee);
-          } else {
-            item["fuWuFei"] = "";
-          }
+          // if (app.isNotEmptyCheck(item.returnFeeType) || item.returnFeeType == "0" || item.returnFee == "0") {
+          //   item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById(item.returnFeeType, item.returnFee);
+          // } else {
+          //   item["fuWuFei"] = "";
+          // }
           // 简版弹窗通告显示
           if (item.id == that.data.currentJobDrawer.id) {
             item["jobDesp"] = item.jobDesp.replace(/\*\*\*\*\*/g, "").split("————————")[0];
@@ -1794,9 +1810,6 @@ Page({
   goDetail (e) {
     console.log(e);
     var that = this;
-
-    console.log(app.globalData.isLogin);
-    console.log(app.globalData.isLogin);
     // wx.navigateTo({
     //   url: "../detail/index?storeJobId=" + e.currentTarget.dataset.id + "&wxCode=" + that.data.wxCode,
     // });
@@ -2355,7 +2368,7 @@ Page({
     }
     console.log(app.globalData.headers);
     //发起网络请求
-    customRequest(url, { header: 'headers', method: 'GET', data: { storeJobId: storeJobId,jobClassify:1 } }).then((res) => {
+    customRequest(url, { header: 'headers', method: 'GET', data: { storeJobId: storeJobId, jobClassify: 1 } }).then((res) => {
       var txt;
       if (collected - 1 == 0) {
         //取消收藏

pages/shareList/index.json

@@ -1,4 +1,7 @@
 {
+  "usingComponents": {
+    "job-sub": "../../components/job-sub/index"
+  },
   "navigationBarTitleText": "职位列表",
   "backgroundColor": "#f5f5f5"
 

pages/shareList/index.wxml

@@ -8,9 +8,11 @@
         <view class="standardList" style="padding-top: 0px;">
           <view>
             <view x:if="{{recordList != null && recordList.length > 0}}" style="padding-top: 0;overflow-x: hidden;">
-              <view class="jcenter bgf br8">
+              <job-sub storeJobListSearchForm="{{storeJobListSearchForm}}" bindgetPhoneNumber="getPhoneNumber" bindcollectPaste="collectPaste" bindgetUserInfoBtn="getUserInfoBtn" recordList="{{recordList}}" isLogin="{{isLogin}}" agencyStatus="{{agencyStatus}}" hasUserInfo="{{hasUserInfo}}" loginUserInfo="{{userInfo}}"></job-sub>
+              <view class="jcenter bgf br8" wx:if="{{false}}">
                 <view class="listcontainer" style="border-top: 1px solid #f3f3f3;">
-                  <view class="jobOne" hover-start-time="50" hover-stay-time="0" wx:for="{{recordList}}" data-id="{{item.id}}" bindtap="goDetail" wx:key="index" hover-class="{{item.recruitment == '1' ? 'ahover':''}}" style="background-color:{{item.recruitment == '1' ? '#fff':'#f5f5f5'}};border-bottom: {{item.recruitment == '1' ? '':'1px solid #ddd'}};">
+                   
+                  <view class="jobOne"  hover-start-time="50" hover-stay-time="0" wx:for="{{recordList}}" data-id="{{item.id}}" bindtap="goDetail" wx:key="index" hover-class="{{item.recruitment == '1' ? 'ahover':''}}" style="background-color:{{item.recruitment == '1' ? '#fff':'#f5f5f5'}};border-bottom: {{item.recruitment == '1' ? '':'1px solid #ddd'}};">
                     <view class="p1020 jobIn" hover-class="none">
                       <image style="width: 80px;height: 80px;position: absolute;right: 100px;z-index:99" src="http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/tingzhao.svg" wx:if="{{item.state == 1 && item.recruitment == 2}}"></image>
 

utils/commonUtil.js

@@ -1063,7 +1063,7 @@ export function getSalaryClassifyValue1 (salaryClassify, salaryClassifyValue) {
 export function getReturnFeeTypeName1ById (id, value) {
   let str = "";
   // console.log(id+'returnFeeType');
-  let array = this.returnFeeTypeArray(value);
+  let array = returnFeeTypeArray(value);
   str = "--";
 
   array.forEach((item) => {
@@ -1328,6 +1328,20 @@ export function disposeJobListData (recordList) {
     // console.log('item["update"]',item["update"]);
     item.genderRestrict = getGenderByMinAge(item);
 
+    // 服务费
+    if (
+      isNotEmptyCheck(item.returnFeeType) ||
+      item.returnFeeType == "0" ||
+      item.returnFee == "0"
+    ) {
+      item["fuWuFei"] = getReturnFeeTypeName1ById(
+        item.returnFeeType,
+        item.returnFee / 100
+      );
+
+    } else {
+      item["fuWuFei"] = "";
+    }
     // //时薪
     // var hourlyPayStr = '';
     // var hasHourlyPay = false;