diff --git a/pages/configAnnunciateAddContact/index.js b/pages/configAnnunciateAddContact/index.js
index e197445..76567a2 100644
--- a/pages/configAnnunciateAddContact/index.js
+++ b/pages/configAnnunciateAddContact/index.js
@@ -162,7 +162,7 @@ onShareAppMessage() {
sourceJson,
type,
};
- customRequest("/agency/updateContactCfg", { header: 'headers', method: 'post', data: {} }).then((res) => {
+ customRequest("/agency/updateContactCfg", { header: 'headers', method: 'post', data }).then((res) => {
if (res.data.status == 200) {
app.globalData.loginUserInfo.noticeEndStr = res.data.data.noticeEndStr;
wx.showToast({
diff --git a/pages/detail/index.js b/pages/detail/index.js
index 76304e3..c7cb1ce 100644
--- a/pages/detail/index.js
+++ b/pages/detail/index.js
@@ -73,12 +73,7 @@ Page({
},
onShow () {
var that = this;
- this.setData({
- isLogin: app.globalData.isLogin,
- isLoading: true,
- // userInfo:{...app.globalData.loginUserInfo, agencyStatus:0},
- });
- setTimeout(() => {
+ app.getLoginUserTokenInfo().then(() => {
that.setData({
isAgency: app.globalData.loginUserInfo.agencyStatus == 1 ? true : false,
corpUserFlag: app.globalData.loginUserInfo.corpUserFlag,
@@ -90,10 +85,18 @@ Page({
that.setData({
// agencyStatus: app.globalData.agencyStatus,
userInfo: app.globalData.loginUserInfo,
+ isLogin: app.globalData.isLogin,
+ isLoading: true,
});
that.getCode();
}
- }, 100);
+ });
+ // this.setData({
+ // isLogin: app.globalData.isLogin,
+ // isLoading: true,
+ // // userInfo:{...app.globalData.loginUserInfo, agencyStatus:0},
+ // });
+
// else {
// wx.setStorageSync("comeFromPage", "detail");
@@ -142,51 +145,52 @@ Page({
console.log(e);
console.log('jobDetail', this.data.jobDetail);
app.vibrateShort()
- if (this.data.fromBocai) {
- if (this.data.jobDetail.customServiceUsers.length > 0) {
- this.setData({
- kefuShow: true
- })
- } else {
- wx.showToast({
- title: '该岗位暂无客服',
- icon: 'none',
- duration: 2000
- })
- }
+ // if (this.data.fromBocai) {
+ // if (this.data.jobDetail.customServiceUsers.length > 0) {
+ // this.setData({
+ // kefuShow: true
+ // })
+ // } else {
+ // wx.showToast({
+ // title: '该岗位暂无客服',
+ // icon: 'none',
+ // duration: 2000
+ // })
+ // }
+ // } else {
+ let url = e.currentTarget.dataset.customServiceUrl
+ // console.log('/pages/detail/index?storeJobId' + this.data.searchForm.storeJobId);
+ console.log('app.globalData.loginUserInfo.agencyId', app.globalData.loginUserInfo.agencyId);
+ if (e.currentTarget.dataset.customServiceUrl != '') {
+ wx.openCustomerServiceChat({
+ // extInfo: { url: 'https://work.weixin.qq.com/kfid/kfc84d8465f4c633511' },
+ extInfo: {
+ url: url || 'https://work.weixin.qq.com/kfid/kfc84d8465f4c633511'
+ },
+ 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) {
+ console.log('res', res);
+ },
+ fail (err) {
+ console.log('err', err);
+ }
+ })
} else {
- let url = e.currentTarget.dataset.customServiceUrl
- // console.log('/pages/detail/index?storeJobId' + this.data.searchForm.storeJobId);
- if (e.currentTarget.dataset.customServiceUrl != '') {
- wx.openCustomerServiceChat({
- // extInfo: { url: 'https://work.weixin.qq.com/kfid/kfc84d8465f4c633511' },
- extInfo: {
- url: url || 'https://work.weixin.qq.com/kfid/kfc84d8465f4c633511'
- },
- showMessageCard: true,
- sendMessagePath: `/pages/detail/index.html?storeJobId=${this.data.searchForm.storeJobId}&jobClassify=${this.data.searchForm.jobClassify}`,
- // sendMessageTitle:'丸子吗喽你好呀',
- // sendMessageImg:'../../assets/images/jbn.png',
- corpId: 'wwc227639d3a136c8d',
- success (res) {
- console.log('res', res);
- },
- fail (err) {
- console.log('err', err);
- }
- })
- } else {
- wx.showToast({
- title: '该岗位暂无客服',
- icon: 'none',
- duration: 2000
- })
- }
-
+ wx.showToast({
+ title: '该岗位暂无客服',
+ icon: 'none',
+ duration: 2000
+ })
}
+ // }
+
},
showImage (e) {
let resImg = e.currentTarget.dataset.src;
@@ -299,7 +303,7 @@ Page({
},
onLoad (query) {
var that = this;
- console.log(app.globalData.loginUserInfo);
+ console.log('app.globalData.loginUserInfo', app.globalData.loginUserInfo);
qqmapsdk = new QQMapWX({
key: "5PTBZ-YI7C6-MZGS3-ES7QN-4T5O2-EJFVR",
});
@@ -342,25 +346,16 @@ Page({
if (query.storeJobId) {
this.data.searchForm.storeJobId = query.storeJobId;
- this.data.searchForm.jobClassify = query.jobClassify || 1;
- let fromBocai = false
- if (this.data.searchForm.jobClassify == 2) {
- fromBocai = true
- }
- this.setData({
- fromBocai
- })
}
-
+ if (query.agencyId) {
+ this.data.searchForm.agencyId = query.agencyId;
+ }
// this.data.wxCode = query.wxCode;
// this.getLocation();
// that.setData({
// wxCode: that.data.wxCode
// })
- wx.setStorageSync({
- key: "storeJobId",
- data: query.storeJobId,
- });
+ wx.setStorageSync("storeJobId", query.storeJobId);
let agencyUserId = query.agencyUserId;
if (agencyUserId) {
@@ -381,7 +376,8 @@ Page({
console.log(app.globalData.isLogin);
console.log("sceneJson===", sceneJson);
this.data.searchForm.storeJobId = sceneJson.storeJobId;
- this.data.searchForm.jobClassify = sceneJson.jobClassify || 1;
+ this.data.searchForm.agencyId = sceneJson.agencyId || '';
+ // this.data.searchForm.jobClassify = sceneJson.jobClassify || 1;
if (!app.globalData.isLogin) {
wx.setStorageSync("comeFromPage", "detail");
// wx.setStorageSync("comeFromPageParam", { storeJobId: that.data.searchForm.storeJobId });
@@ -1677,7 +1673,7 @@ Page({
console.log(res);
contentInfo = res.dataset.info;
wx.setClipboardData({
- data: e.currentTarget.dataset.content,
+ data: e.currentTarget.dataset.content + contentInfo,
success (res) {
wx.getClipboardData({
success (res) {
diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml
index ab52b62..9fd126b 100644
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@@ -18,16 +18,10 @@
-->
-
+
代理佣金
-
+
{{fuWuFei || '--'}}
@@ -62,6 +56,7 @@
{{jobDetail.record.jobName}}
+ @{{jobDetail.record.supplier.supplierName}}
@@ -97,49 +92,52 @@
暂无特色
-
-
-
-
- ￥
- {{jobDetail.record.hourlyPay}}
- /时
-
-
- ￥
- {{jobDetail.record.hourlyPay}}
- /天
-
-
- ￥
- {{jobDetail.record.hourlyPay}}
- 补
-
-
- ￥
- {{jobDetail.record.hourlyPay}}
- 返
-
- 计件
-
- ￥
- {{jobDetail.record.hourlyPay}}
- 保底
-
- 面议
-
-
+
+ ￥
+ {{jobDetail.record.hourlyPay}}
+ /时
+
+
+ ￥
+ {{jobDetail.record.hourlyPay}}
+ /天
+
+
+ ￥
+ {{jobDetail.record.hourlyPay}}
+ 补
+
+
+ ￥
+ {{jobDetail.record.hourlyPay}}
+ 返
+
+ 计件
+
+ ￥
+ {{jobDetail.record.hourlyPay}}
+ 保底
+
+ 面议
+
+
- 月薪
+ /月-->
+ 月薪
+
+
+
+
+
+ {{jobDetail.record.monthlyPay ? '丨' + jobDetail.record.monthlyPay : '--'}}
-
-
-
-
- {{jobDetail.record.monthlyPay ? '丨' + jobDetail.record.monthlyPay : '--'}}
+ 代理:{{jobDetail.record.askAgencyName}}
@@ -208,6 +206,12 @@
+
+
+ 原始通告
+
+
+
@@ -379,12 +383,23 @@
{{jobDetail.record.jobInfoWithoutReturnFee}}
-
+
+
+ {{userInfo.agencyStatus == 1 ? (userInfo.noticeEndStr ? userInfo.noticeEndStr : ('详情咨询：' + userInfo.tel)) : ('详情咨询：' + serviceInfo.aliasName + (serviceInfo.workPhone || '-'))}}
+
+ 以上联系人，可以
+ 改成我的
+
+
+
+
+
+
-
+
{{item.aliasName + ' ' + item.tel}}
diff --git a/pages/detail/index.wxss b/pages/detail/index.wxss
index 834ce87..f94424b 100644
--- a/pages/detail/index.wxss
+++ b/pages/detail/index.wxss
@@ -4,7 +4,7 @@ page,
padding-bottom: 180px;
background-color: #f5f5f5;
}
-page{
+page {
padding: 16px;
}
.p14 {
@@ -596,6 +596,6 @@ button.collectBtn {
bottom: 182px;
}
-.h67{
+.h67 {
height: 67px;
}
diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js
index 55b163e..63ea4e8 100644
--- a/pages/firstBill/index.js
+++ b/pages/firstBill/index.js
@@ -4545,12 +4545,16 @@ Page({
});
},
showLeft () {
- this.getTabBar().setData({
- isShow: false,
- });
- this.setData({
- leftShow: true,
+ wx.navigateTo({
+ url: `/pages/listSharePage/index`,
+
});
+ // this.getTabBar().setData({
+ // isShow: false,
+ // });
+ // this.setData({
+ // leftShow: true,
+ // });
},
hideLeft () {
this.setData({
diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml
index 4d66301..5586e82 100644
--- a/pages/firstBill/index.wxml
+++ b/pages/firstBill/index.wxml
@@ -14,33 +14,16 @@
-
-
-
- {{item}}
-
-
+
+
+
+ {{item}}
+
+
-
-
+
+
搜索
@@ -132,7 +115,7 @@
{{item.name}}
-
+
年龄（岁）
@@ -798,19 +781,7 @@
-
-
-
-
-
-
-
-
-
- 批量
- 分享
-
-
+
智能匹配
@@ -1104,4 +1075,17 @@
+
+
+
+
+
+ 批量
+ 分享
+
+
diff --git a/pages/listSharePage/index.js b/pages/listSharePage/index.js
index beafcbd..e301975 100644
--- a/pages/listSharePage/index.js
+++ b/pages/listSharePage/index.js
@@ -1643,14 +1643,15 @@ Page({
// });
// index++;
// }, 5000);
+ console.log('this.data.templateList', app.globalData.templateList);
if (app.globalData.templateList) {
app.globalData.templateList.forEach((element) => {
console.log(element);
- if (element.title == "伯才小程序首页海报分享封面") {
+ if (element.title == "稻田小程序首页海报分享封面") {
this.setData({
sharelImg: element.img,
});
- console.log(this.data.sharelImg);
+ console.log('this.data.sharelImg', this.data.sharelImg);
}
});
}
@@ -2019,9 +2020,9 @@ Page({
console.log(that.data.storeJobListSearchForm);
// /yishoudan/store/job/platform/list
// /overall/store/job/list
- customRequest("/yishoudan/store/job/platform/list", { header: 'headers', method: 'POST', data: that.data.storeJobListSearchForm }).then((res) => {
- console.log('res',res);
- let data = res.data.data.pageBean
+ customRequest("/yishoudan/custom/job/listV2", { header: 'headers', method: 'POST', data: that.data.storeJobListSearchForm }).then((res) => {
+ console.log('res', res);
+ let data = res.data.data
that.setData({
totalPage: data.pageCount,
currPage: data.currentPage,
@@ -2032,6 +2033,49 @@ Page({
triggered: false,
});
}, 1000);
+ data.recordList.forEach((item, index) => {
+ console.log('item,item', item);
+ if (app.isNotEmptyCheck(item.logo)) {
+ item["logo"] = item.logo.indexOf("https") > -1 ? item.logo : item.logo.replace("http:", "https:");
+ }
+ if (app.isNotEmptyCheck(item.returnFeeType) || item.returnFeeType == "0" || item.returnFee == "0") {
+ item["fuWuFei"] = commonUtil.getReturnFeeTypeName1ById(item.returnFeeType, item.returnFee / 100);
+ } else {
+ item["fuWuFei"] = "";
+ }
+ item.minMonthlyPay = item.minMonthlyPay / 100
+ item.maxMonthlyPay = item.maxMonthlyPay / 100
+ if (item.jobSpecialLabelNames && item.jobSpecialLabelNames.length > 0) {
+ item.labelGroup = item.jobSpecialLabelNames.split(', ').filter((itm, inx) => {
+ return inx < 6
+ }).map(itm => {
+ return itm
+ })
+ } else {
+ item.labelGroup = [];
+ }
+ // 简版弹窗通告显示
+ // if (item.id == that.data.currentJobDrawer.id) {
+ // item["jobDesp"] = item.jobDesp.replace(/\*\*\*\*\*/g, "").split("————————")[0];
+ // 展示用字段
+ // item["jobDesp1"] = item.jobDesp.replace("⚠", "");
+ // item["jobDesp1"] = item.jobDesp1.replace("[红包]", "");
+ that.data.currentJobDrawer = { ...item, index: that.data.currentJobDrawer.index ? that.data.currentJobDrawer.index : null };
+ // }
+ // if (index == 0 || index == 1 || index == 2) {
+ // that.data.checkedList.push(item);
+ // }
+ try {
+ that.data.checkedList.forEach((item1, index1) => {
+ if (item1.id == item.id) {
+ item.checked = true;
+ throw Error;
+ } else {
+ item.checked = false;
+ }
+ });
+ } catch (error) { }
+ });
if (data.recordList == null || data.recordList.length == 0 || data.recordList.length < that.data.storeJobListSearchForm.pageSize) {
var jobListTemp = commonUtil.disposeJobListData(data.recordList);
that.data.recordList = that.data.recordList.concat(jobListTemp);
@@ -2060,38 +2104,7 @@ Page({
resolve();
that.getTag();
- that.data.recordList.forEach((item, index) => {
- // console.log(item);
- if (app.isNotEmptyCheck(item.logo)) {
- item["logo"] = item.logo.indexOf("https") > -1 ? item.logo : item.logo.replace("http:", "https:");
- }
- 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];
- // 展示用字段
- item["jobDesp1"] = item.jobDesp.replace("⚠", "");
- item["jobDesp1"] = item.jobDesp1.replace("[红包]", "");
- that.data.currentJobDrawer = { ...item, index: that.data.currentJobDrawer.index ? that.data.currentJobDrawer.index : null };
- // }
- // if (index == 0 || index == 1 || index == 2) {
- // that.data.checkedList.push(item);
- // }
- try {
- that.data.checkedList.forEach((item1, index1) => {
- if (item1.id == item.id) {
- item.checked = true;
- throw Error;
- } else {
- item.checked = false;
- }
- });
- } catch (error) { }
- });
+
that.setData({
recordList: that.data.recordList,
currentJobDrawer: that.data.currentJobDrawer,
@@ -2263,7 +2276,7 @@ Page({
titleSize = 40;
roundRectHeight = 156;
ageTop = 62;
- salaryClassifyValueLeft = 56;
+ salaryClassifyValueLeft = 6;
salaryClassifyValueTop = 10;
monthlyPaySize = 32;
console.log(123);
@@ -2323,11 +2336,12 @@ Page({
monthlyPaySize = 2 * 24;
markTop = 2 * 115;
console.log(123);
+ console.log('app.globalData.ip + that.data.currCode', app.globalData.ip + that.data.currCode);
wx.getImageInfo({
// src: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/qrcode.png", //网络图片,如果不行请换一个
src: app.globalData.ip + that.data.currCode,
success (res) {
- // console.log(res);
+ console.log('setShareImg', res);
const img = canvas.createImage();
img.src = res.path;
img.onload = () => {
@@ -2339,74 +2353,90 @@ Page({
funObj.roundRect1(ctx, QRLeft - 10, baseTop + QRTop - 10, QRSize + 20, QRSize + 20, 0, "#fff");
funObj.roundRect(ctx, img, QRLeft, baseTop + QRTop, QRSize, QRSize, 0);
}
- // if (index == that.data.checkedList.length - 1) {
- // setTimeout(() => {
- // imgres();
- // }, 200);
- // }
- };
- },
- fail (err) {
-
- },
- });
- that.data.checkedList.forEach((item, index) => {
- let labelLeft = 0;
-
- funObj.roundRect1(ctx, 24 * 2, baseTop - 100 + baseMiddle * index, 1104, roundRectHeight, 32, "#fff");
- item.jobSpecialLabelNameArray.forEach((item1) => {
- funObj.fillTextLineBreak(ctx, item1, 60 * 2 + labelLeft, baseTop + markTop + 30 * 2 + baseMiddle * index, 400 * 2, 20, "#333", monthlyPaySize); // 标签字符
- funObj.roundRect1(ctx, 52 * 2 + labelLeft, baseTop + markTop + baseMiddle * index, ctx.measureText(item1).width + 16 * 2, 40 * 2, 2 * 2, "#00000010"); // 标签背景色
- labelLeft += ctx.measureText(item1).width + 32 * 2;
- });
+ that.data.checkedList.forEach((item, index) => {
+ let labelLeft = 0;
+
+ funObj.roundRect1(ctx, 24 * 2, baseTop - 100 + baseMiddle * index, 1104, roundRectHeight, 32, "#fff");
+ if (item.jobSpecialLabelNameArray.length > 0) {
+ item.jobSpecialLabelNameArray.forEach((item1) => {
+ funObj.fillTextLineBreak(ctx, item1, 60 * 2 + labelLeft, baseTop + markTop + 30 * 2 + baseMiddle * index, 400 * 2, 20, "#333", monthlyPaySize); // 标签字符
+ funObj.roundRect1(ctx, 52 * 2 + labelLeft, baseTop + markTop + baseMiddle * index, ctx.measureText(item1).width + 16 * 2, 40 * 2, 2 * 2, "#00000010"); // 标签背景色
+ labelLeft += ctx.measureText(item1).width + 32 * 2;
+ });
+ } else {
+ funObj.fillTextLineBreak(ctx, '暂无特色', 60 * 2, baseTop + markTop + 30 * 2 + baseMiddle * index, 400 * 2, 20, "#333", monthlyPaySize); // 标签字符
+ funObj.roundRect1(ctx, 52 * 2, baseTop + markTop + baseMiddle * index, ctx.measureText('暂无特色').width + 16 * 2, 40 * 2, 2 * 2, "#00000010"); //
+ }
- funObj.fillTextLineBreak(ctx, item.jobName, logoLeft, baseTop + baseMiddle * index, 500 * 2, 20, "#333", titleSize, "600"); // 岗位标题
- funObj.fillTextLineBreak(ctx, item.salaryClassifyValueHaibao, salaryClassifyValueLeft, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 * 2, 20, "#1890ff", titleSize - 4, "600"); // 时薪
+ funObj.fillTextLineBreak(ctx, item.jobName, logoLeft, baseTop + baseMiddle * index, 500 * 2, 20, "#333", titleSize, "600"); // 岗位标题
- // setTimeout(() => {
- funObj.fillTextLineBreak(ctx, item.monthlyPay, salaryClassifyValueLeft + ctx.measureText(item.salaryClassifyValueHaibao + " ").width, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 * 2, 20, "#1890ff", monthlyPaySize, "400"); // 月工资
- // }, 0);
+ funObj.fillTextLineBreak(ctx, item.salaryClassifyValueHaibao, logoLeft, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 * 2, 20, "#1890ff", titleSize - 4, "600"); // 时薪
- funObj.fillTextLineBreak(ctx, item.district, salaryClassifyValueLeft, baseTop + ageTop + baseMiddle * index, 500 * 2, 20, "#333", monthlyPaySize); // 省市
+ // setTimeout(() => {
+ funObj.fillTextLineBreak(ctx, item.monthlyPay, logoLeft + ctx.measureText(item.salaryClassifyValueHaibao + " ").width, baseTop + salaryClassifyValueTop + baseMiddle * index, 400 * 2, 20, "#1890ff", monthlyPaySize, "400"); // 月工资
+ // }, 0);
- funObj.fillTextLineBreak(ctx, " | " + item.age, salaryClassifyValueLeft + ctx.measureText(item.district).width, baseTop + ageTop + baseMiddle * index, 500 * 2, 20, "#333", monthlyPaySize); // 年龄
+ funObj.fillTextLineBreak(ctx, item.district, logoLeft, baseTop + ageTop + baseMiddle * index, 500 * 2, 20, "#333", monthlyPaySize); // 省市
- funObj.fillTextLineBreak(ctx, that.data.userInfo.agencyName, mycenter - ctx.measureText(that.data.userInfo.agencyName).width / 2, fubiaotiTop, 400 * 2, 20, "#fff", monthlyPaySize, "600"); // 代理名称
+ funObj.fillTextLineBreak(ctx, " | " + item.age, logoLeft + ctx.measureText(item.district).width, baseTop + ageTop + baseMiddle * index, 500 * 2, 20, "#333", monthlyPaySize); // 年龄
- if (that.data.checkedList.length == 1) {
- // roundRect1(ctx, mycenter - 600 / 2, baseTop + 750, 600, 560, 32, "#fff");
- funObj.fillTextLineBreak(ctx, "长按查看职位详情", mycenter - ctx.measureText("长按查看职位详情").width / 2, baseTop + bottomSloganTop, 300 * 2, 20, "#fff", monthlyPaySize); // 底部slogan
- funObj.fillTextLineBreak(ctx, "好工作 放心干", mycenter - ctx.measureText("好工作 放心干").width / 1.45, baseTop + bottomSloganTop1, 500 * 2, 20, "#fff", titleSize); // 底部slogan
- } else {
- funObj.fillTextLineBreak(ctx, "长按查看职位详情", bottomSloganLeft, baseTop + bottomSloganTop, 300 * 2, 20, "#fff", monthlyPaySize + 8); // 底部slogan
- funObj.fillTextLineBreak(ctx, "好工作 放心干", bottomSloganLeft1, baseTop + bottomSloganTop1, 500 * 2, 20, "#fff", titleSize); // 底部slogan
- }
- //生成logo图片
- wx.getImageInfo({
- src: item.logo, //网络图片,如果不行请换一个
- success (res) {
- // console.log(res);
+ funObj.fillTextLineBreak(ctx, that.data.userInfo.agencyName, mycenter - ctx.measureText(that.data.userInfo.agencyName).width / 2, fubiaotiTop, 400 * 2, 20, "#fff", monthlyPaySize, "600"); // 代理名称
- const img = canvas.createImage();
- // console.log(ctx);
- img.src = res.path;
- img.onload = () => {
- // setTimeout(() => {
- funObj.roundRect(ctx, img, logoLeft, baseTop + 40 + baseMiddle * index, logoSize, logoSize, 8);
- // }, 500);
+ if (that.data.checkedList.length == 1) {
+ // roundRect1(ctx, mycenter - 600 / 2, baseTop + 750, 600, 560, 32, "#fff");
+ funObj.fillTextLineBreak(ctx, "长按查看职位详情", mycenter - ctx.measureText("长按查看职位详情").width / 2, baseTop + bottomSloganTop, 300 * 2, 20, "#fff", monthlyPaySize); // 底部slogan
+ funObj.fillTextLineBreak(ctx, "好工作 放心干", mycenter - ctx.measureText("好工作 放心干").width / 1.45, baseTop + bottomSloganTop1, 500 * 2, 20, "#fff", titleSize); // 底部slogan
+ } else {
+ funObj.fillTextLineBreak(ctx, "长按查看职位详情", bottomSloganLeft, baseTop + bottomSloganTop, 300 * 2, 20, "#fff", monthlyPaySize + 8); // 底部slogan
+ funObj.fillTextLineBreak(ctx, "好工作 放心干", bottomSloganLeft1, baseTop + bottomSloganTop1, 500 * 2, 20, "#fff", titleSize); // 底部slogan
+ }
+ //生成logo图片
if (index == that.data.checkedList.length - 1) {
setTimeout(() => {
imgres(canvas);
- }, 100);
+ }, 200);
}
- };
- },
- fail (err) {
- console.log(err);
- },
- });
+ // wx.getImageInfo({
+ // src: item.logo, //网络图片,如果不行请换一个
+ // success (res) {
+ // // console.log(res);
+
+ // const img = canvas.createImage();
+ // // console.log(ctx);
+ // img.src = res.path;
+ // img.onload = () => {
+ // // setTimeout(() => {
+ // funObj.roundRect(ctx, img, logoLeft, baseTop + 40 + baseMiddle * index, logoSize, logoSize, 8);
+ // // }, 500);
+ // if (index == that.data.checkedList.length - 1) {
+ // setTimeout(() => {
+ // imgres(canvas);
+ // }, 100);
+ // }
+ // };
+ // },
+ // fail (err) {
+ // console.log(err);
+ // },
+ // });
+ });
+ // if (index == that.data.checkedList.length - 1) {
+ // setTimeout(() => {
+ // imgres();
+ // }, 200);
+ // }
+ };
+ },
+ fail (err) {
+ console.log('err', err);
+ wx.showToast({
+ title: '生成失败,请重试',
+ icon: 'none'
+ })
+ },
});
+
// setTimeout(() => {
// },500);
diff --git a/pages/listSharePage/index.wxml b/pages/listSharePage/index.wxml
index 24b5d5f..ec22bdf 100644
--- a/pages/listSharePage/index.wxml
+++ b/pages/listSharePage/index.wxml
@@ -280,119 +280,88 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
- 主推
-
-
-
- {{item.brandName}}
-
-
-
-
+
+
+
+
+
+
+
+ {{item.jobName || item.aliasName}}
+ {{item.update}}
-
-
- {{item.jobName || item.aliasName}}
-
-
-
-
-
- {{item.district == "" ?'':item.district + ' | ' }}
- {{item.distanceKm}}
- {{item.age}}
-
-
-
-
- {{item1}}
- 暂无特色
-
-
+
+
+
+ {{item.district }}
+ {{item.district ?'丨' :''}}
+ {{item.distanceKm}}
+ {{item.genderRestrict + '丨' + item.age}}
-
-
-
-
- ￥
- {{item.salaryClassifyValue}}
- /时
-
-
- ￥
- {{item.salaryClassifyValue}}
- /天
-
-
- ￥
- {{item.salaryClassifyValue}}
- 补
-
-
- ￥
- {{item.salaryClassifyValue}}
- 返
-
- 计件
-
- ￥
- {{item.salaryClassifyValue}}
- 保底
+
+
+
+
+ {{itm || '-'}}
+
+ 暂无特色
- 面议
- {{'￥'+item.monthlyPay}}
+
+
+
+
+
+
+
+
+ ￥
+ {{item.salaryClassifyValue}}
+ /时
-
- 登录查看
+
+ ￥
+ {{item.salaryClassifyValue}}
+ /天
-
-
-
-
- {{agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '-') : '仅代理可见'}}
+
+ ￥
+ {{item.salaryClassifyValue}}
+ 补
+
+
+ ￥
+ {{item.salaryClassifyValue}}
+ 返
+
+ 计件
+
+ ￥
+ {{item.salaryClassifyValue}}
+ 保底
+
+ 面议
+
+ ￥
+ {{item.monthlyPay}}
+ /月
+
+
+
+
+ 登录查看
+ {{agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '-') : '仅代理可见'}}
+
-
-
-
-
-
- {{item.agencyName || '-'}}
-
-
-
-
-
-
+
diff --git a/pages/listSharePage/index.wxss b/pages/listSharePage/index.wxss
index 254fc5e..50939aa 100644
--- a/pages/listSharePage/index.wxss
+++ b/pages/listSharePage/index.wxss
@@ -1135,6 +1135,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
}
.drawer.showDrawer {
/* position: relative; */
+ opacity: 1;
border-radius: 8px 8px 0 0;
width: 100vw;
height: 92vh;
diff --git a/project.private.config.json b/project.private.config.json
index fae1dc9..60f5c19 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -263,5 +263,5 @@
]
}
},
- "libVersion": "2.33.0"
+ "libVersion": "3.7.8"
}
\ No newline at end of file