zsk
/
renhailaowu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

123

Browse Source
master
zsk 2 years ago
parent b836de1dbe
commit 793ff19cf8
9 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
pages/collect/index.wxml
Unescape Escape View File

@ -38,7 +38,7 @@
<view class="flex-1 vsb"> <view class="flex-1 vsb">
<view class="display-flex"> <view class="display-flex">
<view class="storeName">{{item.jobName || item.aliasName}}</view> <view class="storeName">{{item.jobName || item.aliasName}}</view>
<view class="hourPay">{{item.monthlyPay}}元/月</view> <view class="hourPay">{{item.salaryClassifyValue}}</view>
</view> </view>
<view class="v-center mt12 mb12"> <view class="v-center mt12 mb12">
<view class="f14s c045 flex-1 display-flex"> <view class="f14s c045 flex-1 display-flex">

5
pages/detail/index.js
Unescape Escape View File

@ -1142,7 +1142,6 @@ Page({
// } // }
// if (app.isNotEmptyCheck(jobDetail.salaryClassify) && app.isNotEmptyCheck(jobDetail.salaryClassifyValue)) { // if (app.isNotEmptyCheck(jobDetail.salaryClassify) && app.isNotEmptyCheck(jobDetail.salaryClassifyValue)) {
jobDetail["hourlyPay"] = commonUtil.getSalaryClassifyValue(jobDetail.salaryClassify, jobDetail.salaryClassifyValue);
// } // }
//月薪 //月薪
var monthlyPayStr = ""; var monthlyPayStr = "";
@ -1159,7 +1158,9 @@ Page({
monthlyPayStr = jobDetail.maxMonthlyPay/100; monthlyPayStr = jobDetail.maxMonthlyPay/100;
} }
} }
jobDetail["monthlyPay"] = monthlyPayStr; jobDetail["monthlyPay"] = monthlyPayStr;
jobDetail["hourlyPay"] = commonUtil.getSalaryClassifyValue(jobDetail.salaryClassify, jobDetail.salaryClassifyValue,monthlyPayStr);
//地址深圳丨龙岗区丨 //地址深圳丨龙岗区丨
// var districtStr = ""; // var districtStr = "";
// if (app.isNotEmptyCheck(jobDetail.store.district)) { // if (app.isNotEmptyCheck(jobDetail.store.district)) {

6
pages/detail/index.wxml
Unescape Escape View File

@ -29,7 +29,7 @@
<view class="jobMoney color-f40"> <view class="jobMoney color-f40">
<!-- {{jobDetail.combiSalary}} --> <!-- {{jobDetail.combiSalary}} -->
<!-- {{jobDetail.hourlyPay || '--'}} --> <!-- {{jobDetail.hourlyPay || '--'}} -->
{{jobDetail.monthlyPay || '--'}}元/月 {{jobDetail.hourlyPay || '--'}}
</view> </view>
<view class="f14s c633 mt10 color-f40"> <view class="f14s c633 mt10 color-f40">
<!-- 5200-8400 --> <!-- 5200-8400 -->
@ -50,11 +50,11 @@
</view> </view>
</view> </view>
</view> </view>
<view class="mg020 pb10 bb1 v-center" bindtap="toMapChoice" data-address="{{jobDetail}}"> <view class="mg020 pb10 bb1 v-center" bindtap="{{jobDetail.storeAddr != '北京市东城区东华门街道天安门' ? 'toMapChoice' :''}}" data-address="{{jobDetail}}">
<view> <view>
<i class="iconfont icon-dizhi11 f18 mr10 lh1" style="color:var(--color-ysd);"></i> <i class="iconfont icon-dizhi11 f18 mr10 lh1" style="color:var(--color-ysd);"></i>
</view> </view>
<view class="address c3">{{jobDetail.storeAddr ? jobDetail.storeAddr :'暂无地址信息'}}</view> <view class="address c3">{{jobDetail.storeAddr != '北京市东城区东华门街道天安门' && jobDetail.storeAddr ? jobDetail.storeAddr :'暂无地址信息'}}</view>
<view> <view>
<i class="iconfont icon-gengduo11 f14 ml18 dib pr c9" style="line-height:1;top:1px;"></i> <i class="iconfont icon-gengduo11 f14 ml18 dib pr c9" style="line-height:1;top:1px;"></i>
</view> </view>

2
pages/index/index.wxml
Unescape Escape View File

@ -295,7 +295,7 @@
<view class="flex-1 vsb"> <view class="flex-1 vsb">
<view class="display-flex"> <view class="display-flex">
<view class="storeName">{{item.jobName || item.aliasName}}</view> <view class="storeName">{{item.jobName || item.aliasName}}</view>
<view class="hourPay">{{item.monthlyPay}}元/月</view> <view class="hourPay">{{item.salaryClassifyValue}}</view>
</view> </view>
<view class="v-center mt12 mb12"> <view class="v-center mt12 mb12">
<view class="f14s c045 flex-1 display-flex"> <view class="f14s c045 flex-1 display-flex">

8
pages/index/index.wxss
Unescape Escape View File

