diff --git a/app.json b/app.json index cc010a4..c1a06a1 100644 --- a/app.json +++ b/app.json @@ -13,7 +13,11 @@ "pages/card/carddetail", "pages/index/mineinfo", "pages/branches/branchesdetail", - "pages/answer/answerdetail" + "pages/answer/answerdetail", + "pages/sign/sign", + "pages/signOrg/signOrg", + "pages/signStatus/signStatus", + "pages/signRecord/signRecord" ], "window": { "backgroundTextStyle": "dark", diff --git a/app.wxss b/app.wxss index 31dbdd1..6b0589e 100644 --- a/app.wxss +++ b/app.wxss @@ -17,6 +17,7 @@ page { .item { display: flex; flex-direction: row; + justify-content: space-between; padding: 10rpx; align-items: center; flex-wrap: nowrap; @@ -27,12 +28,12 @@ page { } .content { - width: 70%; - display: flex; - flex-direction: column; - justify-content: space-around; + width: 66%; + /* display: flex; */ + /* flex-direction: column; */ + /* justify-content: space-around; */ min-height: 64rpx; - margin-left: 10rpx; + /* margin-left: 10rpx; */ } .content.text-cut { @@ -171,7 +172,6 @@ page { } .table-item-title { - flex: 0.7; text-align: justify; align-items: center; justify-content: center; @@ -179,8 +179,7 @@ page { } .table-item-content-3 { - flex: 1.3; - text-align: center; + text-align: right; align-items: center; justify-content: center; align-self: center; diff --git a/class/main.wxss b/class/main.wxss index 5cef64d..c503228 100644 --- a/class/main.wxss +++ b/class/main.wxss @@ -201,7 +201,7 @@ checkbox::before { color: var(--white) !important; top: 50%; margin-top: -8px; - right: 5px; + left: 3px; font-size: 32rpx; line-height: 16px; pointer-events: none; @@ -2050,10 +2050,13 @@ button.icon.lg { line-height: 90rpx; margin: 0 10rpx; padding: 0 20rpx; + color: #999; + font-size: 32rpx; } .nav .cu-item.cur { - border-bottom: 4rpx solid; + color: #333; + font-weight: bold; } /* ================== diff --git a/images/icons/achievement-icon.png b/images/icons/achievement-icon.png new file mode 100644 index 0000000..be742b2 Binary files /dev/null and b/images/icons/achievement-icon.png differ diff --git a/images/icons/address-icon.png b/images/icons/address-icon.png new file mode 100644 index 0000000..4760625 Binary files /dev/null and b/images/icons/address-icon.png differ diff --git a/images/icons/date-icon-w.png b/images/icons/date-icon-w.png new file mode 100644 index 0000000..84b79c9 Binary files /dev/null and b/images/icons/date-icon-w.png differ diff --git a/images/icons/date-icon.png b/images/icons/date-icon.png new file mode 100644 index 0000000..525b0db Binary files /dev/null and b/images/icons/date-icon.png differ diff --git a/images/icons/defalut-org.png b/images/icons/defalut-org.png new file mode 100644 index 0000000..d59a80e Binary files /dev/null and b/images/icons/defalut-org.png differ diff --git a/images/icons/default-org.jpg b/images/icons/default-org.jpg new file mode 100644 index 0000000..e144756 Binary files /dev/null and b/images/icons/default-org.jpg differ diff --git a/images/icons/exam-point.png b/images/icons/exam-point.png new file mode 100644 index 0000000..ae956e1 Binary files /dev/null and b/images/icons/exam-point.png differ diff --git a/images/icons/go-icon.png b/images/icons/go-icon.png new file mode 100644 index 0000000..d1dd9ac Binary files /dev/null and b/images/icons/go-icon.png differ diff --git a/images/icons/ic_organ_icon.png b/images/icons/ic_organ_icon.png deleted file mode 100644 index c13947a..0000000 Binary files a/images/icons/ic_organ_icon.png and /dev/null differ diff --git a/images/icons/ic_score_icon.png b/images/icons/ic_score_icon.png deleted file mode 100644 index 23faa48..0000000 Binary files a/images/icons/ic_score_icon.png and /dev/null differ diff --git a/images/icons/ic_testsite_icon.png b/images/icons/ic_testsite_icon.png deleted file mode 100644 index 53a1811..0000000 Binary files a/images/icons/ic_testsite_icon.png and /dev/null differ diff --git a/images/icons/ic_ticket_icon.png b/images/icons/ic_ticket_icon.png deleted file mode 100644 index 19f6a16..0000000 Binary files a/images/icons/ic_ticket_icon.png and /dev/null differ diff --git a/images/icons/notice_default.jpeg b/images/icons/notice_default.jpeg deleted file mode 100644 index f37930e..0000000 Binary files a/images/icons/notice_default.jpeg and /dev/null differ diff --git a/images/icons/notice_default.png b/images/icons/notice_default.png new file mode 100644 index 0000000..a2940f3 Binary files /dev/null and b/images/icons/notice_default.png differ diff --git a/images/icons/org-icon.png b/images/icons/org-icon.png new file mode 100644 index 0000000..531059f Binary files /dev/null and b/images/icons/org-icon.png differ diff --git a/images/icons/paper-icon.png b/images/icons/paper-icon.png new file mode 100644 index 0000000..26e97d2 Binary files /dev/null and b/images/icons/paper-icon.png differ diff --git a/images/icons/person-bg.png b/images/icons/person-bg.png new file mode 100644 index 0000000..d2f2e0a Binary files /dev/null and b/images/icons/person-bg.png differ diff --git a/images/icons/phone-icon.png b/images/icons/phone-icon.png new file mode 100644 index 0000000..f247d31 Binary files /dev/null and b/images/icons/phone-icon.png differ diff --git a/images/icons/sign-icon.png b/images/icons/sign-icon.png new file mode 100644 index 0000000..3f01e5f Binary files /dev/null and b/images/icons/sign-icon.png differ diff --git a/images/icons/status-complete.png b/images/icons/status-complete.png new file mode 100644 index 0000000..9e47156 Binary files /dev/null and b/images/icons/status-complete.png differ diff --git a/images/icons/status-draw.png b/images/icons/status-draw.png new file mode 100644 index 0000000..6679c37 Binary files /dev/null and b/images/icons/status-draw.png differ diff --git a/images/icons/status-icon.png b/images/icons/status-icon.png new file mode 100644 index 0000000..f72b47b Binary files /dev/null and b/images/icons/status-icon.png differ diff --git a/images/icons/status-not-pass.png b/images/icons/status-not-pass.png new file mode 100644 index 0000000..c4c4075 Binary files /dev/null and b/images/icons/status-not-pass.png differ diff --git a/images/icons/status-pass.png b/images/icons/status-pass.png new file mode 100644 index 0000000..4d251ea Binary files /dev/null and b/images/icons/status-pass.png differ diff --git a/images/icons/status-wait.png b/images/icons/status-wait.png new file mode 100644 index 0000000..7970ae0 Binary files /dev/null and b/images/icons/status-wait.png differ diff --git a/images/icons/type-icon.png b/images/icons/type-icon.png new file mode 100644 index 0000000..e4a7f6e Binary files /dev/null and b/images/icons/type-icon.png differ diff --git a/images/icons/type1.png b/images/icons/type1.png new file mode 100644 index 0000000..4342cff Binary files /dev/null and b/images/icons/type1.png differ diff --git a/images/icons/type2.png b/images/icons/type2.png new file mode 100644 index 0000000..f049939 Binary files /dev/null and b/images/icons/type2.png differ diff --git a/images/icons/upload-avatar.png b/images/icons/upload-avatar.png new file mode 100644 index 0000000..8ea9e31 Binary files /dev/null and b/images/icons/upload-avatar.png differ diff --git a/images/icons/upload-edu.png b/images/icons/upload-edu.png new file mode 100644 index 0000000..6dfa924 Binary files /dev/null and b/images/icons/upload-edu.png differ diff --git a/images/icons/upload-id-b.png b/images/icons/upload-id-b.png new file mode 100644 index 0000000..a31960e Binary files /dev/null and b/images/icons/upload-id-b.png differ diff --git a/images/icons/upload-id-f.png b/images/icons/upload-id-f.png new file mode 100644 index 0000000..e2062b7 Binary files /dev/null and b/images/icons/upload-id-f.png differ diff --git a/images/icons/upload-person-page.png b/images/icons/upload-person-page.png new file mode 100644 index 0000000..9b8fe8a Binary files /dev/null and b/images/icons/upload-person-page.png differ diff --git a/images/icons/upload-photo.png b/images/icons/upload-photo.png new file mode 100644 index 0000000..11be66e Binary files /dev/null and b/images/icons/upload-photo.png differ diff --git a/images/icons/upload-repeixun.png b/images/icons/upload-repeixun.png new file mode 100644 index 0000000..8ef9311 Binary files /dev/null and b/images/icons/upload-repeixun.png differ diff --git a/pages/branches/branchesdetail.wxml b/pages/branches/branchesdetail.wxml index d2fa64a..8aeecf1 100644 --- a/pages/branches/branchesdetail.wxml +++ b/pages/branches/branchesdetail.wxml @@ -2,16 +2,15 @@ 考试网点 - + 新东方学校 - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/branches/branchesdetail.wxss b/pages/branches/branchesdetail.wxss index 3819191..8680f14 100644 --- a/pages/branches/branchesdetail.wxss +++ b/pages/branches/branchesdetail.wxss @@ -1 +1,12 @@ -/* pages/branches/branchesdetail.wxss */ \ No newline at end of file +/* pages/branches/branchesdetail.wxss */ +.content-view{ + padding: 30rpx; +} +.content-detail{ + padding: 30rpx; + box-shadow: 0 0 10rpx #ccc; +} +.notice-title{ + padding-bottom: 30rpx; + border-bottom: 1px solid #e5e5e5; +} \ No newline at end of file diff --git a/pages/branches/brancheslist.js b/pages/branches/brancheslist.js index e63fe35..e73d7d0 100644 --- a/pages/branches/brancheslist.js +++ b/pages/branches/brancheslist.js @@ -5,25 +5,42 @@ Page({ * 页面的初始数据 */ data: { - branchesList: [{},{},{},{}], + branchesList: [], CustomBar: app.globalData.CustomBar, countTime: 2000, //延迟搜索 时间 searchWaiting: false, //是否等待搜索倒计时中, - searchKey: '' + searchKey: '', + sourceUrl: app.baseUrls.cardUrl + app.baseUrls.baseImgUrl + }, + getExamPlace: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.examPlace, [app.baseUrls.cardUrl]), {}, {}, + function (code, data) { + if (code == 200) { + if (data.institutionImage) { + data.institutionImage = data.institutionImage.split(',')[0] + } + self.setData({ + branchesList: data + }) + } + }, + function (code, err) { + console.log(err) + }) }, - /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - - }, - showDetail(e) { - var item = e.currentTarget.dataset.item - wx.navigateTo({ - url: './branchesdetail', - }) + this.getExamPlace() }, + // showDetail(e) { + // var item = e.currentTarget.dataset.item + // wx.navigateTo({ + // url: './branchesdetail', + // }) + // }, doSearch(e) { this.setData({ countTime: 2000, diff --git a/pages/branches/brancheslist.wxml b/pages/branches/brancheslist.wxml index 82fc11f..0fe5584 100644 --- a/pages/branches/brancheslist.wxml +++ b/pages/branches/brancheslist.wxml @@ -8,17 +8,19 @@ - + - - + + + + - 2021年4-6月特种设备作业人员培训开班通知 - 新东方在线 + {{item.institutionName}} + {{item.institutionAddress}} + {{item.institutionContact}} - \ No newline at end of file + \ No newline at end of file diff --git a/pages/branches/brancheslist.wxss b/pages/branches/brancheslist.wxss index 72711f4..0a2f7c4 100644 --- a/pages/branches/brancheslist.wxss +++ b/pages/branches/brancheslist.wxss @@ -1 +1,37 @@ -/* pages/branches/brancheslist.wxss */ \ No newline at end of file +/* pages/branches/brancheslist.wxss */ +.cu-avatar.xl image{ + width: 100%; + height: 100%; +} +.list{ + margin-top: 30rpx; +} +.item{ + padding: 30rpx; + background-color: #fff; + box-shadow: 0 0 10rpx #ccc; + display: flex; + justify-content: space-between; + margin-bottom: 30rpx; + border-radius: 10rpx; + margin-top: 0; +} +.exam-photo, .exam-photo image{ + width: 155rpx; + height: 155rpx; +} +.content{ + width: 460rpx; +} +.content text{ + display: block; + font-size: 28rpx; + color: #999; +} +.content .exam-title{ + font-size: 34rpx; + color: #333; + font-weight: bold; + margin-bottom: 30rpx; + display: block; +} \ No newline at end of file diff --git a/pages/card/cardlist.js b/pages/card/cardlist.js index 6d75fb5..af70e77 100644 --- a/pages/card/cardlist.js +++ b/pages/card/cardlist.js @@ -19,7 +19,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - this.getMyExam() + // this.getMyExam() }, getMyExam() { wx.showLoading({ diff --git a/pages/card/cardlist.wxml b/pages/card/cardlist.wxml index 037e44b..a599c86 100644 --- a/pages/card/cardlist.wxml +++ b/pages/card/cardlist.wxml @@ -2,8 +2,30 @@ 准考证查询 - - + + + + + [2021-121] [2021年第（五）期非高危] + + 考试时间:2021-09-15 + + + 培训机构:包头市永安培训有限公司 + + + 考试科目:非高危行业主要负责人及安全管理员 + + + 准考证号:2021940602 + + + 详情 + + + + + + + diff --git a/pages/card/cardlist.wxss b/pages/card/cardlist.wxss index 51bd1b4..3a84fe9 100644 --- a/pages/card/cardlist.wxss +++ b/pages/card/cardlist.wxss @@ -1 +1,29 @@ -/* pages/card/cardlist.wxss */ \ No newline at end of file +/* pages/card/cardlist.wxss */ +.list,.item{ + margin-top: 0; +} +.item{ + margin-bottom: 30rpx; + padding: 30rpx 20rpx; + box-shadow: 0 0 10rpx #ccc; +} +.card-title{ + font-size: 32rpx; + color: #333; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +text{ + font-size: 28rpx; + color: #00A0E9; +} +.detail-btn{ + width: 130rpx; + height: 60rpx; + line-height: 60rpx; + text-align: center; + color: #fff; + background: linear-gradient(90deg, #19B3FA, #7FD6FD); + border-radius: 6rpx; +} \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 64b5c5a..cea8838 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -9,19 +9,21 @@ Page({ answerList: [], //报考问答 userIcon: '../../images/icons/ic_user_default.png', nickName: '点击授权', - show: false, + // show: false, phone: '', //要绑定的手机号 + categoryId: '87a51bb1-451b-4b49-903b-4d847ba9c730', }, onLoad() { this.getUserInfo() this.getNoticeList() this.getAnswerList() + this.doLogin() }, - //获取开班通告 + //获取最新公告 getNoticeList() { var _self = this app.restAjax.get(app.restAjax.path(app.apis.getArticleList, [app.baseUrls.cardUrl]), { - categoryId: '2ff8f6be-a435-46c1-98b7-47b16c621395', + categoryId: _self.data.categoryId, page: '1', rows: '6' }, {}, @@ -33,7 +35,7 @@ Page({ var photos = item.coverPhotos.split(',') data.rows[i].showPhoto = app.baseUrls.cardUrl + app.baseUrls.baseImgUrl + photos[0] } else { - data.rows[i].showPhoto = '../../images/icons/notice_default.jpeg' + data.rows[i].showPhoto = '../../images/icons/notice_default.png' } } _self.setData({ @@ -88,7 +90,7 @@ Page({ _self.setData({ userIcon: icon }) - _self.checkBindPhone() + // _self.checkBindPhone() } else { wx.showModal({ title: '提示', @@ -159,9 +161,10 @@ Page({ }, //显示更多数据 showMoreList() { - if (this.data.index == 1) { + var self = this + if (this.data.index == 1 || this.data.index == 3) { wx.navigateTo({ - url: '../notices/noticeslist', + url: '../notices/noticeslist?index=' + self.data.index, }) } else { wx.navigateTo({ @@ -174,6 +177,18 @@ Page({ this.setData({ index: e.currentTarget.dataset.id }) + if (e.currentTarget.dataset.id != '2') { + if (e.currentTarget.dataset.id == '1') { + this.setData({ + categoryId: '87a51bb1-451b-4b49-903b-4d847ba9c730' + }) + } else if (e.currentTarget.dataset.id == '3') { + this.setData({ + categoryId: '92737534-c2ef-487c-b763-4d1fb597388f' + }) + } + this.getNoticeList() + } }, //页面跳转 choosePage(e) { @@ -191,20 +206,27 @@ Page({ case '4': //考试网点查询 pagePath = '../branches/brancheslist' break + case '5': //培训报名 + pagePath = '../sign/sign' + break + case '6': //报名情况 + pagePath = '../signStatus/signStatus' + break } - if (e.currentTarget.dataset.page == '2' || e.currentTarget.dataset.page == '3') { - if (app.globalData.bindPhone != '' && app.globalData.bindPhone.length > 0) { - wx.navigateTo({ - url: pagePath, - }) - } else { - this.checkBindPhone() - } - } else { - wx.navigateTo({ - url: pagePath, - }) - } + wx.navigateTo({ + url: pagePath, + }) + // if (e.currentTarget.dataset.page == '2' || e.currentTarget.dataset.page == '3') { + // if (app.globalData.bindPhone != '' && app.globalData.bindPhone.length > 0) { + + // } else { + // // this.checkBindPhone() + // } + // } else { + // wx.navigateTo({ + // url: pagePath, + // }) + // } }, // 获取个人信息 getUserProfile(e) { let _self = this @@ -223,7 +245,7 @@ Page({ nickName: res.userInfo.nickName, userIcon: res.userInfo.avatarUrl }) - _self.checkBindPhone() + // _self.checkBindPhone() }, fail(err) { //判断是否绑定手机号 @@ -238,19 +260,19 @@ Page({ }) }, //判断是否绑定手机号 - checkBindPhone() { - try { - var _self = this - var bindPhone = wx.getStorageSync('bindPhone') - if (bindPhone == '' || bindPhone.length <= 0) { - _self.setData({ - show: true - }) - } - } catch (error) { + // checkBindPhone() { + // try { + // var _self = this + // var bindPhone = wx.getStorageSync('bindPhone') + // if (bindPhone == '' || bindPhone.length <= 0) { + // _self.setData({ + // show: true + // }) + // } + // } catch (error) { - } - }, + // } + // }, showNoticeDetail(e) { var item = e.currentTarget.dataset.item wx.navigateTo({ @@ -263,5 +285,25 @@ Page({ wx.navigateTo({ url: '../answer/answerdetail?id=' + item.contentId, }) + }, + // 登录 + doLogin: function () { + wx.login({ + success: function (res) { + app.restAjax.post(app.restAjax.path(app.apis.login, [app.baseUrls.testUrl]), { + jsCode: res.code + }, {}, + function (code, data) { + var token = data.data + wx.setStorage({ + key: 'token', + data: token + }) + }, + function (code, err) { + console.log(err) + }) + } + }) } }) \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 90f4251..f9e77b1 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -4,8 +4,8 @@ - - + + @@ -24,52 +24,70 @@ + + + 培训报名 + + + + 报名情况 + - + 培训机构查询 - + 成绩查询 - - + - + 考试网点查询 + - - 开班通告 + 最新公告 - + 考试政策 + + 报考问答 - 更多 - + 更多+ - + - {{item.title}} + {{item.title}} - {{item.source}} - {{item.publishDate}} + + + {{item.source}} + + + + {{item.publishDate}} + @@ -98,7 +116,7 @@ - + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 1e6af71..8d3c193 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,7 +1,8 @@ /**index.wxss**/ .userinfo-container { position: absolute; - top: 130rpx; + top: 50%; + transform: translate(0,-75%); z-index: 10; display: flex; min-height: 100rpx; @@ -11,8 +12,8 @@ } .page-content { - position: absolute; - top: 320rpx; + margin-top: -100rpx; + position: relative; display: flex; min-height: 100rpx; align-items: center; @@ -27,12 +28,13 @@ display: flex; flex-direction: row; align-items: center; - justify-content: center; + /* justify-content: center; */ padding: 20rpx; background-color: white; border: 10; border-radius: 10rpx; flex-wrap: nowrap; + overflow-x: auto; } .userinfo-icon { @@ -57,7 +59,8 @@ } .funcation-item { - flex: 1; + flex-shrink: 0; + width: 25%; display: flex; flex-direction: column; align-items: center; @@ -89,6 +92,8 @@ display: flex; align-items: center; margin-right: 24rpx; + color: #999; + font-size: 26rpx; } .page-list-content { @@ -112,4 +117,20 @@ .page-list-tab-sel { color: blue; font-size: medium; +} +.org-text { + padding-left:35rpx; + position: relative; +} +.org-text image{ + position: absolute; + top: 50%; + left: 0; + transform: translate(0,-50%); + width: 30rpx; + height: 30rpx; + z-index: 100; +} +.org-title{ + margin-bottom: 15rpx; } \ No newline at end of file diff --git a/pages/index/mineinfo.js b/pages/index/mineinfo.js index 2c9e679..7d4b00f 100644 --- a/pages/index/mineinfo.js +++ b/pages/index/mineinfo.js @@ -1,18 +1,328 @@ // pages/index/mineinfo.js +const app = getApp() Page({ /** * 页面的初始数据 */ data: { - + sourceUrl: app.baseUrls.testUrl + app.baseUrls.baseImgUrl, + personInfo: { + // birthDate: '2021-01-01', + gender: '46bec29f-2368-44f7-98d0-b33246e5e16d', + cardType: 'b7d74045-d984-4822-b0f3-711b15b933ca', + fullName: '', + idCardNumber: '', + education: '', + telephone: '', + userPhotoId: '', + idCardFront: '', + idCardBack: '', + educationPhoto: '' + }, + sexArray: ['男','女'], + sexIdx: 0, + cultrueAll: [], + cultrueList: [], + cultrueIdx: 0, + cultrueId: '', + avatar: '', + bindPhone: '', // 输入绑定的手机号 + isBindPhone: false, // 是否绑定了手机号 + }, + // 获取个人信息 + getPersonInfo: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.gerPersonInfo, [app.baseUrls.testUrl]), {}, { + headers: { + token: wx.getStorageSync('token') + } + },function (code, data) { + console.log(data) + var sex + if (data.gender == '46bec29f-2368-44f7-98d0-b33246e5e16d') { + sex = 0 + } else { + sex = 1 + } + self.setData({ + personInfo: data, + sexIdx: sex + }) + for (let i = 0; i < self.data.cultrueAll.length; i++) { + if (self.data.cultrueAll[i].dataId == data.education) { + self.setData({ + cultrueIdx: i + }) + } + } + }, + function (code, err) { + console.log(err) + }) + }, + // 选择生日 + bindDateChange: function (e) { + var self = this + self.setData({ + ['personInfo.birthDate']: e.detail.value + }) + }, + // 选择性别 + bindSexPickerChange: function (e) { + var self = this + var sexId + if (e.detail.value == '0') { + sexId = '46bec29f-2368-44f7-98d0-b33246e5e16d' + } else { + sexId = '4a5f549a-d339-4403-8d26-9058e80499b1' + } + self.setData({ + sexIdx: e.detail.value, + ['personInfo.gender']: sexId + }) + }, + // 获取文化程度列表 + getCulture: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.getCultrue, [app.baseUrls.testUrl]), {}, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + var result = ['请选择文化程度'] + for (let i = 0; i < data.length; i++) { + result.push(data[i].dataName) + } + self.setData({ + cultrueAll: data, + cultrueList: result + }) + self.getPersonInfo() + }, + function (code, err) { + console.log(err) + }) + }, + // 选择文化程度 + bindCultruePickerChange: function (e) { + var self = this + self.setData({ + cultrueIdx: e.detail.value, + cultrueId: self.data.cultrueAll[e.detail.value].dataId, + ['personInfo.education']: self.data.cultrueAll[e.detail.value].dataId + }) + }, + // 上传图片 + uploadImg: function (e) { + var self = this + var from = e.currentTarget.dataset.type + wx.chooseImage({ + count: 1, + sizeType: ['original', 'compressed'], + sourceType: ['album', 'camera'], + success (res) { + app.restAjax.file(app.restAjax.path(app.apis.doUploadImg, [app.baseUrls.testUrl]), res.tempFilePaths[0],'image', { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + var result = JSON.parse(data).data + if (from == 'avatar') { + self.setData({ + ['personInfo.userPhotoId']: result + }) + } else if (from == 'front') { + self.setData({ + ['personInfo.idCardFront']: result + }) + } else if (from == 'back') { + self.setData({ + ['personInfo.idCardBack']: result + }) + } else { + self.setData({ + ['personInfo.educationPhoto']: result + }) + } + }, + function (code, err) { + console.log(err) + }) + } + }) + }, + // 保存个人信息 + savePersonInfo: function () { + var self = this + console.log(self.data.personInfo) + if (!self.data.personInfo.fullName) { + wx.showToast({ + title: '姓名不能为空', + icon: 'error' + }) + return + } + if (!self.data.personInfo.idCardNumber) { + wx.showToast({ + title: '证件号不能为空', + icon: 'error' + }) + return + } + if (!self.data.personInfo.education) { + wx.showToast({ + title: '请选择文化程度', + icon: 'error' + }) + return + } + if (!self.data.personInfo.telephone) { + wx.showToast({ + title: '电话号不能为空', + icon: 'error' + }) + return + } + if (!self.data.personInfo.userPhotoId) { + wx.showToast({ + title: '请上传头像', + icon: 'error' + }) + return + } + if (!self.data.personInfo.idCardFront) { + wx.showToast({ + title: '请上传证件正面', + icon: 'error' + }) + return + } + if (!self.data.personInfo.idCardBack) { + wx.showToast({ + title: '请上传证件反面', + icon: 'error' + }) + return + } + if (!self.data.personInfo.educationPhoto) { + wx.showToast({ + title: '请上传学历证书', + icon: 'error' + }) + return + } + app.restAjax.post(app.restAjax.path(app.apis.savePersonInfo, [app.baseUrls.testUrl]), self.data.personInfo, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + if (code == '200') { + wx.showToast({ + title: '保存成功！', + icon: 'success' + }) + setTimeout(function () { + wx.reLaunch({ + url: '../index/index', + }) + }, 2000) + } + }, + function (code, err) { + console.log(err) + }) + }, + // 输入信息 + editInfo: function (e) { + var from = e.currentTarget.dataset.type + var info + if (from == 'name') { + info = 'personInfo.fullName' + } else if (from == 'card') { + info = 'personInfo.idCardNumber' + } else if (from == 'telephone') { + info = 'personInfo.telephone' + } + this.setData({ + [info]: e.detail.value + }) + }, + // 检查是否绑定手机号 + checkPhone: function () { + var self = this + app.restAjax.post(app.restAjax.path(app.apis.checkPhone, [app.baseUrls.testUrl]), {}, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + console.log(data) + self.setData({ + isBindPhone: data.data + }) + }, + function (code, err) { + console.log(err) + } + ) + }, + // 绑定手机 + doBindPhone: function () { + var self = this + app.restAjax.post(app.restAjax.path(app.apis.bindPhone, [app.baseUrls.testUrl, self.data.bindPhone]), {}, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + if (code == '200') { + wx.showToast({ + title: '绑定成功！', + icon: 'success' + }) + setTimeout(function () { + self.setData({ + isBindPhone: true + }) + }, 1500) + self.doLogin() + } + }, + function (code, err) { + console.log(err) + } + ) + }, + // 登录 + doLogin: function () { + wx.login({ + success: function (res) { + app.restAjax.post(app.restAjax.path(app.apis.login, [app.baseUrls.testUrl]), { + jsCode: res.code + }, {}, + function (code, data) { + var token = data.data + wx.setStorage({ + key: 'token', + data: token + }) + }, + function (code, err) { + console.log(err) + }) + } + }) }, - /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + this.checkPhone() + this.getCulture() }, /** diff --git a/pages/index/mineinfo.wxml b/pages/index/mineinfo.wxml index e4070e1..10ea4e2 100644 --- a/pages/index/mineinfo.wxml +++ b/pages/index/mineinfo.wxml @@ -2,52 +2,123 @@ 个人信息 - + 姓名: - 姓名 + + + 证件号码: - 188888888888888 + + + - + 性别: - 188888888888888 + + + + {{sexArray[sexIdx]}} + + + 文化程度: - 188888888888888 + + + + {{cultrueList[cultrueIdx]}} + + + 电话号码: - 188888888888888 + + + - + + + 头像: + + + + - 通信地址: - 内蒙古呼和浩特市赛罕区内蒙古呼和浩特市赛罕区内蒙古呼和浩特市赛罕区内蒙古呼和浩特市赛罕区 + 学历证书: + + + + + + + + + 身份证正面: + + + + + + + 身份证反面: + + + + - \ No newline at end of file + + + + + + 手机号码: + + + + + + + + + 保存 + + + 绑定手机 + \ No newline at end of file diff --git a/pages/index/mineinfo.wxss b/pages/index/mineinfo.wxss index 7e2095c..a3b3a52 100644 --- a/pages/index/mineinfo.wxss +++ b/pages/index/mineinfo.wxss @@ -1 +1,56 @@ -/* pages/index/mineinfo.wxss */ \ No newline at end of file +.save{ + position: fixed; + bottom: 0; + left: 0; + right: 0; + padding: 15rpx; + background: #fff; + z-index: 10000; +} +.save-btn{ + width: 100%; + height: 80rpx; + text-align: center; + line-height: 80rpx; + background-color: #494CBD; + color: #fff; + font-size: 36rpx; + font-weight: bold; + border-radius: 45rpx; +} +.avatar{ + width: 60%; +} +.card{ + max-width: 480rpx; +} +/* .bind-phone{ + padding: 10rpx; + background-color: #fff; +} */ +.bind-phone-box{ + background-color: #fff; +} +.table-item-title{ + width: 30%; +} +.table-item-content-3{ + width: 70%; +} +.default-avatar{ + width: 220rpx; +} +.id-card-box{ + width: 50%; + box-sizing: border-box; +} +.id-card-box-f{ + padding-right: 15rpx; +} +.id-card-box-f image{ + width: 100%; +} +.card-title{ + font-size: 32rpx; + margin-bottom: 15rpx; +} \ No newline at end of file diff --git a/pages/institutions/institutionsdetail.js b/pages/institutions/institutionsdetail.js index 529f930..a57e05e 100644 --- a/pages/institutions/institutionsdetail.js +++ b/pages/institutions/institutionsdetail.js @@ -29,13 +29,15 @@ Page({ (code, data) => { wx.hideLoading({}) if (code == 200) { - var ps = data.institutionImage.split(',') - var photos = [] - for (var i = 0; i < ps.length; i++) { - var urls = app.baseUrls.cardUrl + app.baseUrls.baseImgUrl + ps[i] - photos = photos.concat(urls) + if (data.institutionImage) { + var ps = data.institutionImage.split(',') + var photos = [] + for (var i = 0; i < ps.length; i++) { + var urls = app.baseUrls.cardUrl + app.baseUrls.baseImgUrl + ps[i] + photos = photos.concat(urls) + } + data.showPhoto = photos } - data.showPhoto = photos _self.setData({ detailBean: data }) diff --git a/pages/institutions/institutionsdetail.wxml b/pages/institutions/institutionsdetail.wxml index 4128ef9..73d80af 100644 --- a/pages/institutions/institutionsdetail.wxml +++ b/pages/institutions/institutionsdetail.wxml @@ -6,33 +6,36 @@ - {{detailBean.institutionName}} - - - - - - 负责人:{{detailBean.institutionPrincipal}} + {{detailBean.institutionName}} - - 联系方式:{{detailBean.institutionContact}} + 负责人: + {{detailBean.institutionPrincipal}} + - - 成立日期:{{detailBean.institutionFoundingTime}} + 联系方式: + {{detailBean.institutionContact}} + - 地址:{{detailBean.institutionAddress}} + 成立日期: + {{detailBean.institutionFoundingTime}} + + + + 地址: + {{detailBean.institutionAddress}} + - - + + diff --git a/pages/institutions/institutionsdetail.wxss b/pages/institutions/institutionsdetail.wxss index 0411503..4e7b8a1 100644 --- a/pages/institutions/institutionsdetail.wxss +++ b/pages/institutions/institutionsdetail.wxss @@ -1 +1,15 @@ -/* pages/institutions/institutionsdetail.wxss */ \ No newline at end of file +/* pages/institutions/institutionsdetail.wxss */ +.content-view{ + padding: 30rpx; +} +.content-detail{ + box-shadow: 0 0 10rpx #ccc; + padding: 50rpx; +} +.notice-title{ + border-bottom: 1px solid #E5E5E5; + padding-bottom: 40rpx; +} +text{ + color: #00A0E9; +} \ No newline at end of file diff --git a/pages/institutions/institutionslist.wxml b/pages/institutions/institutionslist.wxml index 92605d8..fa7de51 100644 --- a/pages/institutions/institutionslist.wxml +++ b/pages/institutions/institutionslist.wxml @@ -8,34 +8,25 @@ - - - - - - {{item.institutionName}} - - {{item.institutionContact}} - - - {{item.institutionAddress}} - - - - - {{item.institutionFoundingTime}} - - - - 去这里 - - + + + + + + {{item.institutionName}} + {{item.institutionAddress}} + 负责人：{{item.institutionPrincipal}} + + + + + + {{item.institutionContact}} + + + + 到这去 - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/institutions/institutionslist.wxss b/pages/institutions/institutionslist.wxss index 492b950..b6a251a 100644 --- a/pages/institutions/institutionslist.wxss +++ b/pages/institutions/institutionslist.wxss @@ -1 +1,65 @@ -/* pages/institutions/institutionslist.wxss */ \ No newline at end of file +.org{ + margin-top: 125rpx; + padding: 0 30rpx; +} +.org-box{ + padding: 30rpx 20rpx; + background-color: #fff; + border-radius: 10rpx; + box-shadow: 0 0 10rpx #ccc; + margin-bottom: 30rpx; +} +.org-info{ + display: flex; + justify-content: space-between; + margin-bottom: 30rpx; +} +.org-info image{ + width: 200rpx; +} +.org-text{ + width: 420rpx; +} +.org-name{ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: 32rpx; + color: #333; + font-weight: bold; + margin-bottom: 15rpx; +} +.org-add,.org-phone{ + line-height: 45rpx; + font-size: 28rpx; + color: #999; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.org-btn-box{ + display: flex; + justify-content: space-between; +} +.org-btn{ + width: 49%; + height: 52rpx; + background: linear-gradient(-30deg, #19B3FA, #7FD6FD); + border-radius: 25rpx; + color: #fff; + line-height: 52rpx; + font-size: 28rpx; + text-align: center; +} +.org-btn:last-child{ + background: linear-gradient(-30deg, #36C9CB, #86E2E3); +} +.org-btn image{ + width:40rpx; + vertical-align: middle; + margin-top: -6rpx; + /* margin-right: 5rpx; */ +} +.org-btn:last-child image{ + width: 29rpx; +} \ No newline at end of file diff --git a/pages/notices/noticedetail.wxml b/pages/notices/noticedetail.wxml index 4141ea7..67c4dc8 100644 --- a/pages/notices/noticedetail.wxml +++ b/pages/notices/noticedetail.wxml @@ -8,11 +8,10 @@ {{detailBean.title}} - + 发布日期:{{detailBean.publishDate}} 培训机构:{{detailBean.source}} - diff --git a/pages/notices/noticedetail.wxss b/pages/notices/noticedetail.wxss index 8be5b11..29fe8da 100644 --- a/pages/notices/noticedetail.wxss +++ b/pages/notices/noticedetail.wxss @@ -1,2 +1,8 @@ /* pages/notices/noticedetail.wxss */ - +.content-view{ + padding: 30rpx; +} +.content-detail{ + padding: 30rpx; + box-shadow: 0 0 10rpx #ccc; +} \ No newline at end of file diff --git a/pages/notices/noticeslist.js b/pages/notices/noticeslist.js index ae2e541..b0d753c 100644 --- a/pages/notices/noticeslist.js +++ b/pages/notices/noticeslist.js @@ -13,13 +13,26 @@ Page({ searchKey: '', contentHeight: app.globalData.windowHeight, currentPage: 1, - totalSize: 0 + totalSize: 0, + categoryId: '', + pageTitle: '最新公告' }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { + if (options.index == 1) { + this.setData({ + categoryId: '87a51bb1-451b-4b49-903b-4d847ba9c730', + pageTitle: '最新公告' + }) + } else { + this.setData({ + categoryId: '92737534-c2ef-487c-b763-4d1fb597388f ', + pageTitle: '考试政策' + }) + } this.getResultsList('') }, showDetail(e) { @@ -53,9 +66,10 @@ Page({ } }, getResultsList(key) { + console.log(key) var _self = this app.restAjax.get(app.restAjax.path(app.apis.getArticleList, [app.baseUrls.cardUrl]), { - categoryId: '2ff8f6be-a435-46c1-98b7-47b16c621395', + categoryId: _self.data.categoryId, page: _self.data.currentPage, rows: '10', keywords: key @@ -63,26 +77,32 @@ Page({ function (code, data) { wx.hideLoading({}) if (code == 200) { - for (var i = 0; i < data.rows.length; i++) { - var item = data.rows[i] - if (item.coverPhotos.length > 0) { - var photos = item.coverPhotos.split(',') - data.rows[i].showPhoto = app.baseUrls.cardUrl + app.baseUrls.baseImgUrl + photos[0] + if (data.rows.length > 0) { + for (var i = 0; i < data.rows.length; i++) { + var item = data.rows[i] + if (item.coverPhotos.length > 0) { + var photos = item.coverPhotos.split(',') + data.rows[i].showPhoto = app.baseUrls.cardUrl + app.baseUrls.baseImgUrl + photos[0] + } else { + data.rows[i].showPhoto = 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fwww.czcaizhi.com%2FContent%2FUploadFiles%2Fimage%2F20180920%2F20180920133956_3429.jpg&refer=http%3A%2F%2Fwww.czcaizhi.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1622110389&t=4ae9d4f943c30ac6d43801515eec97e5' + } + } + if (_self.data.currentPage > 1) { + if (data.rows.length > 0) { + _self.data.noticeList = _self.data.noticeList.concat(data.rows) + } } else { - data.rows[i].showPhoto = 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fwww.czcaizhi.com%2FContent%2FUploadFiles%2Fimage%2F20180920%2F20180920133956_3429.jpg&refer=http%3A%2F%2Fwww.czcaizhi.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1622110389&t=4ae9d4f943c30ac6d43801515eec97e5' - } - } - if (_self.data.currentPage > 1) { - if (data.rows.length > 0) { - _self.data.noticeList = _self.data.noticeList.concat(data.rows) + _self.data.noticeList = data.rows } + _self.setData({ + noticeList: _self.data.noticeList, + totalSize: data.total + }) } else { - _self.data.noticeList = data.rows + _self.setData({ + currentPage: _self.data.currentPage-- + }) } - _self.setData({ - noticeList: _self.data.noticeList, - totalSize: data.total - }) } }, function (code, err) { @@ -122,8 +142,19 @@ Page({ wx.showLoading({ title: '搜索中...', }) + console.log(_self.data.searchKey) _self.getResultsList(_self.data.searchKey) clearInterval(setTimer) //清除计时器 }) }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + var self = this + this.setData({ + currentPage: self.data.currentPage++ + }) + this.getResultsList('') + }, }) \ No newline at end of file diff --git a/pages/notices/noticeslist.wxml b/pages/notices/noticeslist.wxml index d17b45e..a047ad5 100644 --- a/pages/notices/noticeslist.wxml +++ b/pages/notices/noticeslist.wxml @@ -1,6 +1,6 @@ - 开班通告 + {{pageTitle}} diff --git a/pages/notices/noticeslist.wxss b/pages/notices/noticeslist.wxss index 5ed68d8..cf4cd6a 100644 --- a/pages/notices/noticeslist.wxss +++ b/pages/notices/noticeslist.wxss @@ -1 +1,4 @@ -/* pages/notices/noticeslist.wxss */ \ No newline at end of file +/* pages/notices/noticeslist.wxss */ +.content text{ + display: block; +} \ No newline at end of file diff --git a/pages/results/resultsdetail.js b/pages/results/resultsdetail.js index 1a1dacd..d799041 100644 --- a/pages/results/resultsdetail.js +++ b/pages/results/resultsdetail.js @@ -8,12 +8,12 @@ Page({ data: { scoreList: [{}, {}, {}, {}, {}, {}, {}, {}, {}] }, - + /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + }, /** diff --git a/pages/results/resultslist.js b/pages/results/resultslist.js index db80853..2c89f08 100644 --- a/pages/results/resultslist.js +++ b/pages/results/resultslist.js @@ -10,21 +10,22 @@ Page({ CustomBar: app.globalData.CustomBar, countTime: 2000, //延迟搜索 时间 searchWaiting: false, //是否等待搜索倒计时中, - searchKey: '' + searchKey: '', + idCardNumber: '' }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - this.getResultsList('') + this.checkInfo() }, getResultsList(key) { var _self = this wx.showLoading({ title: '加载中...', }) - app.restAjax.get(app.restAjax.path(app.apis.getScoreList, [app.baseUrls.cardUrl]), {}, { + app.restAjax.get(app.restAjax.path(app.apis.getAchievement + _self.data.idCardNumber, [app.baseUrls.cardUrl]), {}, { headers: { token: app.globalData.token } @@ -60,6 +61,35 @@ Page({ this.timer(); } }, + checkInfo: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.checkEditedInfo, [app.baseUrls.testUrl]), {}, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + if (!data.idCardNumber) { + wx.showToast({ + icon:'none', + title: '请先前往个人中心填写个人信息！', + }) + setTimeout(function () { + wx.reLaunch({ + url: '../index/index', + }) + }, 1500) + } else { + self.setData({ + idCardNumber: data.idCardNumber + }) + self.getResultsList('') + } + }, + function (code, err) { + console.log(err) + }) + }, /** * 延迟搜索 */ diff --git a/pages/results/resultslist.wxml b/pages/results/resultslist.wxml index 55afcf5..0e2aed1 100644 --- a/pages/results/resultslist.wxml +++ b/pages/results/resultslist.wxml @@ -8,31 +8,27 @@ --> - - - - - {{item.classPlanDTO.planName}} - - - 考试日期:{{item.examStartTime}} - - - - 培训机构:{{item.classPlanDTO.orgName}} - - - - 专业:{{item.classPlanDTO.workerCatalogName}} - - - - 成绩: - {{item.applyTestScores}} - - + + + + + {{item.orgName}} + + + 作业类别：{{item.parentWorkTypeName}} + + + 准操项目：{{item.workTypeName}} + + + 培训班次：{{item.planName}} + + + 培训类别：{{item.applyLeiBie}} + + + 成绩：{{item.examScore}} - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/results/resultslist.wxss b/pages/results/resultslist.wxss index 449f12c..c749daa 100644 --- a/pages/results/resultslist.wxss +++ b/pages/results/resultslist.wxss @@ -1 +1,23 @@ -/* pages/results/resultslist.wxss */ \ No newline at end of file +/* pages/results/resultslist.wxss */ +.row{ + line-height: 50rpx; + font-size: 30rpx; + color: #333; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.row text{ + color: #39CACC; +} +.org-title{ + font-weight: bold; + font-size: 32rpx; +} +.achievement-box{ + padding: 30rpx; + border-radius: 10rpx; + box-shadow: 0 0 10rpx #eee; + background-color: #fff; + margin-bottom: 15rpx; +} \ No newline at end of file diff --git a/pages/sign/sign.js b/pages/sign/sign.js new file mode 100644 index 0000000..4661032 --- /dev/null +++ b/pages/sign/sign.js @@ -0,0 +1,182 @@ +// pages/sign/sign.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + // 科目类型 + typeAll: [], + typeList: [], + typeIdx: 0, + typeId: '', + // 报名工种 + signTypeAll: [], + signTyleList: [], + signTypeIdx: 0, + signTypeId: '', + orgList: [] + }, + // 获取科目类型 + getTypeList: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.getTrainTypeList, [app.baseUrls.testUrl]), { + workTypeParentId: 0 + }, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + var result = ['请选择科目类型'] + for (let i = 0; i < data.length; i++) { + result.push(data[i].workTypeName) + } + self.setData({ + typeList: result, + typeAll: data, + typeId: data[0].workTypeId + }) + }, + function (code, err) { + console.log(err) + }) + }, + // 获取报名工种 + getSignTypeList: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.getTrainTypeList, [app.baseUrls.testUrl]), { + workTypeParentId: self.data.typeId + }, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + var result = [] + for (let i = 0; i < data.length; i++) { + result.push(data[i].workTypeName) + } + self.setData({ + signTyleList: result, + signTypeAll: data, + signTypeId: data[0].workTypeId + }) + self.getOrgList() + }, + function (code, err) { + console.log(err) + }) + }, + // 选择科目类型 + bindPickerChange: function (e) { + var self = this + if (e.detail.value != '0') { + var id = self.data.typeAll[e.detail.value - 1].workTypeId + self.setData({ + typeIdx: e.detail.value, + typeId: id, + signTypeIdx: 0 + }) + self.getSignTypeList() + } else { + self.setData({ + typeIdx: e.detail.value, + typeId: '', + signTypeIdx: 0, + signTyleList: [], + orgList: [] + }) + } + }, + // 选择报名工种 + bindSignPickerChange: function (e) { + var self = this + var curId = self.data.signTypeAll[e.detail.value].workTypeId + self.setData({ + signTypeIdx: e.detail.value, + signTypeId: curId + }) + self.getOrgList() + }, + // 获取培训机构列表 + getOrgList: function (id) { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.getOrgList, [app.baseUrls.testUrl]), { + workTypeId: self.data.signTypeId + }, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + self.setData({ + orgList: data + }) + }, + function (code, err) { + console.log(err) + }) + }, + doSign: function (e) { + wx.navigateTo({ + url: '../signOrg/signOrg?applyWorkTypeId=' + this.data.signTypeId + '&applyInstitutionId=' + e.currentTarget.dataset.org, + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getTypeList() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/sign/sign.json b/pages/sign/sign.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/sign/sign.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/sign/sign.wxml b/pages/sign/sign.wxml new file mode 100644 index 0000000..1f27a92 --- /dev/null +++ b/pages/sign/sign.wxml @@ -0,0 +1,46 @@ + + + 培训报名 + + + + + + + 科目类型: + + {{typeList[typeIdx]}} + + + + + + + 报名工种: + + {{signTyleList[signTypeIdx]}} + + + + + + + + {{item.institutionName}} + + 地址：{{item.institutionAddress}} + + + 开班人数：{{item.applyUserNum1}}人 + + + 已报人数：{{item.applyUserNum2}}人 + + + 过审人数：{{item.applyUserNum3}}人 + + 报名 + 已报名 + 机构已开班 + + \ No newline at end of file diff --git a/pages/sign/sign.wxss b/pages/sign/sign.wxss new file mode 100644 index 0000000..0c08efb --- /dev/null +++ b/pages/sign/sign.wxss @@ -0,0 +1,78 @@ +.train-type{ + padding: 30rpx; + background-color: #fff; + box-shadow: 0 0 10rpx #ccc; +} +.type-box{ + display: flex; + justify-content: space-between; + margin-bottom: 30rpx; +} +.type-box:last-child{ + margin-bottom: 0; +} +.type-box image{ + width: 110rpx; +} +.type-box picker{ + width: 550rpx; + font-size: 34rpx; + margin-top: 10rpx; +} +/* picker:last-child{ + margin-bottom: 0; +} */ +.org-list{ + padding: 15px; +} +.org-box{ + margin-bottom: 20rpx; + background-color: #fff; + padding: 15rpx; + border-radius: 10rpx; +} +.org-name{ + font-size: 34rpx; + font-weight: bold; + margin-bottom: 5rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.org-add{ + font-size: 28rpx; + margin-bottom: 5rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + line-height: 45rpx; +} +.org-info{ + line-height: 45rpx; + font-size: 28rpx; +} +.org-sign{ + font-size: 30rpx; + width: 130rpx; + height: 60rpx; + line-height: 60rpx; + text-align: center; + color: #fff; + margin-top: 15rpx; + border-radius: 10rpx; +} +.signable .org-sign{ + background: linear-gradient(90deg, #36C9CB, #6AD4D5); +} +.unsignable .org-sign{ + background: linear-gradient(90deg, #FA98B4, #FE5C86); +} +.signed, .lose{ + background-color: rgba(255, 0, 0, 0.6); +} +.signable text{ + color: #39CACC; +} +.unsignable text{ + color: #FE628A; +} \ No newline at end of file diff --git a/pages/signOrg/signOrg.js b/pages/signOrg/signOrg.js new file mode 100644 index 0000000..8434c35 --- /dev/null +++ b/pages/signOrg/signOrg.js @@ -0,0 +1,455 @@ +// pages/signOrg/signOrg.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + sourceUrl: app.baseUrls.testUrl + app.baseUrls.baseImgUrl, + cultrueAll: [], + cultrueList: [], + cultrueIdx: 0, + cultrueId: '', + signInfo: { + applyFenlei: 1, + applyName: '', + applySex: '', + applyCardNumber: '', + applyPhone: '', + applyUnitName: '', + applyWorkTypeId: '', + applyInstitutionId: '', + idCardFrontPhoto: '', + idCardBackPhoto: '', + educationPhoto: '', + applyUserCardPhoto: '', + applyTakeCardPhoto: '', + takeCardNumber: '', + cardTimeLimit: '2021-01-01', + rePeiXunDate: '2021-01-01', + applyRePeiXunPhoto: '', + applyUnitType: '', + applyUnitBelong: '', + applySchool: '', + applySubject: '', + applyLeiBie: '', + applyCultureLevel: '' + }, + pageType: '' + }, + getCulture: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.getCultrue, [app.baseUrls.testUrl]), {}, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + var result = ['请选择文化程度'] + for (let i = 0; i < data.length; i++) { + result.push(data[i].dataName) + } + self.setData({ + cultrueAll: data, + cultrueList: result + }) + }, + function (code, err) { + console.log(err) + }) + }, + bindPickerChange: function (e) { + var self = this + self.setData({ + cultrueIdx: e.detail.value, + cultrueId: self.data.cultrueAll[e.detail.value - 1].dataId, + ['signInfo.applyCultureLevel']: self.data.cultrueAll[e.detail.value - 1].dataId + }) + }, + changeType: function (e) { + if (e.detail.value != this.data.signInfo.applyFenlei) { + this.setData({ + ['signInfo.applyFenlei']: e.detail.value + }) + if (e.detail.value == '1') { + this.setData({ + ['signInfo.applyRePeiXunPhoto']: '', + ['signInfo.applyTakeCardPhoto']: '' + }) + } else if (e.detail.value == '3') { + this.setData({ + ['signInfo.applyRePeiXunPhoto']: '' + }) + } + } + }, + // 获取个人信息 + getPersonInfo: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.gerPersonInfo, [app.baseUrls.testUrl]), {}, { + headers: { + token: wx.getStorageSync('token') + } + },function (code, data) { + for (let i = 0; i < self.data.cultrueAll.length; i++) { + if (self.data.cultrueAll[i].dataId == data.education) { + self.setData({ + cultrueIdx: i + 1, + ['signInfo.applyCultureLevel'] : self.data.cultrueAll[i].dataId + }) + } + } + self.setData({ + ['signInfo.applyName']: data.fullName, + ['signInfo.applySex']: data.gender, + ['signInfo.applyCardNumber']: data.idCardNumber, + ['signInfo.applyPhone']: data.telephone, + ['signInfo.applyUserCardPhoto']: data.userPhotoId, + ['signInfo.educationPhoto']: data.educationPhoto, + ['signInfo.idCardBackPhoto']: data.idCardBack, + ['signInfo.idCardFrontPhoto']: data.idCardFront, + }) + }, + function (code, err) { + console.log(err) + }) + }, + editInfo: function (e) { + var self = this + var type = e.currentTarget.dataset.type + if (type == 'name') { + self.setData({ + ['signInfo.applyName']: e.detail.value + }) + } else if (type == 'card') { + self.setData({ + ['signInfo.applyCardNumber']: e.detail.value + }) + } else if (type == 'phone') { + self.setData({ + ['signInfo.applyPhone']: e.detail.value + }) + } else if (type == 'work') { + self.setData({ + ['signInfo.applyUnitName']: e.detail.value + }) + } else if (type == 'take') { + self.setData({ + ['signInfo.takeCardNumber']: e.detail.value + }) + } else if (type == 'type') { + self.setData({ + ['signInfo.applyUnitType']: e.detail.value + }) + } else if (type == 'position') { + self.setData({ + ['signInfo.applyUnitWork']: e.detail.value + }) + } else if (type == 'belong') { + self.setData({ + ['signInfo.applyUnitBelong']: e.detail.value + }) + } else if (type == 'school') { + self.setData({ + ['signInfo.applySchool']: e.detail.value + }) + } else if (type == 'subject') { + self.setData({ + ['signInfo.applySubject']: e.detail.value + }) + } else if (type == 'zhicheng') { + self.setData({ + ['signInfo.applyZhiCheng']: e.detail.value + }) + } else if (type == 'leibie') { + self.setData({ + ['signInfo.applyLeiBie']: e.detail.value + }) + } + }, + submitSignOrg: function () { + var self = this + if (!self.data.signInfo.applyFenlei) { + wx.showToast({ + title: '请选择培训类型！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyName) { + wx.showToast({ + title: '姓名不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyCultureLevel) { + wx.showToast({ + title: '请选择文化程度！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyCardNumber) { + wx.showToast({ + title: '身份证号不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyPhone) { + wx.showToast({ + title: '手机号不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyUnitName) { + wx.showToast({ + title: '工作单位不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyRePeiXunPhoto && self.data.signInfo.applyFenlei == '2') { + wx.showToast({ + title: '请上传再培训证明照片！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyTakeCardPhoto && self.data.signInfo.applyFenlei == '2') { + wx.showToast({ + title: '请上传证书个人信息页！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyTakeCardPhoto && self.data.signInfo.applyFenlei == '3') { + wx.showToast({ + title: '请上传证书个人信息页！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.takeCardNumber && self.data.signInfo.applyFenlei != '1') { + wx.showToast({ + title: '证件号码不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyLeiBie && self.data.pageType == '530279c5-32a9-44db-bbf0-a04ef1cdae66') { + wx.showToast({ + title: '培训类别不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyUnitType && self.data.pageType == '530279c5-32a9-44db-bbf0-a04ef1cdae66') { + wx.showToast({ + title: '单位类型不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyUnitWork && self.data.pageType == '530279c5-32a9-44db-bbf0-a04ef1cdae66') { + wx.showToast({ + title: '职务不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyUnitBelong && self.data.pageType == '530279c5-32a9-44db-bbf0-a04ef1cdae66') { + wx.showToast({ + title: '单位所在区域不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applySchool && self.data.pageType == '530279c5-32a9-44db-bbf0-a04ef1cdae66') { + wx.showToast({ + title: '毕业院校不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applySubject && self.data.pageType == '530279c5-32a9-44db-bbf0-a04ef1cdae66') { + wx.showToast({ + title: '所学专业不能为空！', + icon: 'error' + }) + return + } + if (!self.data.signInfo.applyZhiCheng && self.data.pageType == '530279c5-32a9-44db-bbf0-a04ef1cdae66') { + wx.showToast({ + title: '职称不能为空！', + icon: 'error' + }) + return + } + app.restAjax.post(app.restAjax.path(app.apis.signOrg, [app.baseUrls.testUrl]), self.data.signInfo, { + headers: { + token: wx.getStorageSync('token') + } + },function (code, data) { + if (code == '200') { + wx.showToast({ + title: '报名成功！', + icon: 'success' + }) + setTimeout(function () { + wx.reLaunch({ + url: '../index/index', + }) + }, 1500) + } + },function (code, err) { + console.log(err) + }) + }, + // 上传图片 + uploadImg: function (e) { + var self = this + var from = e.currentTarget.dataset.type + wx.chooseImage({ + count: 1, + sizeType: ['original', 'compressed'], + sourceType: ['album', 'camera'], + success (res) { + app.restAjax.file(app.restAjax.path(app.apis.doUploadImg, [app.baseUrls.testUrl]), res.tempFilePaths[0],'image', { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + var result = JSON.parse(data).data + if (from == 'take') { + self.setData({ + ['signInfo.applyTakeCardPhoto']: result + }) + } else if (from == 'photo') { + self.setData({ + ['signInfo.applyUserCardPhoto']: result + }) + } else if (from == 'edu') { + self.setData({ + ['signInfo.educationPhoto']: result + }) + } else if (from == 'cardF') { + self.setData({ + ['signInfo.idCardFrontPhoto']: result + }) + } else if (from == 'cardB') { + self.setData({ + ['signInfo.idCardBackPhoto']: result + }) + } else if (from == 'person') { + self.setData({ + ['signInfo.applyTakeCardPhoto']: result + }) + } else { + self.setData({ + ['signInfo.applyRePeiXunPhoto']: result + }) + } + }, + function (code, err) { + console.log(err) + } + ) + } + }) +}, + bindDateChange: function (e) { + var self = this + if (e.currentTarget.dataset.type == 'limit') { + self.setData({ + ['signInfo.cardTimeLimit']: e.detail.value + }) + } else { + self.setData({ + ['signInfo.rePeiXunDate']: e.detail.value + }) + } + + }, + getPageType: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.getPageType, [app.baseUrls.testUrl]), { + workerCatalog: self.data.signInfo.applyWorkTypeId + }, { + headers: { + token: wx.getStorageSync('token') + } + },function (code, data) { + self.setData({ + pageType: data.parentWorkerCatalog + }) + },function (code, err) { + console.log(err) + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + ['signInfo.applyWorkTypeId']: options.applyWorkTypeId, + ['signInfo.applyInstitutionId']: options.applyInstitutionId + }) + this.getCulture() + this.getPersonInfo() + this.getPageType() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/signOrg/signOrg.json b/pages/signOrg/signOrg.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/signOrg/signOrg.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/signOrg/signOrg.wxml b/pages/signOrg/signOrg.wxml new file mode 100644 index 0000000..150cd9a --- /dev/null +++ b/pages/signOrg/signOrg.wxml @@ -0,0 +1,177 @@ + + + 培训报名 + + + + + 培训类型: + + + 初训 + 复训 + 换证 + + + + + 姓名: + + + + + + 培训类别: + + + + + + 性别: + + + 男 + 女 + + + + + 文化程度: + + + + {{cultrueList[cultrueIdx]}} + + + + + + 身份证号: + + + + + + 手机号码: + + + + + + 工作单位: + + + + + + 单位类型: + + + + + + 职务: + + + + + + 单位所在区域: + + + + + + 毕业院校: + + + + + + 所学专业: + + + + + + 职称: + + + + + + 再培训证明照片: + + + + + + + 证书个人信息页: + + + + + + + 证件号码: + + + + + + 证件有效期: + + + + {{signInfo.cardTimeLimit}} + + + + + + 复审时间: + + + + {{signInfo.rePeiXunDate}} + + + + + + 照片: + + + + + + + 学历证书: + + + + + + + + + 身份证正面: + + + + + + + 身份证反面: + + + + + + + + + + 确认报名 + \ No newline at end of file diff --git a/pages/signOrg/signOrg.wxss b/pages/signOrg/signOrg.wxss new file mode 100644 index 0000000..c6a3b28 --- /dev/null +++ b/pages/signOrg/signOrg.wxss @@ -0,0 +1,67 @@ +.main-box{ + padding: 15rpx; + margin-bottom: 110rpx; +} +.row{ + display: flex; + margin-bottom: 15rpx; + background-color: #fff; + padding: 20rpx; + /* line-height: 80rpx; */ +} +.row view{ + flex-shrink: 0; +} +.row-title{ + width: 25%; + font-size: 32rpx; +} +.row-content{ + width: 75%; + font-size: 32rpx; +} +radio{ + margin-right: 15rpx; +} +radio::before{ + left:3px; +} +.row-content{ + text-align: right; +} +.row-content input{ + width: 100%; + height: 100%; +} +.sign-btn-box{ + position: fixed; + bottom: 0; + left: 0; + right: 0; + padding: 15rpx; + background-color: #fff; + z-index: 1000; +} +.sign-btn{ + width: 100%; + height: 80rpx; + text-align: center; + line-height: 80rpx; + background-color: #494CBD; + color: #fff; + font-size: 36rpx; + font-weight: bold; + border-radius: 45rpx; +} +.id-card-box{ + display: flex; + justify-content: space-between; + width: 100%; +} +.upload-card{ + width: 49%; +} +.card-title{ + font-size: 32rpx; + margin-bottom: 15rpx; +} \ No newline at end of file diff --git a/pages/signRecord/signRecord.js b/pages/signRecord/signRecord.js new file mode 100644 index 0000000..97ce726 --- /dev/null +++ b/pages/signRecord/signRecord.js @@ -0,0 +1,124 @@ +// pages/signRecord/signRecord.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + sourceUrl: app.baseUrls.testUrl + app.baseUrls.baseImgUrl, + applyId: '', + signInfo: {}, + pageType: '' + }, + getSignInfo: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.signRecord, [app.baseUrls.testUrl, self.data.applyId]), {}, { + headers: { + token: wx.getStorageSync('token') + } + },function (code, data) { + self.setData({ + signInfo: data + }) + self.getPageType() + self.getCulture() + },function (code, err) { + console.log(err) + }) + }, + getPageType: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.getPageType, [app.baseUrls.testUrl]), { + workerCatalog: self.data.signInfo.applyWorkTypeId + }, { + headers: { + token: wx.getStorageSync('token') + } + },function (code, data) { + self.setData({ + pageType: data.parentWorkerCatalog + }) + },function (code, err) { + console.log(err) + }) + }, + getCulture: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.getCultrue, [app.baseUrls.testUrl]), {}, { + headers: { + token: wx.getStorageSync('token') + } + }, + function (code, data) { + for (let i = 0; i < data.length; i++) { + if (data[i].dataId == self.data.signInfo.applyCultureLevel) { + self.setData({ + ['signInfo.applyCultureLevel']: data[i].dataName + }) + } + } + }, + function (code, err) { + console.log(err) + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + applyId: options.applyId + }) + this.getSignInfo() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/signRecord/signRecord.json b/pages/signRecord/signRecord.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/signRecord/signRecord.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/signRecord/signRecord.wxml b/pages/signRecord/signRecord.wxml new file mode 100644 index 0000000..9e316f0 --- /dev/null +++ b/pages/signRecord/signRecord.wxml @@ -0,0 +1,177 @@ + + + 培训报名 + + + + + 培训类型: + + + 初训 + 复训 + 换证 + + + + + 姓名: + + + + + + + 培训类别: + + + + + + 性别: + + + 男 + 女 + + + + + 文化程度: + + {{signInfo.applyCultureLevel}} + + + + + 身份证号: + + + + + + 手机号码: + + + + + + 工作单位: + + + + + + 单位类型: + + + + + + 职务: + + + + + + 单位所在区域: + + + + + + 毕业院校: + + + + + + 所学专业: + + + + + + 职称: + + + + + + 再培训证明照片: + + + + + + + 证书个人信息页: + + + + + + + 证件号码: + + + + + + 证件有效期: + + {{signInfo.cardTimeLimit}} + + + + + 复审时间: + + {{signInfo.rePeiXunDate}} + + + + + 照片: + + + + + + 学历证书: + + + + + + + + 身份证正面: + + + + + + 身份证反面: + + + + + + + + \ No newline at end of file diff --git a/pages/signRecord/signRecord.wxss b/pages/signRecord/signRecord.wxss new file mode 100644 index 0000000..ee2d12d --- /dev/null +++ b/pages/signRecord/signRecord.wxss @@ -0,0 +1,70 @@ +.main-box{ + padding: 15rpx; +} +.row{ + display: flex; + margin-bottom: 15rpx; + background-color: #fff; + padding: 20rpx 0; + /* line-height: 80rpx; */ +} +.row view{ + flex-shrink: 0; +} +.row-title{ + width: 25%; + text-align: center; + font-size: 32rpx; +} +.row-content{ + width: 75%; + font-size: 32rpx; +} +radio{ + margin-right: 15rpx; +} +radio::before{ + left:3px; +} +.row-content{ + text-align: right; +} +.row-content input{ + width: 100%; + height: 100%; +} +.sign-btn-box{ + position: fixed; + bottom: 0; + left: 0; + right: 0; + padding: 15rpx; + background-color: #fff; + z-index: 1000; +} +.sign-btn{ + width: 100%; + height: 80rpx; + text-align: center; + line-height: 80rpx; + background-color: #11a5fa; + color: #fff; + font-size: 36rpx; + font-weight: bold; + border-radius: 5rpx; +} +radio::disabled::before{ + display: none; +} +.id-card-box{ + display: flex; + justify-content: space-between; + width: 100%; +} +.upload-card{ + width: 49%; +} +.card-title{ + font-size: 32rpx; + margin-bottom: 15rpx; +} \ No newline at end of file diff --git a/pages/signStatus/signStatus.js b/pages/signStatus/signStatus.js new file mode 100644 index 0000000..5f058de --- /dev/null +++ b/pages/signStatus/signStatus.js @@ -0,0 +1,151 @@ +// pages/signStatus/signStatus.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + page: { + page: 1, + rows: 10 + }, + signList: [] + }, + // 获取报名情况 + getApplyStatus: function () { + var self = this + app.restAjax.get(app.restAjax.path(app.apis.getMyApply, [app.baseUrls.testUrl]), self.data.page, { + headers: { + token: wx.getStorageSync('token') + } + },function (code, data) { + if (data.rows.length > 0) { + for (let i = 0; i < data.rows.length; i++) { + if (data.rows[i].applyAuditState == '0') { + data.rows[i]['statusName'] = 'wait' + } else if (data.rows[i].applyAuditState == '1') { + data.rows[i]['statusName'] = 'draw' + } else if (data.rows[i].applyAuditState == '2') { + data.rows[i]['statusName'] = 'pass' + } else if (data.rows[i].applyAuditState == '3') { + data.rows[i]['statusName'] = 'complete' + } else { + data.rows[i]['statusName'] = 'not-pass' + } + } + self.setData({ + signList: self.data.signList.concat(data.rows) + }) + } else { + wx.showToast({ + title: '暂无更多', + icon: 'none' + }) + self.setData({ + ['page.page']: self.data.page.page -1 + }) + } + + },function (code, err) { + console.log(err) + }) + }, + // 取消报名 + cancelSign: function (e) { + var id = e.currentTarget.dataset.id + var self = this + wx.showModal({ + cancelColor: 'cancelColor', + title: '提示', + content: '取消报名后需重新填写报名信息', + success: function (res) { + if (res.confirm) { + app.restAjax.put(app.restAjax.path(app.apis.cancelSign, [app.baseUrls.testUrl, id]), {}, { + headers: { + token: wx.getStorageSync('token') + } + },function (code, data) { + if (code == '200') { + wx.showToast({ + title: '取消报名成功！', + }) + setTimeout(function () { + wx.reLaunch({ + url: '../index/index', + }) + }, 1500) + } + },function (code, err) { + console.log(err) + }) + } + } + }) + }, + // 查看详情 + checkDetail: function (e) { + wx.navigateTo({ + url: '../signRecord/signRecord?applyId=' + e.currentTarget.dataset.id, + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getApplyStatus() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + var self = this + self.setData({ + ['page.page']: self.data.page.page + 1 + }) + self.getApplyStatus() + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/signStatus/signStatus.json b/pages/signStatus/signStatus.json new file mode 100644 index 0000000..7360326 --- /dev/null +++ b/pages/signStatus/signStatus.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "enablePullDownRefresh": true +} \ No newline at end of file diff --git a/pages/signStatus/signStatus.wxml b/pages/signStatus/signStatus.wxml new file mode 100644 index 0000000..4c1f7ca --- /dev/null +++ b/pages/signStatus/signStatus.wxml @@ -0,0 +1,44 @@ + + + 报名情况 + + + + + + + + + + + 报名时间：{{item.gmtCreate}} + + + {{item.applyWorkTypeName}} + + + 培训机构: + {{item.applyInstitutionName}} + + + 负责人: + {{item.orgCharge}} + + + 预计开班人数: + {{ item.applyUserNum1 }}人 + + + 已报名人数： + {{ item.applyUserNum2 }}人 + + + 已通过审核人数： + {{ item.applyUserNum3 }}人 + + + 报名详情 + 取消报名 + + + \ No newline at end of file diff --git a/pages/signStatus/signStatus.wxss b/pages/signStatus/signStatus.wxss new file mode 100644 index 0000000..c62c3ad --- /dev/null +++ b/pages/signStatus/signStatus.wxss @@ -0,0 +1,77 @@ +.status{ + padding: 30rpx; +} +.sign-box{ + padding: 30rpx; + background-color: #fff; + border-radius: 10rpx; + margin-bottom: 30rpx; + box-shadow: 0 0 20rpx #ccc; + padding-top: 0; +} +.name{ + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.row{ + font-size: 30rpx; + margin-top: 15rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.btn{ + display: inline-block; + width: 150rpx; + height: 60rpx; + line-height: 60rpx; + border-radius: 6px; + margin-right: 10rpx; + color: #fff; + text-align: center; +} +.status-row{ + display: flex; + justify-content: space-between; +} +.status-row image{ + width: 120rpx; +} +.status-row text{ + line-height: 100rpx; + color: #999; + font-size: 30rpx; +} +.wait .status-text{ + color: #0CA7A8; +} +.wait .btn{ + background: #0CA7A8; +} +.draw .status-text{ + color: #1EB5FA; +} +.draw .btn{ + background: #1EB5FA; +} +.complete .status-text{ + color: #FF9D5C; +} +.complete .btn{ + background: #FF9D5C; +} +.pass .status-text{ + color: #5C86EF; +} +.pass .btn{ + background: #5C86EF; +} +.not-pass .status-text{ + color: #FD678D; +} +.not-pass .btn{ + background: #FD678D; +} \ No newline at end of file diff --git a/project.config.json b/project.config.json index c09c6a3..f2552d6 100644 --- a/project.config.json +++ b/project.config.json @@ -1,75 +1,77 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] + "description": "项目配置文件", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": false, + "es6": true, + "enhance": false, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": false, + "coverView": true, + "nodeModules": false, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "lazyloadPlaceholderEnable": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" }, - "setting": { - "urlCheck": true, - "es6": true, - "enhance": false, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": false, - "coverView": true, - "nodeModules": false, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "uglifyFileName": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": false, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "enableEngineNative": false, - "bundle": false, - "useIsolateContext": true, - "useCompilerModule": true, - "userConfirmedUseCompilerModuleSwitch": false, - "userConfirmedBundleSwitch": false, - "packNpmManually": false, - "packNpmRelationList": [], - "minifyWXSS": true + "enableEngineNative": false, + "useIsolateContext": true, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true, + "disableUseStrict": false, + "minifyWXML": true, + "showES6CompileOption": false, + "useCompilerPlugins": false + }, + "compileType": "miniprogram", + "libVersion": "2.16.1", + "appid": "wx9f627e69ba43e6a2", + "projectname": "teachingsystem", + "debugOptions": { + "hidedInDevtools": [] + }, + "scripts": {}, + "staticServerOptions": { + "baseURL": "", + "servePath": "" + }, + "isGameTourist": false, + "condition": { + "search": { + "list": [] }, - "compileType": "miniprogram", - "libVersion": "2.16.1", - "appid": "wx501e9ce64f25c418", - "projectname": "teachingsystem", - "debugOptions": { - "hidedInDevtools": [] + "conversation": { + "list": [] }, - "scripts": {}, - "staticServerOptions": { - "baseURL": "", - "servePath": "" + "game": { + "list": [] }, - "isGameTourist": false, - "condition": { - "search": { - "list": [] - }, - "conversation": { - "list": [] - }, - "game": { - "list": [] - }, - "plugin": { - "list": [] - }, - "gamePlugin": { - "list": [] - }, - "miniprogram": { - "list": [] - } + "plugin": { + "list": [] + }, + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [] } + } } \ No newline at end of file diff --git a/utils/api.js b/utils/api.js index 5215de8..7228487 100644 --- a/utils/api.js +++ b/utils/api.js @@ -1,13 +1,19 @@ var baseUrls = { - userCenter: 'https://192.168.0.103:7001/usercenter/', - cardUrl: 'http://192.168.0.111:8089/signup/', - loginUrl: 'http://192.168.0.111:8088/businesscard/', - tradeUrl: 'http://192.168.0.111:8088/businesscard/', - baseImgUrl: 'route/file/download/true/' + userCenter: 'https://www.yjkaoshi.cn/signup/', + cardUrl: 'https://www.yjkaoshi.cn/signup/', + loginUrl: 'https://www.yjkaoshi.cn/signup/', + tradeUrl: 'https://www.yjkaoshi.cn/signup/', + testUrl: 'https://www.yjkaoshi.cn/signup/', + //userCenter: 'http://192.168.0.109:8070/signup/', + //cardUrl: 'http://192.168.0.109:8070/signup/', + //loginUrl: 'http://192.168.0.109:8070/signup/', + //tradeUrl: 'http://192.168.0.109:8070/signup/', + //testUrl: 'http://192.168.0.109:8070/signup/', + baseImgUrl: 'route/file/download/true/', } var apis = { - login: '', + login: '{baseUrl}wechat-miniapp/sign/default', doUploadImg: '{baseUrl}app/file/uploadimage', //上传图片 doUploadVideo: '{baseUrl}app/file/uploadvideo', //上传视频 getArticleList: '{baseUrl}app/contentrelease/listpage', //获取开班通告或报考问答 根据categoryId获取 @@ -16,6 +22,21 @@ var apis = { getInstitutionDetailById: '{baseUrl}app/traininginstitution/get/release/{applyId}', //培训机构详情 getCardList: '{baseUrl}app/basic-staff-info/list-my-exam', //获取我的考试列表 getScoreList: '{baseUrl}app/applystudents/list', //获取成绩列表 + getTrainTypeList: '{baseUrl}app/worktype/listByParentId', //获取培训科目类型 + getOrgList: '{baseUrl}app/apply/list-apply-work-type', //获取培训机构列表 + getCultrue: '{baseUrl}app/data/listbyparentid/d6b9f026-6ea9-456a-b48b-0c18d502523b', // 获取学历列表 + gerPersonInfo: '{baseUrl}app/basic-user-info/get-basic-user-info', // 获取个人信息 + savePersonInfo: '{baseUrl}app/basic-user-info/save', // 保存个人信息 + signOrg: '{baseUrl}app/apply/save', // 提交报名 + getPageType: '{baseUrl}app/basic-user-info/get-worker-used-html', // 获取报名页面类型 + getMyApply: '{baseUrl}app/apply/listPageMyApply', // 获取我的报名 + cancelSign: '{baseUrl}app/apply/updateAuditStateRecall/{applyId}', // 取消报名 + signRecord: '{baseUrl}app/apply/get/{applyId}', // 查看报名记录 + checkPhone: '{baseUrl}app/basic-user-info/check-mini-user-bind', // 检查是否绑定手机号 + bindPhone: '{baseUrl}app/basic-user-info/mini-user-bind/{phone}', // 绑定手机号 + examPlace: '{baseUrl}app/basic-user-info/release/list-exam-place', // 考试网点 + checkEditedInfo: '{baseUrl}app/basic-user-info/get-basic-user-info', // 检查是否编辑个人信息 + getAchievement: '{baseUrl}app/basic-user-info/list-my-exam-score?idCardNumber=', // 获取成绩列表 } module.exports = {