From 7e653af20434f13e2b29bf5b9cc8cb7b9cfc1ec2 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Tue, 2 Jan 2024 09:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=8A=A9=E6=89=8B=E9=98=89?=
=?UTF-8?q?=E5=89=B2=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/iconfont/iconfont.wxss | 10 +++++++---
components/recordBill/index.wxml | 6 +++---
pages/collect/index.wxml | 9 +++++----
pages/detail/index.js | 20 ++++++++++++++------
pages/index/index.js | 28 +++++-----------------------
pages/index/index.wxml | 6 +++---
pages/mineAgency/index.js | 37 +++++++++++++++++++++++++++++++------
pages/mineAgency/index.wxml | 6 +++---
utils/commonUtil.js | 8 ++++++--
9 files changed, 77 insertions(+), 53 deletions(-)
diff --git a/assets/iconfont/iconfont.wxss b/assets/iconfont/iconfont.wxss
index 7bf4fc9..efa2cc3 100644
--- a/assets/iconfont/iconfont.wxss
+++ b/assets/iconfont/iconfont.wxss
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4374774 */
- src: url('//at.alicdn.com/t/c/font_4374774_rxfy5vyoct9.woff2?t=1703661775751') format('woff2'),
- url('//at.alicdn.com/t/c/font_4374774_rxfy5vyoct9.woff?t=1703661775751') format('woff'),
- url('//at.alicdn.com/t/c/font_4374774_rxfy5vyoct9.ttf?t=1703661775751') format('truetype');
+ src: url('//at.alicdn.com/t/c/font_4374774_0sqvo64lxrz.woff2?t=1703748701699') format('woff2'),
+ url('//at.alicdn.com/t/c/font_4374774_0sqvo64lxrz.woff?t=1703748701699') format('woff'),
+ url('//at.alicdn.com/t/c/font_4374774_0sqvo64lxrz.ttf?t=1703748701699') format('truetype');
}
.iconfont {
@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-duihao:before {
+ content: "\e6a9";
+}
+
.icon-zanwu:before {
content: "\e6ec";
}
diff --git a/components/recordBill/index.wxml b/components/recordBill/index.wxml
index 0c2d1f6..17f4928 100644
--- a/components/recordBill/index.wxml
+++ b/components/recordBill/index.wxml
@@ -19,7 +19,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
diff --git a/pages/collect/index.wxml b/pages/collect/index.wxml
index 11bdcdc..a462fe1 100644
--- a/pages/collect/index.wxml
+++ b/pages/collect/index.wxml
@@ -18,10 +18,10 @@
- {{item.jobName || item.aliasName}}
+ {{item.jobName || item.storeName}}
-
+
{{item.monthlyPay}}元/月，{{item.age}}
+
-
+
{{item.agencyName}}
- {{item.updateTime}}
+ {{item.updateTime || item.createTime}}
diff --git a/pages/detail/index.js b/pages/detail/index.js
index 13ad2e4..32a038d 100644
--- a/pages/detail/index.js
+++ b/pages/detail/index.js
@@ -249,8 +249,10 @@ Page({
// res.data.data.storeImage.forEach((item) => {
// item.isImg = regs.test(item.url.toLowerCase());
// });
- result.job.genderRestrict = commonUtil.getGenderByMinAge(result.job);
- result.job.updateTime = dateUtil.timeShowXXX(result.job.updateTime)
+ // result.job.genderRestrict = commonUtil.getGenderByMinAge(result.job);
+ if(result.job.updateTime){
+ result.job.updateTime = dateUtil.timeShowXXX(result.job.updateTime)
+ }
// if (app.isNotEmptyCheck(title)) {
// title = result.storeJob.jobName;
// } else {
@@ -356,7 +358,7 @@ Page({
*/
disposeJobListData (jobDetail) {
var that = this;
-
+ console.log(jobDetail);
// item["workType"] = commonUtil.getWorkTypeById(
// item.workTypeMulti
// );
@@ -736,9 +738,15 @@ Page({
iosDialogTobe: false,
});
},
- onShareAppMessage: function () {
- // menu:[‘shareAppMessage’,‘shareTimeline’]
- // return custom share data when user share.
+ onShareAppMessage: function (res) {
+ console.log(res)
+ return{
+ tittle:'转发标题',
+ desc:'转发提示',
+ path:'/pages/detail/index?storeJobId=' + this.data.searchForm.storeJobId,
+ success:function(res){},
+ fail:function(res){}
+ }
},
onShareTimeline: function () {},
share(){
diff --git a/pages/index/index.js b/pages/index/index.js
index 7141621..cee0f19 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -347,29 +347,7 @@ Page({
app.globalData.isCommission = 1;
}
app.getLoginUserTokenInfo();
-
this.getJobList();
- if (wx.getStorageSync("FILTER_LIST")) {
- let list = wx.getStorageSync("FILTER_LIST");
- list.forEach((item) => {
- item.active = 0;
- if (item.typeClassify == "0") {
- this.data.filterData.jobFilter["tagArray0"].push(item);
- } else if (item.typeClassify == "1") {
- this.data.filterData.jobFilter["tagArray1"].push(item);
- } else if (item.typeClassify == "2") {
- this.data.filterData.jobFilter["tagArray2"].push(item);
- } else if (item.typeClassify == "3") {
- this.data.filterData.jobFilter["tagArray3"].push(item);
- } else if (item.typeClassify == "4") {
- this.data.filterData.jobFilter["tagArray4"].push(item);
- }
- });
- let jobFilter = "filterData.jobFilter";
- this.setData({
- [jobFilter]: this.data.filterData.jobFilter,
- });
- }
},
onReady() {
let that = this;
@@ -681,7 +659,11 @@ Page({
success: function (res) {
console.log("职位列表↓↓↓↓");
console.log(res);
-
+ if(res.data.status == '9999'){
+ wx.navigateTo({
+ url: '../login/index',
+ })
+ }
that.setData({
totalPage: res.data.data.pageBean.pageCount,
currPage: res.data.data.pageBean.currentPage,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5dd730c..c629fde 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,4 +1,4 @@
-
+
报名助手
@@ -25,7 +25,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
暂无记录
diff --git a/pages/mineAgency/index.js b/pages/mineAgency/index.js
index b9fb7bf..159f9d1 100644
--- a/pages/mineAgency/index.js
+++ b/pages/mineAgency/index.js
@@ -8,6 +8,7 @@ Page({
data: {
list: [],
deleteAgencyShow: false,
+ deleteAgencyId:'',
storeJobListSearchForm: {
pageNum: 1,
pageSize: 20,
@@ -108,10 +109,32 @@ Page({
success: function (res) {
if (res.confirm) {
console.log("用户点击确定");
- wx.showToast({
- title: '删除成功',
- icon: 'success'
- })
+
+ wx.request({
+ url: app.globalData.ip + "/assistant/mine/delAgency/"+this.data.deleteAgencyId,
+ header: app.globalData.headers,
+ method: "get",
+ success: function (res) {
+ console.log(res);
+ if (res.data.status == 200) {
+ wx.showToast({
+ title: '删除成功',
+ icon: 'success'
+ })
+ that.getList();
+
+ }
+ },
+ });
+
+
+
+
+
+ // wx.showToast({
+ // title: '删除成功',
+ // icon: 'success'
+ // })
that.setData({
deleteAgencyShow: false
})
@@ -127,9 +150,11 @@ Page({
deleteAgencyShow: false
})
},
- deleteAgency () {
+ deleteAgency (e) {
+ console.log(e.currentTarget.dataset.agencyid);
this.setData({
- deleteAgencyShow: true
+ deleteAgencyShow: true,
+ deleteAgencyId:e.currentTarget.dataset.agencyid
})
},
/**
diff --git a/pages/mineAgency/index.wxml b/pages/mineAgency/index.wxml
index 5955e68..a68162c 100644
--- a/pages/mineAgency/index.wxml
+++ b/pages/mineAgency/index.wxml
@@ -16,10 +16,10 @@
-
- {{item.title}}
+
+ {{item.agencyName}}
-
+
diff --git a/utils/commonUtil.js b/utils/commonUtil.js
index 440d3ee..189b65b 100644
--- a/utils/commonUtil.js
+++ b/utils/commonUtil.js
@@ -1240,8 +1240,12 @@ export function disposeJobListData(recordList) {
if(item['agencyName'] && item.agencyCode){
item['agencyName'] = item.agencyName.split(item.agencyCode).join('')
}
-
- item.updateTime = dateUtil.timeShowXXX(item.updateTime)
+ if(item.updateTime){
+ item.updateTime = dateUtil.timeShowXXX(item.updateTime)
+ }
+ if(item.createTime){
+ item.createTime = dateUtil.timeShowXXX(item.createTime)
+ }
//月薪
var monthlyPayStr = "";
// if (hasHourlyPay) {