diff --git a/app.js b/app.js index 27420ec..996311e 100644 --- a/app.js +++ b/app.js @@ -46,7 +46,7 @@ App({ loginKey:'', agencyId:'', sceneStoreJobId:'', - appId:'wx0e390bea912ae982' + appId:'wxb0dea4d11428c6a5' }, // "permission": { // "scope.userLocation": { diff --git a/app.wxss b/app.wxss index 6f3aabe..600c888 100644 --- a/app.wxss +++ b/app.wxss @@ -838,8 +838,8 @@ button::after { } .jobTitle { - font-size: 22px; - /* font-weight: 601; */ + font-size: 24px; + font-weight: bold; color: rgba(0, 0, 0, 0.85); line-height: 30px; flex: 1; @@ -1103,7 +1103,7 @@ button::after { font-size: 18px; color: rgba(0, 0, 0, 0.85); /* flex:1; */ - width: 360rpx; + width: 480rpx; font-weight: 601; line-height: 1.2; overflow: hidden; diff --git a/assets/iconfont/iconfont.wxss b/assets/iconfont/iconfont.wxss index 35008f5..3ad282c 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_8lhn98fphhv.woff2?t=1702866649762') format('woff2'), - url('//at.alicdn.com/t/c/font_4374774_8lhn98fphhv.woff?t=1702866649762') format('woff'), - url('//at.alicdn.com/t/c/font_4374774_8lhn98fphhv.ttf?t=1702866649762') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4374774_b0kukqdv6v8.woff2?t=1703562167991') format('woff2'), + url('//at.alicdn.com/t/c/font_4374774_b0kukqdv6v8.woff?t=1703562167991') format('woff'), + url('//at.alicdn.com/t/c/font_4374774_b0kukqdv6v8.ttf?t=1703562167991') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-qingchu1:before { + content: "\e723"; +} + .icon-tijiaochenggong2:before { content: "\e71c"; } diff --git a/pages/index/index.js b/pages/index/index.js index dc0c8c0..eb00942 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,6 +1,7 @@ const app = getApp(); const commonUtil = require("../../utils/commonUtil.js"); +const dateUtil = require("../../utils/dateUtil.js"); Page({ data: { jobDetail:{}, @@ -35,18 +36,8 @@ Page({ storeJobListSearchForm: { pageNum: 1, pageSize: 20, - classify: 1, - sex: -1, - workTypeStr: "", - lat: "", - lng: "", - jobClassify: "", - sortTag: 0, - jobSpecialLabelIds: "", - cityName: "", - brandIds: "", - jobCategoryLabelIds: "", - ucj: 0, + keys: 1, + agencyUserId: "", }, loading: true, topJobList: [], @@ -77,223 +68,14 @@ Page({ sexid: "-1", // 性别筛选的id dialog1: false, dialog2: false, - jobSpecialLabelList: [], - brandList: [], - firstMenu: "排序", // 工价筛选tab显示 - secondMenu: "性别", // 性别筛选tab显示 - selectBrandList: [], // 选中的品牌标签 - selectJobList: [], // 选中的特色标签 - tagArray0: [], - tagArray1: [], - tagArray2: [], - tagArray3: [], - tagArray4: [], - recordBillType: "", // 报名类型(拍照或者直接报名) - signType: 0, // 职位类型(自营 三方) + recordCount: 0, totalPage: 0, currPage: 0, - currentJobDrawer: {}, // 当前简版职位抽屉信息 - drawerShow: false, // 简版职位抽屉显隐 - choiceCollect: 0, //收藏的筛选 - corpUserFlag: app.globalData.loginUserInfo.corpUserFlag, // 内部成员的判断 - agencyStatus: app.globalData.loginUserInfo.agencyStatus, // 是否是代理的判断 - serviceInfo: {}, // 代理信息 - navigatorBarHeight: 0, // 头部整体高度信息 - iosDialog: false, // 成为代理弹窗 - isLoading: true, // 成为代理图片加载loading效果 - isScrollTop: false, // 控制职位列表的滚动 - swiperTextList: ["搜索职位"], // 关键词轮播的关键词列表 - placeholderText: "", // 当前关键词 - leftShow: false, // 左侧智能匹配抽屉显示 - /** - * 滑动相关变量 - */ - lastX: 0, //滑动开始x轴位置 - lastY: 0, //滑动开始y轴位置 - text: "没有滑动", - currentGesture: 0, //标识手势 - listPosition: null, // 存储列表当前位置 - halfHide: true, // 智能匹配显示一半控制 - topNum: 0, - scrollTo: "", // 列表滚动的控制 - navList: [ - { - img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/ztrt.png", - url: "/pages/hotList/index", - title: "主推/热推", - }, - // { img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/dtld.png",url:'/pages/hotList/index', title: "报名助手亮点" }, - // { img: "http://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/zjzp.png",url:'/pages/hotList/index', title: "职教职培" }, - { - img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/cwdl.png", - url: "/pages/tobeAgency/index", - title: "成为代理", - }, - // { img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/dzkf.png",url:'/pages/hotList/index', title: "定制开发" }, - { - img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/xmhz.png", - url: "/pages/xiangmuhezuo/index", - title: "项目合作", - }, - { - img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/xtxx.png", - url: "/pages/message/index", - title: "消息中心", - }, - { - img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/lxwm.png", - url: "/pages/connectUs/index", - title: "联系我们", - }, - // { img: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/jqqd.png",url:'/pages/hotList/index', title: "敬请期待" }, - ], - bannerList: [], - /** - * 筛选的相关变量 - * - * - */ - filterData: { - yanba: [ - { - name: "无", - id: 1, - active: 0, - }, - { - name: "小面积", - id: 2, - active: 0, - }, - { - name: "大面积", - id: 3, - active: 0, - }, - ], - area: [ - { - name: "江浙沪", - id: 1, - active: 0, - }, - { - name: "鄂豫皖", - id: 2, - active: 0, - }, - { - name: "京津冀", - id: 3, - active: 0, - }, - { - name: "晋西北", - id: 4, - active: 0, - }, - { - name: "粤桂闽", - id: 5, - active: 0, - }, - { - name: "鲁东南", - id: 6, - active: 0, - }, - { - name: "黑吉辽", - id: 7, - active: 0, - }, - { - name: "疆藏青", - id: 8, - active: 0, - }, - { - name: "渝湘赣", - id: 9, - active: 0, - }, - { - name: "陕甘宁", - id: 10, - active: 0, - }, - { - name: "云贵川", - id: 11, - active: 0, - }, - { - name: "港澳台", - id: 12, - active: 0, - }, - ], - price: [ - { - name: "3000-4000", - id: 1, - active: 0, - }, - { - name: "4000-5000", - id: 2, - active: 0, - }, - { - name: "5000-6000", - id: 3, - active: 0, - }, - { - name: "6000-7000", - id: 4, - active: 0, - }, - { - name: "7000-8000", - id: 5, - active: 0, - }, - { - name: "8000以上", - id: 6, - active: 0, - }, - ], - sex: [ - { - name: "男", - id: 1, - active: 0, - }, - { - name: "女", - id: 2, - active: 0, - }, - { - name: "男女不限", - id: -1, - active: -1, - }, - ], - jobFilter: { - tagArray0: [], - tagArray1: [], - tagArray2: [], - tagArray3: [], - tagArray4: [], - }, - classifyList: [], - }, - copyList: {}, - innerFilter: false, + + + + }, // onPullDownRefresh:function(){ // this.getJobList(); @@ -311,224 +93,9 @@ Page({ url: "/pages/login/index", }); }, - close() { - let that = this; - let brandList = that.data.brandList; - let selectBrandList = that.data.selectBrandList; - if (selectBrandList.length > 0) { - for (let i = 0; i < brandList.length; i++) { - console.log("level1"); - for (let j = 0; j < selectBrandList.length; j++) { - console.log("level2"); - if (brandList[i].id == selectBrandList[j].id) { - return (brandList[i].checked = true); - } else { - brandList[i].checked = false; - } - } - } - } else { - brandList.forEach((item) => { - item.checked = false; - }); - } - return brandList; - }, - closeFix: function () { - var that = this; - // let brandList = that.close() - // that.data.brandList.forEach((item) => { - // if (that.data.selectBrandList.length > 0) { - // that.data.selectBrandList.forEach((item1) => { - // if (item.id != item1.id) { - // console.log("isSame"); - // item.checked = false; - // console.log(item.checked); - // } else { - // item.checked = true; - // } - // }); - // } else { - // item.checked = false; - // } - // }); - // console.log(that.data.brandList); - // console.log(that.data.selectBrandList); - console.log("isout"); - }, - touchStart(e) { - // console.log("滚起来", e); - // this.setData({ - // scrollStop: false - // }) - this.setData({ - // whichOneShow: mark, - siv: "", - }); - }, - choosenTop(e) { - var that = this; - // that.data.storeJobListSearchForm.pageNum = 1; - let id = e.currentTarget.dataset.id; - setTimeout(() => { - that.setData({ - toped: id, - // isScrollTop: false, - }); - }, 0); - // 切换标准 简版 重新查询列表 - // that.data.storeJobListSearchForm.pageNum = 1; - // that.setData({ - // toped: id, - // recordList: [], - // }); - // that.getJobList(); - }, - chooseNl: function (e) { - var that = this; - console.log(e); - let mark = ""; - let type = e.target.dataset.type; - let whichOneShow = that.data.whichOneShow; - // if (!that.data.isLogin) { - // wx.navigateTo({ - // url: "/pages/login/index", - // }); - // return; - // } - if (type == "gj") { - if (whichOneShow == "gj") { - mark = ""; - } else { - mark = "gj"; - } - } else if (type == "sex") { - if (whichOneShow == "sex") { - mark = ""; - } else { - mark = "sex"; - } - } else if (type == "brand") { - if (whichOneShow == "brand") { - mark = ""; - } else { - mark = "brand"; - } - } else if (type == "special") { - if (whichOneShow == "special") { - mark = ""; - } else { - mark = "special"; - } - } - if (that.data.siv != "menu") { - setTimeout(() => { - that.setData({ - whichOneShow: mark, - // siv:'menu' - }); - console.log(this.data.whichOneShow); - }, 0); - that.setData({ - siv: "menu", - scrollTo: "sticky", - }); - } - this.hideLeft(); - }, - toSpecialArea: function (e) { - var id = e.currentTarget.dataset.id; - wx.navigateTo({ - url: "../specialArea/index?id=" + id, - }); - }, - chooseM: function (e) { - var str = e.currentTarget.dataset.id; - console.log(str); - this.setData({ - activez: str, - }); - }, - watch() {}, - witchNav(e) { - console.log(e); - if (!this.data.isLogin) { - wx.navigateTo({ - url: "/pages/login/index", - }); - return; - } - if (e.currentTarget.dataset.title == "成为代理") { - console.log("成为代理"); - if (app.globalData.loginUserInfo.agencyStatus == 1) { - wx.showToast({ - title: "您已经是代理了", - icon: "none", - duration: 2000, - }); - return; - } - } else if (e.currentTarget.dataset.title == "主推/热推") { - wx.navigateTo({ - url: e.currentTarget.dataset.url + "?listtype=" + this.data.toped, - }); - return; - } - wx.navigateTo({ - url: e.currentTarget.dataset.url, - }); - }, - toHot(e) { - if (e.currentTarget.dataset.path) { - if (e.currentTarget.dataset.path == "/pages/hotList/index") { - wx.navigateTo({ - url: `${e.currentTarget.dataset.path}?listtype=${this.data.toped}`, - }); - } - } - }, - choiceSex(e) { - var that = this; - let data = e.currentTarget.dataset; - that.data.filterData[data.type].forEach((item) => { - item.active = 0; - }); - let index = that.data.filterData[data.type].findIndex((item) => { - return item.id == data.id; - }); - that.data.filterData[data.type][index].active = data.id; - // let str = that.data.sexid - console.log(e); - let str = e.currentTarget.dataset.id; - console.log(str); - if (str == "1") { - that.data.secondMenu = "男生"; - } else if (str == "2") { - that.data.secondMenu = "女生"; - } else if (str == "-1") { - that.data.secondMenu = "不限"; - } - that.setData({ - sexid: str, - secondMenu: this.data.secondMenu, - }); - that.data.storeJobListSearchForm.pageNum = 1; - that.data.storeJobListSearchForm.sex = str; - that.setData({ - storeJobListSearchForm: that.data.storeJobListSearchForm, - recordList: [], - filterData: that.data.filterData, - innerFilter: true, - }); - that.getJobList().then(() => { - that.setData({ - siv: "menu", - whichOneShow: "", - }); - }); - }, + watch() {}, onScrollRefresh: function () { var that = this; that.data.storeJobListSearchForm.pageNum = 1; @@ -565,26 +132,7 @@ Page({ this.data.storeJobListSearchForm.keys = this.data.inputVal; this.getJobList(); }, - onShareAppMessage: function () { - var path = commonUtil.getCurrentPageUrlWithArgs(); - if (app.globalData.isLogin && app.globalData.agencyStatus - 0 != 0) { - //当前用户是代理人 - path += (path.indexOf("?") >= 0 ? "&" : "?") + "agencyUserId=" + app.globalData.loginUserInfo.id; - } - console.log(path); - let img; - this.data.templateList.forEach((element) => { - if (element.title == "报名助手小程序首页卡片分享封面") { - img = element.img + "?" + new Date().getTime(); - } - }); - return { - title: " ", - path: path, - imageUrl: img, - }; - }, goSearch() { if (!this.data.isLogin) { wx.navigateTo({ @@ -632,197 +180,7 @@ Page({ console.log("清除成功"); }, inputBlur() {}, - getListByTypeAndIndustry: function () { - var that = this; - wx.request({ - url: app.globalData.ip + "/labels/getListByTypeAndIndustry", - data: { - type: 90, - industry: 2, - }, - header: app.globalData.header, - method: "GET", - success: function (res) { - console.log(res.data.data); - wx.setStorageSync("FILTER_LIST", res.data.data); - res.data.data.forEach((item) => { - if (item.typeClassify == "0") { - that.data.tagArray0.push(item); - } else if (item.typeClassify == "1") { - that.data.tagArray1.push(item); - } else if (item.typeClassify == "2") { - that.data.tagArray2.push(item); - } else if (item.typeClassify == "3") { - that.data.tagArray3.push(item); - } else if (item.typeClassify == "4") { - that.data.tagArray4.push(item); - } - }); - that.setData({ - tagArray0: that.data.tagArray0, - tagArray1: that.data.tagArray1, - tagArray2: that.data.tagArray2, - tagArray3: that.data.tagArray3, - tagArray4: that.data.tagArray4, - }); - - var jobSpecialLabelIdArray = that.data.storeJobListSearchForm.jobSpecialLabelIds.split(","); - res.data.data.forEach((item) => { - item["checked"] = false; - jobSpecialLabelIdArray.forEach((item1) => { - if (item.id == item1) { - item["checked"] = true; - } - }); - }); - - that.setData({ - jobSpecialLabelList: res.data.data, - }); - }, - }); - }, - golistSharePage() { - if (this.data.isLogin) { - if (app.globalData.loginUserInfo.agencyStatus == 1) { - wx.navigateTo({ - url: `/pages/listSharePage/index?listtype=${this.data.toped}`, - }); - } else { - wx.navigateTo({ - url: `/pages/tobeAgency/index`, - }); - } - } else { - wx.navigateTo({ - url: `/pages/login/index`, - }); - } - }, - getBrandNameAllList: function () { - var that = this; - wx.request({ - url: app.globalData.ip + "/labels/type/95", // 分类列表获取接口 - header: app.globalData.header, - method: "GET", - success: function (res) { - console.log(res); - if (res.data.status == 200) { - if (that.data.storeJobListSearchForm.brandIds) { - var brandIdArray = that.data.storeJobListSearchForm.brandIds.split(","); - } - console.log(res.data.data.labels); - wx.setStorageSync("CLASSIFY_LIST", res.data.data.labels); - res.data.data.labels.forEach((item) => { - item["checked"] = false; - if (brandIdArray) { - brandIdArray.forEach((item1) => { - if (item.id == item1) { - item["checked"] = true; - } - }); - } - }); - that.setData({ - brandList: res.data.data.labels, - }); - } - }, - }); - // wx.request({ - // url: app.globalData.ip + "/brand/getBrandNameAllList", // 品牌列表获取接口 - // data: {}, - // header: app.globalData.header, - // method: "GET", - // success: function (res) { - // console.log(res); - - // var brandIdArray = that.data.storeJobListSearchForm.brandIds.split(","); - - // res.data.data.forEach((item) => { - // item["checked"] = false; - // brandIdArray.forEach((item1) => { - // if (item.id == item1) { - // item["checked"] = true; - // } - // }); - // }); - // that.setData({ - // brandList: res.data.data, - // }); - // }, - // }); - }, - - selectBrand: function (e) { - var that = this; - let data = e.currentTarget.dataset; - let index = that.data.filterData[data.type].findIndex((item) => { - return item.id == data.id; - }); - that.data.filterData[data.type][index].active = data.id; - - if (that.data.brandList[data.index].checked) { - that.data.brandList[data.index].checked = false; - // let index1 = that.data.selectBrandList.indexOf(that.data.brandList[index]) - // that.data.selectBrandList.splice(index1,1) - } else { - that.data.brandList[data.index].checked = true; - } - console.log(that.data.selectBrandList); - this.setData({ - brandList: that.data.brandList, - filterData: that.data.filterData, - }); - }, - reset: function (e) { - var that = this; - console.log(e); - if (e.target.dataset.type == 1) { - //特色 - that.data.jobSpecialLabelList.forEach((item) => { - // console.log(item); - if (item.checked) { - item.checked = false; - } - }); - that.setData({ - jobSpecialLabelList: that.data.jobSpecialLabelList, - tagArray0: that.data.tagArray0, - tagArray1: that.data.tagArray1, - tagArray2: that.data.tagArray2, - tagArray3: that.data.tagArray3, - selectJobList: [], - whichOneShow: "", - }); - that.data.storeJobListSearchForm.jobSpecialLabelIds = ""; - } else if (e.target.dataset.type == 2) { - //品牌 - that.data.brandList.forEach((item) => { - if (item.checked) { - item.checked = false; - } - }); - that.setData({ - brandList: that.data.brandList, - selectBrandList: [], - whichOneShow: "", - }); - that.data.storeJobListSearchForm.jobCategoryLabelIds = ""; - // that.data.storeJobListSearchForm.brandIds = ""; - } else if (e.target.dataset.type == 4) { - that.setData({ - activez: "", - }); - } - that.data.storeJobListSearchForm.pageNum = 1; - that.setData({ - recordList: [], - innerFilter: false, - }); - that.getJobList(); - }, loginOut: function () { var that = this; var jobSpecialLabelIdArray = []; @@ -869,19 +227,7 @@ Page({ var that = this; console.log(options); console.log(wx.getSystemInfoSync()); - // Array.prototype.logResult = function(){ - // console.log('Array'); - // } - this.setData({ - placeholderText: this.data.swiperTextList[0], - }); - let arr = []; - arr.logResult(); - this.getListByTypeAndIndustry(); - this.getBrandNameAllList(); - - // 查看是否授权 wx.getSetting({ success(res) { if (res.authSetting["scope.userInfo"]) { @@ -895,57 +241,7 @@ Page({ }, }); - // if (app.isNotEmptyCheck(options.fromSearchPage) && options.fromSearchPage == 1) { - // try { - // var searchCityParamStorage = wx.getStorageSync("searchCityParamStorage"); - // if (searchCityParamStorage) { - // console.log("searchCityParamStorage======", searchCityParamStorage); - // that.data.storeJobListSearchForm.cityName = searchCityParamStorage.name; - // if (app.isEmptyCheck(searchCityParamStorage.name)) { - // that.data.storeJobListSearchForm.cityName = "全国"; - // } - // that.setData({ - // searchCityParamStorage: searchCityParamStorage, - // }); - // } - // } catch (e) { - // console.log("获取缓存设置的查询职位列表参数错误：", e); - // } - // } else { - // try { - // wx.removeStorageSync("searchJobListParamStorage"); - // } catch (e) { - // console.log("删除缓存设置的查询职位列表参数错误：", e); - // } - // try { - // wx.removeStorageSync("searchCityParamStorage"); - // } catch (e) { - // console.log("删除缓存设置的查询职位列表参数错误：", e); - // } - // } - - try { - if (app.globalData.isScanQRCodes - 1 == 0) { - wx.showToast({ - title: "欢迎查看好工作", - icon: "success", - duration: 2000, - }); - if (!getApp().globalData.isLogin) { - setTimeout(function () { - if (!getApp().globalData.isLogin) { - that.openIOS2(); - } - }, 5000); - } - } - } catch (e) { - console.log("获取缓存设置的查询职位列表参数错误：", e); - } - - console.log("options==============================1"); - console.log(options); - console.log("options==============================2"); + if (app.isNotEmptyCheck(options.scene)) { //扫小程序码携带参数 @@ -1043,7 +339,6 @@ Page({ } //登录=================================end - this.getHopeJobLabels(); var reset = true; let agencyUserId = options.agencyUserId; if (agencyUserId) { @@ -1075,23 +370,6 @@ Page({ [jobFilter]: this.data.filterData.jobFilter, }); } - - if (wx.getStorageSync("CLASSIFY_LIST")) { - this.data.filterData.classifyList = wx.getStorageSync("CLASSIFY_LIST"); - this.data.filterData.classifyList.forEach((item) => { - item.active = 0; - }); - let classifyList = "filterData.classifyList"; - this.setData({ - [classifyList]: this.data.filterData.classifyList, - }); - } - this.setData({ - copyList: JSON.parse(JSON.stringify(this.data.filterData)), - }); - // that.getJobList(); - that.getBannerList(); - that.getchannelList(); }, onReady() { let that = this; @@ -1105,338 +383,15 @@ Page({ goChannel(e) { console.log(e); }, - /** - * 筛选标签的点击 - * - * - */ - setActive(e) { - console.log(e); - let data = e.currentTarget.dataset; - if (data.type == "yanba" || data.type == "sex" || data.type == "price") { - console.log(data.id); - let index = this.data.filterData[data.type].findIndex((item) => { - return item.id == data.id; - }); - if (this.data.filterData[data.type][index].active == data.id) { - this.data.filterData[data.type][index].active = 0; - } else { - this.data.filterData[data.type].forEach((item) => { - item.active = 0; - }); - this.data.filterData[data.type][index].active = data.id; - } - this.setData({ - filterData: this.data.filterData, - }); - } else if (data.type != "jobFilter") { - this.data.filterData[data.type].forEach((item) => { - if (item.id == data.id) { - if (item.active == data.id) { - item.active = 0; - } else { - item.active = data.id; - } - } - }); - console.log(this.data.filterData[data.type]); - } else { - this.data.filterData[data.type][data.arr].forEach((item) => { - if (item.id == data.id) { - if (item.active == data.id) { - item.active = 0; - } else { - item.active = data.id; - } - } - }); - } - this.setData({ - filterData: this.data.filterData, - }); - }, - /** - * 获取banner信息 - * - * - */ - getBannerList() { - let that = this; - wx.request({ - url: app.globalData.ip + "/daotian/banner/list", - success(res) { - console.log(res); - if (res.data.status == 200) { - that.setData({ - bannerList: res.data.data.banners, - }); - } - }, - }); - }, - /** - * 获取图片模板信息 - * - * - */ - getTemplateList() { - let that = this; - wx.request({ - url: app.globalData.ip + "/daotian/image/list", - success(res) { - console.log(res); - if (res.data.status == 200) { - app.globalData.templateList = res.data.data.images; - that.setData({ - templateList: res.data.data.images, - }); - } - }, - }); - }, - - /** - * 获取频道列表 - * - * - */ - getchannelList() { - let that = this; - wx.request({ - url: app.globalData.ip + "/daotian/channel/list", - success(res) { - console.log(res); - if (res.data.status == 200) { - that.setData({ - navList: res.data.data.channels, - }); - } - }, - }); - }, - /** - * 清除筛选信息 - * - * - */ - clearFilter1(e) { - let middleList = JSON.parse(JSON.stringify(this.data.copyList)); - let type = e.currentTarget.dataset.type; - let filterData = this.data.filterData; - console.log(type); - if (type == 2) { - filterData = { - ...filterData, - classifyList: middleList.classifyList, - }; - this.setData({ - selectBrandList: [], - }); - } else if (type == 1) { - filterData = { - ...filterData, - jobFilter: middleList.jobFilter, - }; - this.setData({ - selectJobList: [], - }); - } else if (type == "outerClear") { - filterData = middleList; - this.setData({ - selectJobList: [], - selectBrandList: [], - firstMenu: "排序", - secondMenu: "不限", - sexid: -1, - activez: "zuigao", - innerFilter: false, - }); - } else if (type == "innerclear") { - filterData = middleList; - this.setData({ - selectJobList: [], - selectBrandList: [], - firstMenu: "排序", - secondMenu: "不限", - sexid: -1, - activez: "zuigao", - innerFilter: false, - }); - } - console.log(filterData); - this.setData({ - filterData, - leftShow: false, - recordList: [], - whichOneShow: "", - scrollTo: "sticky", - }); - if (this.data.choiceCollect == 0) { - this.data.storeJobListSearchForm.ucj = 0; - } else { - this.data.storeJobListSearchForm.ucj = 1; - } - this.toList(); - - // this.getJobList(); - }, - /** - * 点击确认按钮 - * - * - */ - toList() { - let that = this; - let innerFilter = false; - console.log(this.data.filterData); - let formSearch = { - pageNum: 1, - pageSize: 20, - }; - let filter = this.data.filterData; - for (var k in filter) { - if (k != "jobFilter") { - let jobCategoryArr = []; - filter[k].forEach((item) => { - if (item.active != 0) { - if (k == "price") { - if (item.name == "8000以上") { - formSearch.monthlyPayStr = "8001-20000"; - } else { - formSearch.monthlyPayStr = item.name; - } - } else if (k == "sex") { - formSearch.sex = item.id; - if (item.id == -1) { - this.data.secondMenu = "不限"; - } else if (item.id == 1) { - this.data.secondMenu = "男生"; - innerFilter = true; - } else if (item.id == 2) { - this.data.secondMenu = "女生"; - innerFilter = true; - } - this.setData({ - sexid: item.id, - secondMenu: this.data.secondMenu, - }); - } else if (k == "classifyList") { - jobCategoryArr.push(item.id); - if (jobCategoryArr.length > 0) { - innerFilter = true; - } - } - } - }); - formSearch.jobCategoryLabelIds = jobCategoryArr.join(); - } else { - let totalArr = [...filter["jobFilter"].tagArray0, ...filter["jobFilter"].tagArray1, ...filter["jobFilter"].tagArray2, ...filter["jobFilter"].tagArray3, ...filter["jobFilter"].tagArray4]; - let jobSpecialArr = []; - console.log(totalArr); - totalArr.forEach((item) => { - if (item.active != 0) { - jobSpecialArr.push(item.id); - } - }); - console.log(jobSpecialArr); - if (jobSpecialArr.length > 0) { - innerFilter = true; - } - console.log(jobSpecialArr.join(",")); - formSearch.jobSpecialLabelIds = jobSpecialArr.join(","); - } - } - console.log(formSearch); - - that.data.storeJobListSearchForm = { ...that.data.storeJobListSearchForm, ...formSearch }; - if (this.data.choiceCollect == 0) { - that.data.storeJobListSearchForm.ucj = 0; - } else { - that.data.storeJobListSearchForm.ucj = 1; - } - console.log(that.data.storeJobListSearchForm); - that.setData({ - recordList: [], - leftShow: false, - innerFilter, - whichOneShow: "", - storeJobListSearchForm: that.data.storeJobListSearchForm, - }); - that.loginOut(); - that.getJobList(); - }, - /** - * 智能匹配结束 - * - * - */ - onTabClick(e) { - const index = e.detail.index; - this.setData({ - activeTab: index, - }); - }, - - onChange(e) { - const index = e.detail.index; - this.setData({ - activeTab: index, - }); - }, - - findLocation() { - var that = this; - wx.getLocation({ - type: "gcj02", - success(res1) { - console.log("获取位置2"); - console.log(res1); - app.globalData.lng = res1.longitude; - app.globalData.lat = res1.latitude; - }, - fail() {}, - }); - }, emptyMethod(e) { console.log(e); }, - chooseIdCard() { - var that = this; - if (that.data.agencyStatus != 1) { - this.setData({ - iosDialog: true, - }); - return; - } - wx.chooseImage({ - count: 1, - sizeType: ["original", "compressed"], - sourceType: ["album", "camera"], - success(res) { - console.log(res); - wx.navigateTo({ - url: `../newEnroll/enroll/index?applyType=1&imgUrl=${res.tempFilePaths[0]}`, - }); - // that.uploadIdcardImg(res); - }, - }); - }, - navigatorToRecord() { - if (this.data.agencyStatus != 1) { - this.setData({ - iosDialog: true, - }); - return; - } - wx.navigateTo({ - url: `../newEnroll/enroll/index?applyType=1`, - }); - }, + PageScroll(e) { let that = this; const query = wx.createSelectorQuery().in(this); @@ -1574,7 +529,6 @@ Page({ console.log("on show"); this.getHopeJobLabels(); var reset = true;*/ - that.getTemplateList(); that.searchAnimate(); }, @@ -1588,7 +542,7 @@ Page({ header: app.globalData.headers, success: function (res) { console.log(res); - let collectList = res.data.data.recordList; + let collectList = res.data.data.pageBean.recordList; let jobs = that.data.recordList; if (collectList != null && collectList != "" && collectList != undefined && collectList.length != 0 && jobs != null && jobs != "" && jobs != undefined && jobs.length != 0) { for (var j = 0; j != jobs.length; ++j) { @@ -1610,62 +564,8 @@ Page({ fail: function (res) {}, }); }, - getHopeJobLabels() { - var that = this; - wx.request({ - url: app.globalData.ip + "/labels/findAllHopeJobLabels", - // ?category=4 - method: "GET", - data: {}, - success: function (res0) { - console.log("感兴趣职位 ↓↓↓"); - console.log(res0); - if (res0.data.data != null) { - res0.data.data.forEach((item, index) => { - item["title"] = item.name; - item["checked"] = false; - - if (index == 0 || index == 1) { - item["checked"] = true; - } - }); - } - that.setData({ - labelItems: res0.data.data == null ? [] : res0.data.data, - }); - that.initData(); - console.log("感兴趣职位 赋值title↓↓↓"); - console.log(res0); - }, - fail: function (res) { - console.log(res); - wx.showToast({ - title: "获取失败", - icon: "none", - duration: 2000, - }); - }, - }); - }, - makePhoneCall() { - var that = this; - wx.makePhoneCall({ - phoneNumber: "13937184434", - }); - }, - goScreen() { - wx.navigateTo({ - url: "../screen/index", - }); - }, - goCity() { - let that = this; - - wx.navigateTo({ - url: "../city/index", - }); - }, + initData() { var that = this; try { @@ -1767,17 +667,6 @@ Page({ pageShow: false, }); return new Promise(function (resolve, reject) { - if (that.data.storeJobListSearchForm.sortTag == 2) { - //如果按照距离排序，拼接上坐标 - that.data.storeJobListSearchForm.lng = app.globalData.lng; - that.data.storeJobListSearchForm.lat = app.globalData.lat; - } - - console.log(that.data.inputVal); - that.data.storeJobListSearchForm.cityName = that.data.searchCityParamStorage.name; - if (app.isEmptyCheck(that.data.searchCityParamStorage.name)) { - that.data.storeJobListSearchForm.cityName = "全国"; - } that.data.storeJobListSearchForm.keys = that.data.inputVal == "搜索工作" ? "" : that.data.inputVal; // debugger; wx.showLoading({ @@ -1785,7 +674,7 @@ Page({ }); console.log(that.data.storeJobListSearchForm); wx.request({ - url: app.globalData.ip + "/overall/store/job/list", + url: app.globalData.ip + "/assistant/job/list", method: "POST", header: app.globalData.headers, data: that.data.storeJobListSearchForm, @@ -1794,8 +683,8 @@ Page({ console.log(res); that.setData({ - totalPage: res.data.data.pageCount, - currPage: res.data.data.currentPage, + totalPage: res.data.data.pageBean.pageCount, + currPage: res.data.data.pageBean.currentPage, }); setTimeout(function () { @@ -1803,8 +692,8 @@ Page({ triggered: false, }); }, 1000); - if (res.data.data.recordList == null || res.data.data.recordList.length == 0 || res.data.data.recordList.length < that.data.storeJobListSearchForm.pageSize) { - var jobListTemp = commonUtil.disposeJobListData(res.data.data.recordList); + if (res.data.data.pageBean.recordList == null || res.data.data.pageBean.recordList.length == 0 || res.data.data.pageBean.recordList.length < that.data.storeJobListSearchForm.pageSize) { + var jobListTemp = commonUtil.disposeJobListData(res.data.data.pageBean.recordList); that.data.recordList = that.data.recordList.concat(jobListTemp); that.setData({ @@ -1813,7 +702,7 @@ Page({ isTrigger: false, }); } else { - var jobListTemp = commonUtil.disposeJobListData(res.data.data.recordList); + var jobListTemp = commonUtil.disposeJobListData(res.data.data.pageBean.recordList); that.data.recordList = that.data.recordList.concat(jobListTemp); that.setData({ @@ -1832,32 +721,11 @@ Page({ storeJobListSearchForm: that.data.storeJobListSearchForm, }); resolve(); - that.getTag(); - - 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 (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, - }; - } - }); that.setData({ recordList: that.data.recordList, currentJobDrawer: that.data.currentJobDrawer, }); - // if (that.data.recordList.length < res.data.data.recordCount) { + // if (that.data.recordList.length < res.data.data.pageBean.recordCount) { // that.setData({ // hasMoreData: true, // }); @@ -1877,31 +745,6 @@ Page({ this.getJobList(); }, - getTag() { - let that = this; - let query = that.createSelectorQuery(); - query - .selectAll(".tttg") - .boundingClientRect() - .exec(function (res) { - res.forEach((item) => { - item.forEach((element, index) => { - if (element.width > 200) { - // that.data.recordList[index].isTagShow = true; - var age = "recordList[" + index + "].isTagShow"; - that.setData({ - [age]: true, - }); - } - }); - }); - // if(){ - - // } - // console.log(res); - }); - }, - // 下拉加载更多 onScrollToLower() { console.log("===================================================="); @@ -1965,68 +808,7 @@ Page({ // }); // } }, - /** - * 简版抽屉 - * - * - */ - goDrawer(event) { - let that = this; - - console.log(event.currentTarget.dataset.item); - event.currentTarget.dataset.item["jobDesp"] = event.currentTarget.dataset.item.jobDesp.replace(/\*\*\*\*\*/g, "").split("————————")[0]; - // 展示用字段 - event.currentTarget.dataset.item["jobDesp1"] = event.currentTarget.dataset.item.jobDesp.replace("⚠", ""); - event.currentTarget.dataset.item["jobDesp1"] = event.currentTarget.dataset.item.jobDesp1.replace("[红包]", ""); - - // wx.hideTabBar({ - // success(e) { - this.getTabBar().setData({ - isShow: false, - }); - that.setData({ - currentJobDrawer: { - ...event.currentTarget.dataset.item, - index: event.currentTarget.dataset.index, - }, - drawerShow: true, - }); - // }, - // }); - console.log(this.data.currentJobDrawer); - }, - copyClose() { - var that = this; - var contentInfo; - const query = wx.createSelectorQuery().in(this); - query - .select(".contactInfo") - .boundingClientRect(function (res) { - contentInfo = res.dataset.info; - var text = that.data.currentJobDrawer.jobDesp + contentInfo; - wx.setClipboardData({ - data: text, - success(res) { - wx.getClipboardData({ - success(res) { - console.log(res.data); // data - wx.showToast({ - title: "内容已复制", - icon: "none", - duration: 1500, - }); - }, - }); - }, - }); - }) - .exec(); - }, - // showDrawer() { - // this.setData({ - // }); - // }, hideDrawer() { let that = this; this.getTabBar().setData({ @@ -2042,35 +824,7 @@ Page({ // }); // }, 300); }, - goEnroll(e) { - console.log(e); - // wx.navigateTo({ - // url: "../newEnroll/index?applyType=0" - // }); - var that = this; - - wx.removeStorageSync("townsManInfo"); - wx.removeStorageSync("townsManInfoJob"); - wx.removeStorageSync("storeInfoJob"); - - // if(app.isNotEmptyCheck(wx.getStorage('townsManInfo'))){ - // wx.removeStorageSync('townsManInfo') - // } - // if(app.isNotEmptyCheck(wx.getStorage('townsManInfoJob'))){ - // wx.removeStorageSync('townsManInfoJob') - // } - // if(app.isNotEmptyCheck(wx.getStorage('storeInfoJob'))){ - // wx.removeStorageSync('storeInfoJob') - // } - // wx.removeStorageSync('townsManInfoJob') - console.log(app.globalData.loginUserInfo.tel); - wx.setStorageSync("jobDetailStorage", that.data.recordList[e.currentTarget.dataset.idx]); - let argument; - argument = JSON.stringify(e.currentTarget.dataset.info).replace(/\=|\&/g, "3D"); - wx.navigateTo({ - url: `../newEnroll/enroll/index?applyType=1&info=${argument}`, - }); - }, + wxLogin() { var that = this; wx.login({ @@ -2085,18 +839,7 @@ Page({ }, }); }, - changeRecordBillType(e) { - let that = this; - console.log(e); - that.setData({ - recordBillType: e.currentTarget.dataset.type, - }); - }, - toSmart() { - wx.navigateTo({ - url: "/pages/IDCardWithNFC/index", - }); - }, + getPhoneNumber(e) { var that = this; console.log(e); @@ -2131,8 +874,8 @@ Page({ }, success: function (res) { console.log(res); - app.globalData.openId = res.data.data.openId; - let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null); + app.globalData.openId = res.data.data.pageBean.openId; + let promise = app.setLoginUserTokenInfo(res.data.data.pageBean.phoneNumber, null); var collected = e.currentTarget.dataset.collected; if (collected) { promise.then((res) => { @@ -2185,7 +928,7 @@ Page({ }, success: function (res) { console.log(res); - let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null); + let promise = app.setLoginUserTokenInfo(res.data.data.pageBean.phoneNumber, null); var collected = e.currentTarget.dataset.collected; if (collected) { promise.then((res) => { @@ -2198,7 +941,7 @@ Page({ promise.then((res) => { wx.navigateTo({ url: "../enroll/index?applyType=1", - //url: "../enroll/index?applyType=1&tel=" + res.data.data.phoneNumber + //url: "../enroll/index?applyType=1&tel=" + res.data.data.pageBean.phoneNumber }); }); } @@ -2263,7 +1006,7 @@ Page({ }, success: function (res) { console.log(res); - let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null); + let promise = app.setLoginUserTokenInfo(res.data.data.pageBean.phoneNumber, null); promise.then((res) => { that.setData({ isLogin: app.globalData.isLogin, @@ -2294,7 +1037,7 @@ Page({ }, success: function (res) { console.log(res); - let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null); + let promise = app.setLoginUserTokenInfo(res.data.data.pageBean.phoneNumber, null); promise.then((res) => { that.setData({ isLogin: app.globalData.isLogin, @@ -2343,8 +1086,8 @@ Page({ console.log("获取来源对应的代理人，来源ID：", id); console.log(res); try { - if (app.isNotEmptyCheck(res.data.data)) { - wx.setStorageSync("storageSyncAgencyUserId", res.data.data); + if (app.isNotEmptyCheck(res.data.data.pageBean)) { + wx.setStorageSync("storageSyncAgencyUserId", res.data.data.pageBean); } //先设置代理人缓存人再登录 app.getLoginUserTokenInfo(); @@ -2455,101 +1198,7 @@ Page({ }, }); }, - getUserInfoBtn: function (e) { - console.log(e); - let that = this; - let type = e.currentTarget.dataset.type; - var collected = e.currentTarget.dataset.collected; - var storeJobId = e.currentTarget.dataset.jobid; - let idx = e.currentTarget.dataset.idx; - console.log(type); - wx.getUserProfile({ - desc: "用于完善会员资料", // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 - success: (res) => { - console.log(res); - //发起网络请求 - wx.request({ - url: app.globalData.ip + "/updateUserWechatInfo", - data: { - nickName: res.userInfo.nickName, - avatarUrl: res.userInfo.avatarUrl, - gender: res.userInfo.gender, - country: res.userInfo.country, - province: res.userInfo.province, - city: res.userInfo.city, - }, - method: "POST", - header: app.globalData.headers, - success: function (res) { - console.log(res); - app.globalData.hasUserInfo = 1; - that.setData({ - hasUserInfo: 1, - }); - that.doMenuClick(type, collected, storeJobId, idx); - }, - fail: function (res) { - that.doMenuClick(type, collected, storeJobId, idx); - }, - }); - }, - fail: (res) => { - console.log(res); - that.doMenuClick(type, collected, storeJobId, idx); - }, - }); - }, - doMenuClick: function (_type, _collected, _storeJobId, _idx) { - let that = this; - if (_type - 1 == 0) { - //点击全国 - that.goCity(); - } else if (_type - 2 == 0) { - //搜索 - } else if (_type - 3 == 0) { - //筛选 - that.goScreen(); - } else if (_type - 4 == 0) { - //收藏 - that.doCollected(_collected, _storeJobId); - } else if (_type - 5 == 0) { - //报名 - wx.setStorageSync("jobDetailStorage", that.data.recordList[_idx]); - wx.navigateTo({ - url: "../enroll/index?applyType=1&tel=" + app.globalData.loginUserInfo.tel, - }); - } - }, - changSign(e) { - let that = this; - console.log(e); - that.data.storeJobListSearchForm.pageNum = 1; - if (e.target.dataset.type == 0 && that.data.signType != 0) { - that.data.storeJobListSearchForm.signType = ""; - that.setData({ - signType: e.target.dataset.type, - recordList: [], - storeJobListSearchForm: that.data.storeJobListSearchForm, - }); - that.getJobList(); - } else if (e.target.dataset.type == 1 && that.data.signType != 1) { - that.data.storeJobListSearchForm.signType = 1; - that.setData({ - signType: e.target.dataset.type, - recordList: [], - storeJobListSearchForm: that.data.storeJobListSearchForm, - }); - that.getJobList(); - } else if (e.target.dataset.type == 2 && that.data.signType != 2) { - that.data.storeJobListSearchForm.signType = 2; - that.setData({ - signType: e.target.dataset.type, - recordList: [], - storeJobListSearchForm: that.data.storeJobListSearchForm, - }); - that.getJobList(); - } - }, + /** * 收藏的切换 * @@ -2579,229 +1228,14 @@ Page({ // } } }, - choiceFilter(e) { - var that = this; - // let str = that.data.activez - let str = e.currentTarget.dataset.id; - if (str == "all") { - that.data.storeJobListSearchForm.sortTag = 0; - that.setData({ - firstMenu: "排序", - // storeJobListSearchForm: that.data.storeJobListSearchForm, - recordList: [], - }); - that.getJobList().then(() => { - that.setData({ - siv: "menu", - }); - }); - } else if (str == "zuijin") { - //距离最近 - if (that.data.storeJobListSearchForm.lng && that.data.storeJobListSearchForm.lat) { - that.data.storeJobListSearchForm.sortTag = 2; - that.setData({ - firstMenu: "距离", - // storeJobListSearchForm: tha t.data.storeJobListSearchForm, - recordList: [], - }); - that.getJobList().then(() => { - that.setData({ - siv: "menu", - }); - }); - } else { - wx.getLocation({ - type: "gcj02", - success(res1) { - console.log("获取位置1"); - app.globalData.lng = res1.longitude; - app.globalData.lat = res1.latitude; - that.data.storeJobListSearchForm.lng = res1.longitude; - that.data.storeJobListSearchForm.lat = res1.latitude; - that.data.storeJobListSearchForm.sortTag = 2; - that.data.storeJobListSearchForm.pageNum = 1; - that.setData({ - firstMenu: "距离", - storeJobListSearchForm: that.data.storeJobListSearchForm, - recordList: [], - }); - that.getJobList().then(() => { - that.setData({ - siv: "menu", - }); - }); - // var promise = new Promise(function(resolve,reject){ - // that.getJobList(); - // }); - }, - fail() { - console.log("获取位置失败，打开位置设置界面"); - // wx.openSetting({ - // success(res) { - // console.log(res.authSetting); - // if (res.authSetting["scope.userLocation"]) { - // wx.getLocation({ - // type: "gcj02", - // success(res1) { - // console.log("获取位置2"); - // console.log(res1); - // app.globalData.lng = res1.longitude; - // app.globalData.lat = res1.latitude; - - // that.data.storeJobListSearchForm.sortTag = 2; - // that.data.storeJobListSearchForm.lng = res1.longitude; - // that.data.storeJobListSearchForm.lat = res1.latitude; - // that.data.storeJobListSearchForm.pageNum = 1; - // that.setData({ - // storeJobListSearchForm: that.data.storeJobListSearchForm, - // recordList: [], - // }); - // that.getJobList().then(() => { - // that.setData({ - // siv: "menu", - // }); - // }); - // }, - // fail() {}, - // }); - // } - // }, - // }); - }, - }); - } - } else if (str == "zuigao") { - //工价最高 - that.data.storeJobListSearchForm.sortTag = 1; - that.data.storeJobListSearchForm.pageNum = 1; - that.setData({ - storeJobListSearchForm: that.data.storeJobListSearchForm, - firstMenu: "排序", - recordList: [], - }); - that.getJobList().then(() => { - that.setData({ - siv: "menu", - }); - }); - } - that.setData({ - activez: str, - }); - that.setData({ - whichOneShow: "", - siv: "", - }); - // setTimeout(() => { - // that.setData({ - // whichOneShow: "", - // }); - // console.log(this.data.whichOneShow); - // console.log("112233"); - // }, 1); - }, - /** - * 清除所有的筛选项 - * - * - */ - clearFilter() { - let that = this; - that.data.jobSpecialLabelList.forEach((item) => { - // console.log(item); - if (item.checked) { - item.checked = false; - } - }); - that.data.brandList.forEach((item) => { - if (item.checked) { - item.checked = false; - } - }); - that.data.storeJobListSearchForm.jobSpecialLabelIds = ""; - // that.data.storeJobListSearchForm.ucj = - // that.data.storeJobListSearchForm.brandIds = ""; - that.data.storeJobListSearchForm.jobCategoryLabelIds = ""; - that.data.storeJobListSearchForm.pageNum = 1; - that.setData({ - jobSpecialLabelList: that.data.jobSpecialLabelList, - tagArray0: that.data.tagArray0, - tagArray1: that.data.tagArray1, - tagArray2: that.data.tagArray2, - tagArray3: that.data.tagArray3, - brandList: that.data.brandList, - selectJobList: [], - selectBrandList: [], - recordList: [], - whichOneShow: "", - firstMenu: "排序", - secondMenu: "不限", - sexid: -1, - activez: "zuigao", - }); - // that.choiceFilter({ - // currentTarget: { - // dataset: { - // id: "all", - // }, - // }, - // }); - // that.choiceSex({ - // currentTarget: { - // dataset: { - // id: "-1", - // }, - // }, - // }); - that.getJobList(); - }, + scroll(e) { return false; }, stoptap(e) { return false; }, - changeContact() { - console.log(2123); - wx.navigateTo({ - url: `/pages/configAnnunciate/index`, - }); - }, - /** - * 简版报名 - * - * - */ - recordBill(e) { - if (!this.data.isLogin) { - wx.navigateTo({ - url: "/pages/login/index", - }); - return; - } - console.log(e.currentTarget.dataset.job); - console.log(123); - let middleInfo = e.currentTarget.dataset.job; - let info = JSON.stringify({ - id: middleInfo.id, - jobName: middleInfo.jobName, - storeName: middleInfo.storeName, - aliasName: middleInfo.aliasName, - storeId: middleInfo.storeId, - }); - console.log(info); - wx.navigateTo({ - url: `../newEnroll/enroll/index?applyType=1&info=${info}`, - }); - // wx.navigateTo({ - // url: `../newEnroll/enroll/index?applyType=1&info=${info}`, - // }); - }, - imageLoad() { - this.setData({ - isLoading: false, - }); - }, + closeDialog() { this.setData({ iosDialog: false, @@ -2812,18 +1246,7 @@ Page({ leftShow: true, }); }, - hideLeft() { - this.setData({ - leftShow: false, - whichOneShow: "", - }); - console.log(this.data.innerFilter); - if (!this.data.innerFilter) { - this.setData({ - filterData: JSON.parse(JSON.stringify(this.data.copyList)), - }); - } - }, + /** * 阻止滑动穿透 * @@ -2832,112 +1255,10 @@ Page({ modalMove() { return false; }, - /** - * 获取搜索轮播的关键字索引 - * - * - */ - getSwiperIndex(e) { - // console.dir(e); - if (e.detail.current) { - this.setData({ - placeholderText: this.data.swiperTextList[e.detail.current], - }); - // console.log(this.data.swiperTextList[e.detail.current]); - // console.log(this.data.placeholderText); - } - }, - onPageScroll(e) {}, - drawerTouchStart(event) { - this.handletouchtart(event); - }, - drawerTouchMove(event) { - let tx = this.handletouchmove(event); - console.log(tx); - if (tx.ty > 100) { - this.hideDrawer(); - } - }, - filterTouchMove(event) { - let tx = this.handletouchmove(event); - if (tx.tx < -100) { - this.setData({ - leftShow: false, - }); - } - }, - filterTouchStart(event) { - this.handletouchtart(event); - }, - listTouchMove(event) { - if (event.detail.scrollTop - this.data.listPosition > 15 && this.data.halfHide == false) { - this.setData({ - halfHide: true, - }); - } else if (event.detail.scrollTop - this.data.listPosition < -15 && this.data.halfHide == true) { - this.setData({ - halfHide: false, - }); - } - if (event.detail.scrollTop > 200) { - // wx.setTabBarItem({ - // index: 0, - // text: "回顶部", - // iconPath: "/assets/images/ysd.png", - // selectedIconPath: "/assets/images/top.png", - // success: (e) => {}, - // fail(e) { - // console.log(e); - // }, - // }); - } else if (event.detail.scrollTop <= 200) { - // wx.setTabBarItem({ - // index: 0, - // text: "首页", - // iconPath: "/assets/images/ysd.png", - // selectedIconPath: "/assets/images/ysd1.png", - // success: (e) => {}, - // fail(e) { - // console.log(e); - // }, - // }); - } - // console.log(event); - }, - listTouchStart(event) { - this.data.listPosition = event.detail.scrollTop; - }, - /** - * 页面滑动事件监听 - * - * - */ - handletouchmove: function (event) { - let that = this; - var currentX = event.touches[0].pageX; - var currentY = event.touches[0].pageY; - var tx = currentX - this.data.lastX; - var ty = currentY - this.data.lastY; - var text = ""; - //左右方向滑动 - if (Math.abs(tx) > Math.abs(ty)) { - return { - tx, - }; - } - //上下方向滑动 - else { - return { - ty, - }; - } - }, - // 触摸开始事件 - handletouchtart: function (event) { - this.data.lastX = event.touches[0].pageX; - this.data.lastY = event.touches[0].pageY; - }, + onPageScroll(e) {}, + + searchAnimate() { let that = this; wx.createSelectorQuery() diff --git a/pages/index/index.wxml b/pages/index/index.wxml index f0eeebb..5dd730c 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -25,7 +25,7 @@ - + @@ -50,11 +50,11 @@ - - 郑州一才工作 + + {{item.agencyName}} - 1分钟前 + {{item.updateTime}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 6b86540..7aaecd1 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,18 +1,3 @@ -/* required by usingComponents */ -/* @import "../../appcommon.wxss"; */ -/* @import "../index/index.wxss"; */ -/* @import "./filtercss.wxss"; */ -/* @font-face{ -　　font-family:YaHeiConsolasHybrid; -　　src:url('https://matripecandy.oss-cn-beijing.aliyuncs.com/1shoudanImg/DingTalk%20Sans.ttf'); -　　} */ -/* @font-face { - font-family: "DingTalk"; - src: url("https://matripecandy.oss-cn-beijing.aliyuncs.com/1shoudanImg/DingTalk%20Sans.ttf"); 服务器上ttf文件的路径，记得配置域名权限 - font-weight: normal; - font-style: normal; - font-display: swap; -} */ page { /* position: fixed; */ background-color: #f5f5f5; @@ -373,7 +358,7 @@ height: 746rpx; margin-bottom: 5px; } .storeName{ - max-width: 360rpx; + max-width: 480rpx; } .logoClass { width: 52px; diff --git a/project.config.json b/project.config.json index d48c1d3..7a91ffb 100644 --- a/project.config.json +++ b/project.config.json @@ -44,7 +44,7 @@ "tabIndent": "insertSpaces", "tabSize": 2 }, - "appid": "wx0e390bea912ae982", + "appid": "wxb0dea4d11428c6a5", "packOptions": { "ignore": [], "include": [] diff --git a/utils/commonUtil.js b/utils/commonUtil.js index 2e876db..e07e288 100644 --- a/utils/commonUtil.js +++ b/utils/commonUtil.js @@ -3,6 +3,7 @@ * @param item * @returns */ +import dateUtil from "./dateUtil.js"; export function isEmptyCheck(value) { if (value == null || value === "" || value == "null" || typeof value == "undefined") { return true; @@ -1234,42 +1235,24 @@ export function disposeJobListData(recordList) { item["age"] = ageStr; // console.log(item.salaryClassify,'=============', item.salaryClassifyValue); item["salaryClassifyValue"] = getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue); - // //时薪 - // var hourlyPayStr = ''; - // var hasHourlyPay = false; - // if (isNotEmptyCheck(item.hourlyPay)) { - // hourlyPayStr = item.hourlyPay + '元/小时'; - // hasHourlyPay = true; - // } else if (isNotEmptyCheck(item.dayPay)) { - // hourlyPayStr = item.dayPay + '元/日'; - // hasHourlyPay = true; - // } else { - // if (isNotEmptyCheck(item.minMonthlyPay) && isNotEmptyCheck(item.maxMonthlyPay)) { - // if (item.minMonthlyPay == item.maxMonthlyPay) { - // hourlyPayStr = item.minMonthlyPay; - // } else { - // hourlyPayStr = item.minMonthlyPay + '-' + item.maxMonthlyPay; - // } - // } else if (isNotEmptyCheck(item.minMonthlyPay)) { - // hourlyPayStr = item.minMonthlyPay; - // } else if (isNotEmptyCheck(item.maxMonthlyPay)) { - // hourlyPayStr = item.maxMonthlyPay; - // } - // } - // item["hourlyPay"] = hourlyPayStr; + + //代理名称 + item['agencyName'] = item.agencyName.split(item.agencyCode).join('') + + item.updateTime = dateUtil.timeShowXXX(item.updateTime) //月薪 var monthlyPayStr = ""; // if (hasHourlyPay) { if (isNotEmptyCheck(item.minMonthlyPay) && isNotEmptyCheck(item.maxMonthlyPay)) { if (item.minMonthlyPay == item.maxMonthlyPay) { - monthlyPayStr = item.minMonthlyPay; + monthlyPayStr = item.minMonthlyPay/100; } else { - monthlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay; + monthlyPayStr = item.minMonthlyPay/100 + "-" + item.maxMonthlyPay/100; } } else if (isNotEmptyCheck(item.minMonthlyPay)) { - monthlyPayStr = item.minMonthlyPay; + monthlyPayStr = item.minMonthlyPay/100; } else if (isNotEmptyCheck(item.maxMonthlyPay)) { - monthlyPayStr = item.maxMonthlyPay; + monthlyPayStr = item.maxMonthlyPay/100; } // console.log(monthlyPayStr); // }