diff --git a/app.wxss b/app.wxss index 600c888..0d120cb 100644 --- a/app.wxss +++ b/app.wxss @@ -2038,6 +2038,9 @@ button.bgBtn { background-color: var(--color-ysd); line-height: 36px; } +button.bgBtn[disabled]{ + background-color: #eee; +} button.nobg_Btn { color: var(--color-ysd); border: 1px solid var(--color-ysd); diff --git a/components/recordBill/index.js b/components/recordBill/index.js index cf316b6..4b620e4 100644 --- a/components/recordBill/index.js +++ b/components/recordBill/index.js @@ -1,4 +1,5 @@ // components/recordBill/index.js +const app = getApp(); Component({ data:{ // jobDetail:{} @@ -32,10 +33,11 @@ Component({ * 组件的初始数据 */ data: { - + idCardObj:{}, + loading:false }, ready () { - console.log(this.data.jobDetail); + // console.log(this.data.jobDetail); // this.setData({ // jobDetail:this.data.jobDetail // }) @@ -58,10 +60,119 @@ Component({ }) // this.triggerEvent("hidedrawer", eventDetail); }, - submitModal(){ - wx.navigateTo({ - url: '../../pages/returnMessage/index?type=success&msg=报名成功', + submitModal(e){ + var that = this; + console.log('form发生了submit事件，携带数据为：', e.detail.value) + var formData = {}; + var applyData = e.detail.value; + var nameReg = /^[\u4E00-\u9FA5]{2,10}(·[\u4E00-\u9FA5]{2,10}){0,2}$/; + if(nameReg.test(applyData.userName)){ + // wx.showToast({ + // icon: "none", + // title: '姓名正确', + // }); + formData['userName'] = applyData.userName; + }else{ + wx.showToast({ + icon: "none", + title: '姓名不正确', + }); + return + } + that.getIdCardInfo(applyData.idCard); + var reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/; //身份证 + if(reg.test(applyData.idCard)){ + // wx.showToast({ + // icon: "none", + // title: '身份证号码正确', + // }); + formData['idCard'] = applyData.idCard; + formData['sex'] = that.data.idCardObj.sexCode; + formData['age'] = that.data.idCardObj.age; + // console.log(this.getIdCardInfo(applyData.idCard)); + }else{ + wx.showToast({ + icon: "none", + title: '身份证号码不正确', + }); + return + } + + const telReg = /^1[3456789]\d{9}$/ + if(telReg.test(applyData.tel)){ + formData['tel'] = applyData.tel; + }else{ + wx.showToast({ + icon: "none", + title: '电话号码不正确', + }); + return + } + + that.setData({ + loading:true }) + + + + + console.log(this.data.jobDetail); + + formData['agencyUserId'] = ''; + formData['jobId'] = this.data.jobDetail.id; + + wx.request({ + url: app.globalData.ip + "/assistant/apply/handler/add", + data: formData, + header: app.globalData.header, + method: "POST", + success: function (res) { + console.log(res); + that.hideModal(); + that.setData({ + loading:false + }) + wx.navigateTo({ + url: '../../pages/returnMessage/index?type=success&msg=报名成功', + }) + }, + }); + + // wx.navigateTo({ + // url: '../../pages/returnMessage/index?type=success&msg=报名成功', + // }) }, + getIdCardInfo(idCard) { + var idCardObj = {}; + //获取用户身份证号码 + //获取性别 + if (parseInt(idCard.substr(16, 1)) % 2 == 1) { + idCardObj.sexCode = '1' //男 + } else { + idCardObj.sexCode = '2' //女 + } + //获取出生年月日 + var yearBirth = idCard.substring(6, 10); + var monthBirth = idCard.substring(10, 12); + var dayBirth = idCard.substring(12, 14); + var birthDate = yearBirth + "-" + monthBirth + "-" + dayBirth; + //获取当前年月日并计算年龄 + var myDate = new Date(); + var monthNow = myDate.getMonth() + 1; + var dayNow = myDate.getDay(); + var age = myDate.getFullYear() - yearBirth; + if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) { + age--; + } + //得到年龄 + idCardObj.birthDate = birthDate; + idCardObj.age = age; + this.setData({ + idCardObj + }) + //返回性别和年龄 + // return idCardObj; + } + } }) \ No newline at end of file diff --git a/components/recordBill/index.wxml b/components/recordBill/index.wxml index f68d10e..3e7d295 100644 --- a/components/recordBill/index.wxml +++ b/components/recordBill/index.wxml @@ -1,4 +1,5 @@ +
@@ -28,7 +29,7 @@ - + @@ -39,7 +40,7 @@ - + @@ -47,7 +48,8 @@ - + +
diff --git a/pages/collect/index.js b/pages/collect/index.js index 3136fb0..d127adb 100644 --- a/pages/collect/index.js +++ b/pages/collect/index.js @@ -474,7 +474,8 @@ Page({ if(that.data.from == 'shoucang'){ url = '/assistant/job/collect/list' }else if(that.data.from == 'baoming'){ - url = '/assistant/mine/info' + url = '/assistant/mine/getApplys' + that.data.storeJobListSearchForm = {} } @@ -486,38 +487,58 @@ Page({ success: function (res) { console.log("职位列表↓↓↓↓"); console.log(res); - if(that.data.from == 'baoming'){ - res.data.data.recordList = res.data.data.pageBean.recordList + if(that.data.from == 'baoming'){ //我的报名 + if (res.data.data.list == null || res.data.data.list.length == 0 || res.data.data.list.length < that.data.storeJobListSearchForm.pageSize) { + var jobListTemp = commonUtil.disposeJobListData(res.data.data.list); + that.data.recordList = that.data.recordList.concat(jobListTemp); + + that.setData({ + recordList: that.data.recordList, + hasMoreData: false, + isTrigger: false, + }); + } else { + var jobListTemp = commonUtil.disposeJobListData(res.data.data.list); + that.data.recordList = that.data.recordList.concat(jobListTemp); + + that.setData({ + recordList: that.data.recordList, + hasMoreData: true, + isTrigger: false, + }); + } + }else{ //我的收藏 + that.setData({ + totalPage: res.data.data.pageBean.pageCount, + currPage: res.data.data.pageBean.currentPage, + }); + + setTimeout(function () { + that.setData({ + triggered: false, + }); + }, 1000); + 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({ + recordList: that.data.recordList, + hasMoreData: false, + isTrigger: false, + }); + } else { + var jobListTemp = commonUtil.disposeJobListData(res.data.data.pageBean.recordList); + that.data.recordList = that.data.recordList.concat(jobListTemp); + + that.setData({ + recordList: that.data.recordList, + hasMoreData: true, + isTrigger: false, + }); + } } - that.setData({ - totalPage: res.data.data.pageBean.pageCount, - currPage: res.data.data.pageBean.currentPage, - }); - - setTimeout(function () { - that.setData({ - triggered: false, - }); - }, 1000); - 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({ - recordList: that.data.recordList, - hasMoreData: false, - isTrigger: false, - }); - } else { - var jobListTemp = commonUtil.disposeJobListData(res.data.data.pageBean.recordList); - that.data.recordList = that.data.recordList.concat(jobListTemp); - - that.setData({ - recordList: that.data.recordList, - hasMoreData: true, - isTrigger: false, - }); - } + wx.hideLoading({ success: (res) => {}, diff --git a/pages/detail/index.js b/pages/detail/index.js index 5277d06..13ad2e4 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -743,5 +743,11 @@ Page({ onShareTimeline: function () {}, share(){ this.onShareAppMessage() - }, + }, + goNewEnroll (e) { + let that = this; + this.setData({ + recordBillShow: true + }) + } }); diff --git a/pages/returnMessage/index.wxss b/pages/returnMessage/index.wxss index d9db717..c5c6730 100644 --- a/pages/returnMessage/index.wxss +++ b/pages/returnMessage/index.wxss @@ -1,3 +1,6 @@ +page{ + background-color: #fff; +} .container{ display: flex; flex-direction: column;