diff --git a/app.js b/app.js
index 18024f4..29a44dd 100644
--- a/app.js
+++ b/app.js
@@ -591,20 +591,16 @@ App({
wx.setClipboardData({
data,
success (res) {
- wx.getClipboardData({
- success (res) {
- console.log(res.data); // data
- if (callBack) {
- callBack();
- } else {
- wx.showToast({
- title: "内容已复制",
- icon: "none",
- duration: 1500,
- });
- }
- },
- });
+ if (callBack) {
+ callBack();
+ } else {
+ console.log(123123123);
+ wx.showToast({
+ title: "内容已复制",
+ icon: "none",
+ duration: 1500,
+ });
+ }
},
});
}
diff --git a/app.json b/app.json
index 49e3556..3d4e2b9 100644
--- a/app.json
+++ b/app.json
@@ -117,10 +117,6 @@
"navigationBarTextStyle": "black"
},
"plugins": {
- "yz-reader": {
- "version": "1.6.3",
- "provider": "wx0d82ce42bf0f4960"
- }
},
"tabBar": {
"custom": true,
diff --git a/components/job-sub/index.wxml b/components/job-sub/index.wxml
index b1603b4..2b2961b 100644
--- a/components/job-sub/index.wxml
+++ b/components/job-sub/index.wxml
@@ -76,7 +76,7 @@
登录查看
- {{agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '详询客服') : '仅代理可见'}}
+ {{(item.picked || corpUserFlag) ? (agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '详询客服') : '仅代理可见') : '详询客服' }}
diff --git a/miniapp/android/i18nInfo.json b/miniapp/android/i18nInfo.json
new file mode 100644
index 0000000..5553e32
--- /dev/null
+++ b/miniapp/android/i18nInfo.json
@@ -0,0 +1 @@
+{"base":{"ios":{"name":"伯才"},"android":{"name":"伯才"}}}
diff --git a/miniapp/ios/i18nInfo.json b/miniapp/ios/i18nInfo.json
new file mode 100644
index 0000000..5553e32
--- /dev/null
+++ b/miniapp/ios/i18nInfo.json
@@ -0,0 +1 @@
+{"base":{"ios":{"name":"伯才"},"android":{"name":"伯才"}}}
diff --git a/pages/detail/index.js b/pages/detail/index.js
index d90784c..2cac2bd 100644
--- a/pages/detail/index.js
+++ b/pages/detail/index.js
@@ -171,7 +171,6 @@ Page({
},
showMessageCard: true,
sendMessagePath: `/pages/detail/index.html?storeJobId=${this.data.searchForm.storeJobId}&agencyId=${app.globalData.loginUserInfo.agencyId}`,
- // sendMessageTitle:'丸子吗喽你好呀',
// sendMessageImg:'../../assets/images/jbn.png',
corpId: 'wwc227639d3a136c8d',
success (res) {
@@ -896,8 +895,8 @@ Page({
}
});
} else {
- commonUtil.fillTextLineBreak(ctx, '暂无特色', baseLeft + 12, line4 + 4, 400, 40, "#666", mainFontSize); // 标签字符
- commonUtil.roundRect1(ctx, baseLeft , line4 - 38, ctx.measureText('暂无特色').width + 24, 56, 8, "#00000012");
+ commonUtil.fillTextLineBreak(ctx, '暂无特色', baseLeft + 12, line4 + 4, 400, 40, "#666", mainFontSize); // 标签字符
+ commonUtil.roundRect1(ctx, baseLeft, line4 - 38, ctx.measureText('暂无特色').width + 24, 56, 8, "#00000012");
}
// 根据标签数量调整宣传标语位置
@@ -1118,7 +1117,6 @@ Page({
fuWuFei: commonUtil.getReturnFeeTypeName1ById(result.record.returnFeeType, result.record.returnFee ? result.record.returnFee / 100 : ''),
});
}
-
console.log(result);
console.log(commonUtil);
let citys = commonUtil.setJobInfoPositionv3(result.record.storeAddr);
@@ -1869,7 +1867,7 @@ Page({
// if (!this.data.isAgency) return false
console.log('that.data.bclr', that.data.bclr);
let content, title
- if (that.data.jobDetail.record.returnFeeDesp) {
+ if (that.data.jobDetail.record.returnFeeDesp && (that.data.jobDetail.record.picked || that.data.corpUserFlag)) {
title = that.data.isAgency ? '佣金: ' + that.data.fuWuFei : ''
content = that.data.isAgency ? that.data.jobDetail.record.returnFeeDesp : '抱歉，您需先成为伯才代理以获得使用权限。'
diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml
index 1d00165..1abf0ba 100644
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@@ -40,7 +40,7 @@
- {{fuWuFei || '详询客服'}}
+ {{ (jobDetail.record.picked || corpUserFlag) ? (fuWuFei || '详询客服') : '详询客服'}}
***
@@ -127,8 +127,8 @@
-
- 复制
+
+ 复制
diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js
index e6bbb9b..8ef7098 100644
--- a/pages/firstBill/index.js
+++ b/pages/firstBill/index.js
@@ -14,6 +14,13 @@ Page({
toped: "1",
jobNum: 0, // 48小时更新职位数
currCode: '',
+ filterStatus: {
+ unset_tagArray0: true,
+ unset_tagArray1: true,
+ unset_tagArray2: true,
+ unset_tagArray3: true,
+ unset_tagArray4: true,
+ },
tabGroup: [
{
name: '全部',
@@ -31,7 +38,7 @@ Page({
picked: '0'
},
],
- sortList:[
+ sortList: [
{
name: '综合排序',
key: 'zuigao',
@@ -48,13 +55,13 @@ Page({
anchorList: [
{
id: 'age',
- name: '年龄'
- },
- {
- id: 'gender',
- name: '性别'
+ name: '性别年龄'
},
// {
+ // id: 'gender',
+ // name: '性别'
+ // },
+ // {
// id: 'class',
// name: '分类'
// },
@@ -226,25 +233,31 @@ Page({
*/
filterData: {
- sex: [{
- name: "男",
- id: 1,
- active: 0,
- icon: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/nan912.png",
- selectIcon: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/nan912-1.png",
- },
- {
- name: "女",
- id: 2,
- active: 0,
- icon: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/nv912.png",
- selectIcon: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/nv912-1.png",
- },
- {
- name: "男女不限",
- id: -1,
- active: -1,
- },
+ sex: [
+ {
+ name: "不限",
+ id: -1,
+ active: -1,
+ },
+ {
+ name: "收男工",
+ id: 1,
+ active: 0,
+ icon: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/nan912.png",
+ selectIcon: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/nan912-1.png",
+ },
+ {
+ name: "收女工",
+ id: 2,
+ active: 0,
+ icon: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/nv912.png",
+ selectIcon: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/nv912-1.png",
+ },
+ {
+ name: "男女都收",
+ id: 3,
+ active: 0,
+ },
],
jobFilter: {
tagArray0: [],
@@ -350,8 +363,8 @@ Page({
fangdou: true,
rangeValues: [16, 60], // 年龄筛选区间
rangeSmartValues: [16, 60], // 年龄筛选区间
- maxAge: 60, // 年龄区间最大取值
- minAge: 16,
+ maxAge: '', // 年龄区间最大取值
+ minAge: '',
salary: [10, 150], // 薪资筛选区间
minSalary: 10,
maxSalary: 150,
@@ -374,6 +387,12 @@ Page({
url: "/pages/login/index",
});
},
+ observers: {
+ filterData: function (e) {
+ console.log('filterData.jobFilter.tagArray1', e);
+ // 在 numberA 或者 numberB 被设置时，执行这个函数
+ }
+ },
close () {
let that = this;
let brandList = that.data.brandList;
@@ -517,7 +536,6 @@ Page({
activez: str,
});
},
- watch () { },
witchNav (e) {
console.log(e);
if (!this.data.isLogin && e.currentTarget.dataset.title != "职教职培") {
@@ -581,11 +599,13 @@ Page({
// let str = that.data.sexid
console.log(e);
let str = e.currentTarget.dataset.id;
- console.log(str);
+ console.log('str,', str);
if (str == "1") {
- that.data.secondMenu = "男生";
+ that.data.secondMenu = "收男工";
} else if (str == "2") {
- that.data.secondMenu = "女生";
+ that.data.secondMenu = "收女工";
+ } else if (str == "3") {
+ that.data.secondMenu = "男女都收";
} else if (str == "-1") {
that.data.secondMenu = "不限";
}
@@ -1302,7 +1322,7 @@ Page({
// console.log("agencyUserId", agencyUserId);
app.globalData.isCommission = 1;
}
- app.getLoginUserTokenInfo().then((res)=>{
+ app.getLoginUserTokenInfo().then((res) => {
console.log('res', app.globalData.loginUserInfo)
this.setData({
userInfo: app.globalData.loginUserInfo,
@@ -1451,7 +1471,8 @@ Page({
*
*/
setActive (e) {
- // console.log(e);
+ console.log(e);
+ let that = this
let data = e.currentTarget.dataset;
if (data.type == "tattoo" || data.type == "sex" || data.type == "price") {
// console.log(data.id);
@@ -1480,7 +1501,10 @@ Page({
}
}
});
- // console.log(this.data.filterData[data.type]);
+ this.setData({
+ filterData: this.data.filterData,
+ })
+ console.log('this.data.filterData[data.type]', this.data.filterData[data.type]);
} else {
this.data.filterData[data.type][data.arr].forEach((item) => {
if (item.id == data.id) {
@@ -1491,11 +1515,31 @@ Page({
}
}
});
+ this.setData({
+ filterData: this.data.filterData,
+ }, () => {
+ // 数据更新后的回调
+ console.log('this.data.filterData[data.type]', that.data.filterData[data.type]);
+ that.data.filterStatus['unset_' + data.arr] = !that.data.filterData[data.type][data.arr].some(item => item.active != 0);
+ that.setData({
+ filterStatus: that.data.filterStatus
+ })
+ console.log('that.data.filterStatus', that.data.filterStatus);
+ });
}
- this.setData({
- filterData: this.data.filterData,
- });
+ },
+ clearArray (e) {
+ let that = this
+ let data = e.currentTarget.dataset;
+ this.data.filterData.jobFilter[data.type].forEach((item) => {
+ item.active = 0
+ })
+ that.data.filterStatus['unset_' + data.type] = true
+ that.setData({
+ filterStatus: that.data.filterStatus,
+ filterData: that.data.filterData
+ })
},
/**
* 智能匹配标签的点击
@@ -1618,8 +1662,7 @@ Page({
this.data.selectJobList.forEach((item, index) => {
if (item.id == data.id) {
this.data.selectJobList.splice(index, 1);
- let ind =
- filter.jobFilter["tagArray" + data.typeClassify].indexOf(item);
+ let ind = filter.jobFilter["tagArray" + data.typeClassify].indexOf(item);
console.log(filter.jobFilter["tagArray" + data.typeClassify][ind]);
filter.jobFilter["tagArray" + data.typeClassify][ind].active = 0;
// let ind = filter.classifyList.indexOf(item);
@@ -1628,9 +1671,11 @@ Page({
this.toList();
}
});
+ this.data.filterStatus['unset_tagArray' + data.typeClassify] = !filter.jobFilter["tagArray" + data.typeClassify].some(item => item.active != 0)
this.setData({
selectJobList: this.data.selectJobList,
filterData: this.data.filterData,
+ filterStatus: this.data.filterStatus
});
} else {
console.log('this.data.selectBrandList', this.data.selectBrandList);
@@ -1658,11 +1703,11 @@ Page({
deleteAge (e) {
console.log(e);
let that = this;
- that.data.storeJobListSearchForm.ageRangeStr = "16-60";
+ that.data.storeJobListSearchForm.ageRangeStr = "";
that.data.storeJobListSearchForm.pageNum = 1;
this.setData({
- minAge: 16,
- maxAge: 60,
+ minAge: '',
+ maxAge: '',
rangeValues: [16, 60],
});
this.toList();
@@ -1685,13 +1730,13 @@ Page({
this.data.storeJobListSearchForm.pageNum = 1;
this.data.filterData.sex.forEach((item, index) => {
item.active = 0;
- if (index == 2) {
+ if (index == 0) {
item.active = -1;
}
});
this.data.smartObj.sex.forEach((item, index) => {
item.active = 0;
- if (index == 2) {
+ if (index == 0) {
item.active = -1;
}
});
@@ -1821,12 +1866,19 @@ Page({
this.setData({
selectJobList: [],
selectBrandList: [],
+ filterStatus: {
+ unset_tagArray0: true,
+ unset_tagArray1: true,
+ unset_tagArray2: true,
+ unset_tagArray3: true,
+ unset_tagArray4: true,
+ },
// firstMenu: "工价",
secondMenu: "不限",
sexid: -1,
rangeValues: [16, 60],
- maxAge: 60,
- minAge: 16,
+ maxAge: '',
+ minAge: '',
// activez: "zuigao",
storeJobListSearchForm: this.data.storeJobListSearchForm,
});
@@ -1834,13 +1886,20 @@ Page({
filterData = middleList;
this.setData({
selectJobList: [],
+ filterStatus: {
+ unset_tagArray0: true,
+ unset_tagArray1: true,
+ unset_tagArray2: true,
+ unset_tagArray3: true,
+ unset_tagArray4: true,
+ },
selectBrandList: [],
// firstMenu: "工价",
secondMenu: "不限",
sexid: -1,
rangeValues: [16, 60],
- maxAge: 60,
- minAge: 16,
+ maxAge: '',
+ minAge: '',
// activez: "zuigao",
});
}
@@ -1869,7 +1928,7 @@ Page({
},
swiperToggleF () {
this.setData({
- isSwiper:true,
+ isSwiper: true,
// inputVal:''
})
},
@@ -1901,11 +1960,13 @@ Page({
} else if (k == "sex") {
formSearch.sex = item.id;
if (item.id == -1) {
- this.data.secondMenu = "不限";
+ this.data.secondMenu = "";
} else if (item.id == 1) {
- this.data.secondMenu = "男生";
+ this.data.secondMenu = "收男工";
} else if (item.id == 2) {
- this.data.secondMenu = "女生";
+ this.data.secondMenu = "收女工";
+ } else if (item.id == "3") {
+ that.data.secondMenu = "男女都收";
}
this.setData({
sexid: item.id,
@@ -1943,7 +2004,7 @@ Page({
that.data.storeJobListSearchForm = {
...that.data.storeJobListSearchForm,
...formSearch,
- ageRangeStr: that.data.minAge + "-" + that.data.maxAge,
+ ageRangeStr: that.data.minAge ? that.data.minAge + "-" + that.data.maxAge : '',
};
if (this.data.choiceCollect == 0) {
that.data.storeJobListSearchForm.ucj = 0;
@@ -1972,7 +2033,7 @@ Page({
pageNum: 1,
pageSize: 20,
sex: -1,
- ageRangeStr: "16-60",
+ ageRangeStr: "",
salaryRangeStr: "1000-15000",
};
let filter = this.data.smartObj;
@@ -2016,7 +2077,7 @@ Page({
that.data.storeJobListSearchForm = {
...that.data.storeJobListSearchForm,
...formSearch,
- ageRangeStr: that.data.minAge + "-" + that.data.maxAge,
+ // ageRangeStr: that.data.minAge + "-" + that.data.maxAge,
salaryRangeStr: minSalary + "-" + maxSalary,
};
if (this.data.choiceCollect == 0) {
@@ -2034,7 +2095,7 @@ Page({
pageNum: 1,
pageSize: 20,
sex: -1,
- ageRangeStr: "16-60",
+ ageRangeStr: "",
salaryRangeStr: "1000-15000",
}) ?
true : false,
@@ -2093,8 +2154,8 @@ Page({
rangeValues: [16, 60],
secondMenu: "不限",
sexid: -1,
- maxAge: 60,
- minAge: 16,
+ maxAge: '',
+ minAge: '',
salary: [10, 150], // 薪资筛选区间
minSalary: 10,
maxSalary: 150,
@@ -2776,6 +2837,7 @@ Page({
item.returnFeeType,
item.returnFee / 100
);
+
} else {
item["fuWuFei"] = "";
}
@@ -4280,21 +4342,21 @@ Page({
collectChange (e) {
let that = this;
// if (that.data.isLogin || (!that.data.isLogin && e.currentTarget.dataset.item.key == 0)) {
- if (e.currentTarget.dataset.item) {
- let item = e.currentTarget.dataset.item
- that.data.choiceCollect = item.key;
- // that.data.storeJobListSearchForm.ucj = e.currentTarget.dataset.id;
- that.data.storeJobListSearchForm.sortTag = item.key;
- that.data.storeJobListSearchForm.picked = item.picked;
- that.data.storeJobListSearchForm.pageNum = 1;
- that.setData({
- choiceCollect: that.data.choiceCollect,
- storeJobListSearchForm: that.data.storeJobListSearchForm,
- recordList: [],
- hasMoreData: true,
- });
- that.getJobList();
- }
+ if (e.currentTarget.dataset.item) {
+ let item = e.currentTarget.dataset.item
+ that.data.choiceCollect = item.key;
+ // that.data.storeJobListSearchForm.ucj = e.currentTarget.dataset.id;
+ that.data.storeJobListSearchForm.sortTag = item.key;
+ that.data.storeJobListSearchForm.picked = item.picked;
+ that.data.storeJobListSearchForm.pageNum = 1;
+ that.setData({
+ choiceCollect: that.data.choiceCollect,
+ storeJobListSearchForm: that.data.storeJobListSearchForm,
+ recordList: [],
+ hasMoreData: true,
+ });
+ that.getJobList();
+ }
// } else {
// // if(e.currentTarget.dataset.id == 1){
// that.setData({
@@ -4428,7 +4490,7 @@ Page({
siv: "menu",
});
});
- } else if (str == "shijian"){
+ } else if (str == "shijian") {
that.setData({
firstMenu: "时间",
// storeJobListSearchForm: tha t.data.storeJobListSearchForm,
diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml
index 3e1a7d6..4401a11 100644
--- a/pages/firstBill/index.wxml
+++ b/pages/firstBill/index.wxml
@@ -141,34 +141,39 @@
{{item.name}}
- -->
+ -->
薪资福利
+ 不限
{{item.name}}
吃饭住宿
+ 不限
{{item.name}}
班制休息
+ 不限
{{item.name}}
面试特色
+ 不限
{{item.name}}
其他特色
+ 不限
{{item.name}}
@@ -232,7 +237,7 @@
-->
-
+
-
+
{{maxAge == minAge ? maxAge + '岁' : storeJobListSearchForm.ageRangeStr + (maxAge == 60 ? '+' : '')}}
@@ -1076,7 +1081,7 @@
-
+