@ -1237,12 +1237,12 @@ button.collect icon::before {
color: var(--color-ysd); color: var(--color-ysd);
} }
.miniBtn { .miniBtn {
width: 64px; width: 72px;
height: 20px; height: 24px;
background-color: var(--color-f40); background-color: var(--color-f40);
font-size: 12px; font-size: 14px;
border-radius: 99px; border-radius: 99px;
line-height: 20px; line-height: 24px;
color: #fff; color: #fff;
text-align: center; text-align: center;
} }

2
pages/jobListSearch/index.wxml
Unescape Escape View File

@ -275,7 +275,7 @@
<view class="display-flex"> <view class="display-flex">
<view class="storeName" wx:if="{{item.jobName != null && item.jobName != ''}}">{{item.jobName}}</view> <view class="storeName" wx:if="{{item.jobName != null && item.jobName != ''}}">{{item.jobName}}</view>
<view class="storeName" wx:else>{{item.aliasName}}</view> <view class="storeName" wx:else>{{item.aliasName}}</view>
<view class="hourPay">{{item.monthlyPay}}元/月</view> <view class="hourPay">{{item.salaryClassifyValue}}</view>
</view> </view>
<view class="v-center mt12 mb12"> <view class="v-center mt12 mb12">
<view class="f14s c045 flex-1 display-flex"> <view class="f14s c045 flex-1 display-flex">

2
pages/type/type/index.wxml
Unescape Escape View File

@ -35,7 +35,7 @@
<view class="flex-1 vsb"> <view class="flex-1 vsb">
<view class="display-flex"> <view class="display-flex">
<view class="storeName" style="font-size: 14px;max-width:300rpx;">{{item.jobName || item.aliasName}}</view> <view class="storeName" style="font-size: 14px;max-width:300rpx;">{{item.jobName || item.aliasName}}</view>
<view class="hourPay" style="font-size: 14px;">{{item.monthlyPay}}元/月</view> <view class="hourPay" style="font-size: 14px;">{{item.salaryClassifyValue}}</view>
</view> </view>
<view class="v-center mt12 mb12"> <view class="v-center mt12 mb12">
<view class="f12 c045 flex-1 display-flex"> <view class="f12 c045 flex-1 display-flex">

2
project.private.config.json
Unescape Escape View File

@ -1,7 +1,7 @@
{ {
"setting": { "setting": {
"compileHotReLoad": true, "compileHotReLoad": true,
"urlCheck": false "urlCheck": true
}, },
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"projectname": "dandelionPlatform", "projectname": "dandelionPlatform",

14
utils/commonUtil.js
Unescape Escape View File

@ -994,9 +994,10 @@ export function formatDateYMD(val) {
/** /**
* 根据薪资类型和薪资值获取薪资展示 * 根据薪资类型和薪资值获取薪资展示
*/ */
export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue) { export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue,monthlyPayStr) {
var hourlyPay = moneyToFixed(salaryClassifyValue); var hourlyPay = moneyToFixed(salaryClassifyValue);
// console.log(hourlyPay); console.log("=====1====");
// console.log(salaryClassify); // console.log(salaryClassify);
if (salaryClassify == 0) { if (salaryClassify == 0) {
return `${hourlyPay}元/时`; return `${hourlyPay}元/时`;
@ -1013,7 +1014,7 @@ export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue) {
} else if (salaryClassify == 6) { } else if (salaryClassify == 6) {
return `面议`; return `面议`;
} else if (salaryClassify == 7) { } else if (salaryClassify == 7) {
return `月薪`; return `${monthlyPayStr}元/月`;
} else { } else {
// return '请配置薪资'; // return '请配置薪资';
return "-"; return "-";
@ -1233,7 +1234,6 @@ export function disposeJobListData(recordList) {
} }
item["age"] = ageStr; item["age"] = ageStr;
// console.log(item.salaryClassify,'=============', item.salaryClassifyValue); // console.log(item.salaryClassify,'=============', item.salaryClassifyValue);
item["salaryClassifyValue"] = getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue);
// //时薪 // //时薪
// var hourlyPayStr = ''; // var hourlyPayStr = '';
// var hasHourlyPay = false; // var hasHourlyPay = false;
@ -1273,7 +1273,9 @@ export function disposeJobListData(recordList) {
} }
// console.log(monthlyPayStr); // console.log(monthlyPayStr);
// } // }
item["monthlyPay"] = monthlyPayStr; item["monthlyPay"] = monthlyPayStr;
item["salaryClassifyValue"] = getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue,monthlyPayStr);
// console.log('月薪月薪月薪月薪月薪月薪月薪月薪月薪',monthlyPayStr); // console.log('月薪月薪月薪月薪月薪月薪月薪月薪月薪',monthlyPayStr);
//地址深圳丨龙岗区丨 //地址深圳丨龙岗区丨
let citys = setJobListInfoPosition(item.district || item.storeDistrict); let citys = setJobListInfoPosition(item.district || item.storeDistrict);

Write Preview
Loading…
Cancel
Save