From 491caf06a37f5877d3d370187d3c023a532d6297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=BA=9A=E7=94=B7?= Date: Tue, 12 Oct 2021 18:17:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2,=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=9D=A5=E6=AC=BE=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/common.wxss | 8 + assets/images/tx.png | Bin 0 -> 11829 bytes assets/images/warning.png | Bin 0 -> 7010 bytes assets/images/xgmm.png | Bin 0 -> 5563 bytes assets/js/http/api.js | 2 + assets/js/http/userApi.js | 19 +- assets/js/preview.js | 2 +- components/dateMonth/dateMonth.js | 69 ++++++- components/dateMonth/dateMonth.wxml | 4 +- components/dateMonth/dateMonth.wxss | 27 ++- contractDetail/contractDetail.wxml | 26 --- contractDetail/contractDetail.wxss | 34 ---- pages/contractDetail/contractDetail.js | 17 +- pages/contractDetail/contractDetail.wxml | 18 +- pages/contractDetail/contractDetail.wxss | 19 ++ pages/login/login.js | 21 +- pages/login/login.wxml | 3 +- pages/login/login.wxss | 8 +- pages/mine/mine.js | 74 +++---- pages/mine/mine.wxml | 30 +-- pages/mine/mine.wxss | 8 +- pages/mineContract/mineContract.js | 71 +++---- pages/mineContract/mineContract.wxml | 15 +- pages/mineData/mineData.js | 18 +- pages/mineData/mineData.wxml | 9 +- pages/project/project.js | 53 +++-- pages/project/project.json | 3 +- pages/project/project.wxml | 18 +- pages/project/project.wxss | 6 + .../scanSign/scanSign.js | 30 ++- pages/scanSign/scanSign.json | 4 + pages/scanSign/scanSign.wxml | 48 +++++ pages/scanSign/scanSign.wxss | 72 +++++++ pages/setPassword/setPassword.js | 77 ++----- pages/upDateInfo/upDateInfo.js | 192 ++++++++++-------- pages/upDateInfo/upDateInfo.wxml | 16 +- pages/upDateInfo/upDateInfo.wxss | 5 +- pages/writtenSign/writtenSign.js | 86 ++++++++ .../writtenSign/writtenSign.json | 2 +- pages/writtenSign/writtenSign.wxml | 16 ++ pages/writtenSign/writtenSign.wxss | 38 ++++ 41 files changed, 756 insertions(+), 412 deletions(-) create mode 100644 assets/images/tx.png create mode 100644 assets/images/warning.png create mode 100644 assets/images/xgmm.png delete mode 100644 contractDetail/contractDetail.wxml delete mode 100644 contractDetail/contractDetail.wxss rename contractDetail/contractDetail.js => pages/scanSign/scanSign.js (58%) create mode 100644 pages/scanSign/scanSign.json create mode 100644 pages/scanSign/scanSign.wxml create mode 100644 pages/scanSign/scanSign.wxss create mode 100644 pages/writtenSign/writtenSign.js rename contractDetail/contractDetail.json => pages/writtenSign/writtenSign.json (92%) create mode 100644 pages/writtenSign/writtenSign.wxml create mode 100644 pages/writtenSign/writtenSign.wxss diff --git a/assets/css/common.wxss b/assets/css/common.wxss index dd1b5c9..2718991 100644 --- a/assets/css/common.wxss +++ b/assets/css/common.wxss @@ -838,4 +838,12 @@ color: #2A2A2A; } .form-item .count{ background-color: #aaa; +} +.no-data{ + width: 100%; + height:200px; + display: flex; + justify-content: center; + align-items: center; + color: #999; } \ No newline at end of file diff --git a/assets/images/tx.png b/assets/images/tx.png new file mode 100644 index 0000000000000000000000000000000000000000..b5faf966a2a47b8c9f180993d9d14e6b7c031e8a GIT binary patch literal 11829 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

Uj#t%pM!9Q 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 hv%Bf>j*nh2by4XqnE^p@xNP#(3bSmkC!Wr+*MX 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 literal 0 HcmV?d00001 diff --git a/assets/js/http/api.js b/assets/js/http/api.js index b6aed76..3b2d071 100644 --- a/assets/js/http/api.js +++ b/assets/js/http/api.js @@ -3,6 +3,7 @@ import http from './http.js' // let baseUrl = 'https://share.hzwlsoft.com' // let baseUrl = 'http://localhost:8080' let baseUrl = 'http://10.0.1.9:8080' +let URL_CONFIG = '/jero-boot/' // let baseUrl = 'http://192.168.1.110:8080' /* 配置路径 */ @@ -14,6 +15,7 @@ let apiUrl = { export default { baseUrl, + URL_CONFIG, //微信账号密码登陆--1 wxLoginByUserName(option, success, error) { http.post1(baseUrl + apiUrl.wxLoginByUserName, option).then(res => { diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js index 4000b50..5bac7a7 100644 --- a/assets/js/http/userApi.js +++ b/assets/js/http/userApi.js @@ -21,27 +21,30 @@ const UserApi = { // 短信登录 codeLogin: (params) => http.post(`${URL_CONFIG}company/smsLogin`, params), // 设置密码 - setPassword: (params) => http.post(`${URL_CONFIG}company/changePassword`, params), + setPassword: (params) => http.post(`${URL_CONFIG}company/changePasswordWithToken`, params), + // 修改密码 + updatePassword: (params) => http.post(`${URL_CONFIG}company/changePassword`, params), + // 扫码签到 + scanCode: (params) => http.post(`${URL_CONFIG}company/changePassword`, params), // 退出 logout: (params) => http.post(`${URL_CONFIG}sys/logout`, params), - // 短信验证码修改密码 - updatePassword: (params) => http.post(`${URL_CONFIG}company/verificationChangePassword`, params), // 个人信息 mineInfo: (params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryByIdMeeting`, params), // 编辑个人信息提交 editMineInfo: (params) => http.post(`${URL_CONFIG}company/payContactsManagement/companyEdit`, params), // 我的资料 dataList: (params) => http.get(`${URL_CONFIG}project/payWorkingGroupDistributionRecord/listForFile`, params), - + // 我的合同 + contractList: (params) => http.get(`${URL_CONFIG}contract/payIncomeContract/queryCompanyPageList`, params), + // 合同详情 + contractDetail: (params) => http.get(`${URL_CONFIG}contract/payIncomeContract/queryCompanyById`, params), + // 预览文件 + previewFile: (params) => http.get(`${URL_CONFIG}sys/common/download/${params.fileId}`), // 首页接口 // 来款项目分页 projectList: (params) => http.get(`${URL_CONFIG}project/payCommonProject/queryCompanyPageList`, params), // 来款项目详情 projectDetail: (params) => http.get(`${URL_CONFIG}project/payCommonProject/queryCompanyById`, params), - // 会议活动分页 - meetingList: (params) => http.get(`${URL_CONFIG}meeting/payMeeting/pageContract`, params), - // 会议活动详情 - meetingDetail: (params) => http.get(`${URL_CONFIG}meeting/payMeeting/queryById`, params), } export default UserApi diff --git a/assets/js/preview.js b/assets/js/preview.js index b87f942..41852d5 100644 --- a/assets/js/preview.js +++ b/assets/js/preview.js @@ -44,7 +44,7 @@ export function previewFile(fileId,fileName) { } // 截取文件类型的方法 - function sliceFileTypeByFileName(fileName){ + export function sliceFileTypeByFileName(fileName){ // 获取 . 的索引 let index = fileName.lastIndexOf('.') // 截取文件类型 diff --git a/components/dateMonth/dateMonth.js b/components/dateMonth/dateMonth.js index 3e78082..6895949 100644 --- a/components/dateMonth/dateMonth.js +++ b/components/dateMonth/dateMonth.js @@ -10,7 +10,31 @@ for (let i = 1; i <= 12; i++) { months.push(i) } -Page({ +Component({ + /** + * 组件的属性列表 + */ + properties: { + // 是否弹出显示 + visible: { + type: Boolean, + value: false + }, + //点击外部的遮罩层是否允许关闭 + outClickCanClose: { + type: Boolean, + value: false + }, + // 模式，年或者月，默认只有年 + mode: { + type: String, + value: 'year' + } + }, + + /** + * 组件的初始数据 + */ data: { years: years, year: date.getFullYear(), @@ -18,12 +42,39 @@ Page({ month: 2, value: [9999, 1, 1], }, - bindChange: function (e) { - const val = e.detail.value - this.setData({ - year: this.data.years[val[0]], - month: this.data.months[val[1]], - }) - console.log(this.data) + + /** + * 组件的方法列表 + */ + methods: { + closePopup() { + this.triggerEvent("close", { + visible: this.data.visible + }) + }, + outClick(){ + if (this.data.outClickCanClose){ + this.triggerEvent("close", { + visible: this.data.visible + }) + } + }, + // 日期改变 + bindChange: function (e) { + const val = e.detail.value + this.setData({ + year: this.data.years[val[0]], + month: this.data.months[val[1]], + }) + }, + ok(e){ + let value = '' + if(this.properties.mode === 'month'){ + value = this.data.year + '-' + this.data.month + }else { + value = this.data.year + } + this.triggerEvent("ok", value) + } } -}) \ No newline at end of file +}) diff --git a/components/dateMonth/dateMonth.wxml b/components/dateMonth/dateMonth.wxml index 9641485..b5c9d4f 100644 --- a/components/dateMonth/dateMonth.wxml +++ b/components/dateMonth/dateMonth.wxml @@ -1,12 +1,12 @@ {{year}}年{{month}}月 - {{item}}年 - + {{item}}月 diff --git a/components/dateMonth/dateMonth.wxss b/components/dateMonth/dateMonth.wxss index 8688561..f8a35a3 100644 --- a/components/dateMonth/dateMonth.wxss +++ b/components/dateMonth/dateMonth.wxss @@ -1,5 +1,30 @@ .box{ - height: 300px; + width: 85%; + height: 360px; + background-color: #fff; +} +.i-modal-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.7); + z-index: 1000; + transition: all 0.2s ease-in-out; + opacity: 0; + visibility: hidden; + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} + +.i-modal-mask-show { + opacity: 1; + visibility: visible; } .title{ width: 100%; diff --git a/contractDetail/contractDetail.wxml b/contractDetail/contractDetail.wxml deleted file mode 100644 index 46c9876..0000000 --- a/contractDetail/contractDetail.wxml +++ /dev/null @@ -1,26 +0,0 @@ - - 基本信息 - - - 合同编号 - arff4ds8a3s6651 - - - 合同名称 - 找找 - - - 负责人 - 张三 - - - 合同金额 - 500元 - - - 邮寄信息 - - diff --git a/contractDetail/contractDetail.wxss b/contractDetail/contractDetail.wxss deleted file mode 100644 index fcab94c..0000000 --- a/contractDetail/contractDetail.wxss +++ /dev/null @@ -1,34 +0,0 @@ -page{ - box-sizing: border-box; -} -.title{ - height: 40px; - padding-left: 10px; - line-height: 40px; - color: #999; - font-size: 14px; - background-color: #f5f5f5; -} -.basic-info view{ - padding: 15px; - height: 40px; - display: flex; - justify-content: space-between; - align-items: center; - color: #333; - font-size: 14px; -} -.email-info text:nth-child(1){ - color: #333; - font-size: 14px; -} -.email-info{ - padding: 15px; -} -.email-info text:nth-child(2){ - color: #069F99; - font-size: 14px; - display: block; - margin-top: 10px; - text-align: center; -} \ No newline at end of file diff --git a/pages/contractDetail/contractDetail.js b/pages/contractDetail/contractDetail.js index 3349a12..a5f0984 100644 --- a/pages/contractDetail/contractDetail.js +++ b/pages/contractDetail/contractDetail.js @@ -1,10 +1,14 @@ -// pages/meeting/meeting.js +import UserApi from '../../assets/js/http/userApi' Page({ /** * 页面的初始数据 */ data: { + form: {} + }, + // 查看物流 + track(){ }, @@ -12,7 +16,16 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + console.log(options) + let id = options.id // 合同id + UserApi.contractDetail({id}).then(res=>{ + console.log(res) + if(res.success){ + this.setData({ + form: res.result + }) + } + }) }, /** diff --git a/pages/contractDetail/contractDetail.wxml b/pages/contractDetail/contractDetail.wxml index 46c9876..df3044c 100644 --- a/pages/contractDetail/contractDetail.wxml +++ b/pages/contractDetail/contractDetail.wxml @@ -3,24 +3,30 @@ 合同编号 - arff4ds8a3s6651 + {{form.contractNum}} 合同名称 - 找找 + {{form.contractName}} 负责人 - 张三 + {{form.principalName}} 合同金额 - 500元 + {{form.contractAmount ? form.contractAmount + '元' : 0}} + + + 关联项目 + + {{item.chargeUse_dictText}} + 邮寄信息 diff --git a/pages/contractDetail/contractDetail.wxss b/pages/contractDetail/contractDetail.wxss index fcab94c..a7cdbe5 100644 --- a/pages/contractDetail/contractDetail.wxss +++ b/pages/contractDetail/contractDetail.wxss @@ -10,6 +10,7 @@ page{ background-color: #f5f5f5; } .basic-info view{ + background-color: #FFF; padding: 15px; height: 40px; display: flex; @@ -17,6 +18,11 @@ page{ align-items: center; color: #333; font-size: 14px; + border-bottom: 0.5px solid #f5f5f5; + position: relative; +} +.basic-info view:last-child{ + border-bottom: 0; } .email-info text:nth-child(1){ color: #333; @@ -31,4 +37,17 @@ page{ display: block; margin-top: 10px; text-align: center; +} +.ass-project{ + height: auto !important; + padding: 0 !important; + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: flex-end; +} +.ass-project text{ + color: #069F99; + display: block; + line-height: 25px; } \ No newline at end of file diff --git a/pages/login/login.js b/pages/login/login.js index 5deea2f..9fc4e34 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -18,6 +18,7 @@ Page({ }, // 获取验证码 getVerCode() { + countdown = 60 if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(this.data.phone)) { UserApi.sendCode({ phone: this.data.phone @@ -27,8 +28,8 @@ Page({ this.countDown() } else { wx.showToast({ - title: '获取验证码失败', - icon: 'error', + title: res.message, + icon: 'none', duration: 2000 }) } @@ -74,9 +75,9 @@ Page({ // 请求短信登录start UserApi.codeLogin(params).then(res => { if (res.success) { - // 存token和userInfo + // 存临时token和userInfo wx.setStorage({ - key: 'X-Access-Token', + key: 'token-temp', data: res.result.token }) wx.setStorage({ @@ -89,15 +90,19 @@ Page({ url: '../setPassword/setPassword', }) }else{ - // 跳转设置密码页 + // 存token和userInfo + wx.setStorage({ + key: 'X-Access-Token', + data: res.result.token + }) + // 跳转首页 wx.switchTab({ url: '../home/home', }) } - } else { wx.showToast({ - title: '登录失败', + title: res.message, icon: 'error', duration: 2000 }) @@ -157,4 +162,4 @@ Page({ onReachBottom: function () { } -}) \ No newline at end of file +}) diff --git a/pages/login/login.wxml b/pages/login/login.wxml index 58c08e9..ae55b63 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -17,5 +17,6 @@ + - \ No newline at end of file + diff --git a/pages/login/login.wxss b/pages/login/login.wxss index 2779408..e6de0c6 100644 --- a/pages/login/login.wxss +++ b/pages/login/login.wxss @@ -5,4 +5,10 @@ page { } .form-box{ transform: translateY(100%); -} \ No newline at end of file +} +/* .forget{ + color: #999; + font-size: 14px; + text-align: right; + margin-top: 20px; +} */ diff --git a/pages/mine/mine.js b/pages/mine/mine.js index 4d6dae2..7f32d6d 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -6,7 +6,9 @@ Page({ * 页面的初始数据 */ data: { - userId: '' + userId: '', + name: '昵称', + phone: '' }, // 个人信息 mineInfo(){ @@ -25,10 +27,19 @@ Page({ wx.scanCode({ onlyFromCamera: false, scanType: [], - success: (result) => {}, - fail: (res) => {}, - complete: (res) => {}, + success: (result) => { + console.log(result) + }, + fail: (res) => { + console.log(result) + }, + complete: (res) => { + console.log(result) + }, }) + // wx.navigateTo({ + // url: '../scanSign/scanSign', + // }) }, // 我的资料 mineData(){ @@ -56,6 +67,11 @@ Page({ wx.redirectTo({ url: '../login/login', }) + }else{ + wx.clearStorage() + wx.redirectTo({ + url: '../login/login', + }) } }) } else if (res.cancel) {} @@ -66,14 +82,11 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - + let userInfo = wx.getStorageSync('userInfo') + this.setData({ + name: userInfo.name, + phone: userInfo.phone.substr(0, 3) + '-' + userInfo.phone.substr(3, 4) + '-' + userInfo.phone.substr(7, 4) + }) }, /** @@ -81,40 +94,5 @@ Page({ */ onShow: function () { - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - } -}) \ No newline at end of file +}) diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 5331f1b..2cece1b 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -1,25 +1,14 @@ - + - + - 昵称 - 185-2207-4910 - - - - - - 412 - 我的项目 - - - 2 - 我的会议 + {{name}} + {{phone}} @@ -36,7 +25,7 @@ - + 修改密码 @@ -62,16 +51,9 @@ - - - - 设置 - - - 退出登录 - \ No newline at end of file + diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index fdd5237..f482013 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -6,7 +6,7 @@ page{ height: 200pt; } .select-box{ - transform: translateY(-100pt); + transform: translateY(-75pt); padding: 0 15pt; } .select-box .avator{ @@ -48,7 +48,7 @@ page{ width: 35px; height: 35px; } -.select-box .select{ +.select-box .select{ height: 90pt; background-color: #fff; border-radius: 10px; @@ -76,7 +76,7 @@ page{ } /* 个人信息选项栏 */ .list-info{ - margin-top: -100pt; + margin-top: -65pt; padding: 15pt; } .list-info .title{ @@ -122,4 +122,4 @@ page{ border-radius: 5px; font-size: 13px; color: #069F99; -} \ No newline at end of file +} diff --git a/pages/mineContract/mineContract.js b/pages/mineContract/mineContract.js index 1134c57..ac7ce5b 100644 --- a/pages/mineContract/mineContract.js +++ b/pages/mineContract/mineContract.js @@ -1,71 +1,48 @@ -// pages/minedata/minedata.js +import UserApi from '../../assets/js/http/userApi' Page({ /** * 页面的初始数据 */ data: { - list: [,1,1,1,1,1,1,1,1] + list: [], + pageNo: 1, + pageSize: 10 }, // 合同详情 - contractDetail(){ + contractDetail(e){ + let id = e.currentTarget.dataset.meeting.id wx.navigateTo({ - url: '../contractDetail/contractDetail', + url: `../contractDetail/contractDetail?id=${id}`, }) }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - + loadData(){ + let params = { + pageNo: this.data.pageNo, + pageSize: this.data.pageSize + } + UserApi.contractList(params).then(res=>{ + if(res.success && res.result.records && res.result.records.length){ + console.log(res.result.records) + this.setData({ + list: [...this.data.list, ...res.result.records] + }) + } + }) }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - + /** * 生命周期函数--监听页面显示 */ onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - + this.loadData() }, /** * 页面上拉触底事件的处理函数 */ onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - + this.data.pageNo++ + this.loadData() } }) \ No newline at end of file diff --git a/pages/mineContract/mineContract.wxml b/pages/mineContract/mineContract.wxml index 2f3b461..f77dc0c 100644 --- a/pages/mineContract/mineContract.wxml +++ b/pages/mineContract/mineContract.wxml @@ -1,13 +1,16 @@ - - + + - 合同名称 - 合同金额：5000元 + {{item.contractName}} + 合同金额：{{item.contractAmount ? item.contractAmount + '元' : '0'}} - 合同编号：002 - 负责人：张三 + 合同编号：{{item.contractNum}} + 负责人：{{item.principalName}} + + 暂无数据 + diff --git a/pages/mineData/mineData.js b/pages/mineData/mineData.js index 7bbc726..a8217c1 100644 --- a/pages/mineData/mineData.js +++ b/pages/mineData/mineData.js @@ -1,4 +1,5 @@ import UserApi from '../../assets/js/http/userApi' +import { previewFile, sliceFileTypeByFileName } from '../../assets/js/preview' Page({ /** @@ -16,14 +17,25 @@ Page({ pageSize: this.data.pageSize } UserApi.dataList(params).then(res=>{ - if(res.success){ + if(res.success && res.result.records && res.result.records.length){ console.log(res.result.records) this.setData({ - list: res.result.records + list: [...this.data.list, ...res.result.records] }) } }) }, + // 预览 + previewFile(e) { + const fileObj = e.currentTarget.dataset.file + let fileType = sliceFileTypeByFileName(fileObj.fileName) + // 文件类型不是docx，doc，pdf时，已邮件形式发送到参会人的邮箱 + if(fileType !== 'docx' && fileType !== 'doc' && fileType !== 'pdf') { + + }else { + previewFile(fileObj.filId, fileObj.fileName) + } + }, /** * 生命周期函数--监听页面显示 */ @@ -38,4 +50,4 @@ Page({ this.data.pageNo++ this.loadData() } -}) \ No newline at end of file +}) diff --git a/pages/mineData/mineData.wxml b/pages/mineData/mineData.wxml index 86dbad9..fd6510f 100644 --- a/pages/mineData/mineData.wxml +++ b/pages/mineData/mineData.wxml @@ -1,8 +1,11 @@ - - + + {{item.uploadTime}} - {{item.fileName}} + {{item.fileName}} + + 暂无数据 + diff --git a/pages/project/project.js b/pages/project/project.js index 8eba712..e3ec9b3 100644 --- a/pages/project/project.js +++ b/pages/project/project.js @@ -6,12 +6,14 @@ Page({ */ data: { visible: false, + visibleDate: false, index: 0, + list: [], // 项目列表 searchParams: { pageNo: 1, pageSize: 10, - needInvoice: 0, // 是否需要发票 0 4 - pack: 0, // 是否打包 0 1 + needInvoice: '', // 是否需要发票 0 4 + pack: '', // 是否打包 0 1 year: '', // 运行年份 }, selects: [ // 自定义选择框参数 @@ -45,6 +47,9 @@ Page({ changeTab(e){ this.data.index = e.currentTarget.dataset.index if(this.data.index === 0){ + this.setData({ + visible: true + }) this.setData({ data: [ { @@ -57,6 +62,9 @@ Page({ ] }) }else if(this.data.index === 1){ + this.setData({ + visible: true + }) this.setData({ data: [ { @@ -68,18 +76,29 @@ Page({ } ] }) + }else{ + this.setData({ + visibleDate: true + }) } - this.setData({ - visible: true - }) }, - // 关闭弹出层 + // 关闭发票和打包的弹出层 close() { this.setData({ visible: false }) }, + // 日期选中 + dateOk(value){ + this.data.pageNo = 1 + this.setData({ + "searchParams.year": value.detail, + visibleDate: false + }) + this.loadData() + }, ok(e){ + this.data.pageNo = 1 if(this.data.index === 0){ this.setData({ 'searchParams.needInvoice': e.detail @@ -89,8 +108,7 @@ Page({ 'searchParams.pack': e.detail }) } - // this.loadData() - console.log(this.data.searchParams) + this.loadData() }, // 项目详情 projectDetail(){ @@ -100,8 +118,19 @@ Page({ }, loadData(){ UserApi.projectList(this.data.searchParams).then(res=>{ - console.log(res) - + if(res.success){ + // 搜索时，把原数据清空，重新筛选 + if(this.data.pageNo === 1) { + this.setData({ + list: [] + }) + } + if(res.result.records && res.result.records.length){ + this.setData({ + list: [...this.data.list, ...res.result.records] + }) + } + } }).catch(err=>{ wx.showToast({ title: '加载失败', @@ -114,13 +143,13 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - // this.loadData() + this.loadData() }, /** * 页面上拉触底事件的处理函数 */ onReachBottom: function () { this.data.pageNo++ - // this.loadData() + this.loadData() }, }) \ No newline at end of file diff --git a/pages/project/project.json b/pages/project/project.json index bac8bb4..08ac634 100644 --- a/pages/project/project.json +++ b/pages/project/project.json @@ -1,6 +1,7 @@ { "navigationBarTitleText": "项目", "usingComponents": { - "popup": "../../components/popup/popup" + "popup": "../../components/popup/popup", + "dateMonth": "../../components/dateMonth/dateMonth" } } \ No newline at end of file diff --git a/pages/project/project.wxml b/pages/project/project.wxml index 3560161..4f55e6e 100644 --- a/pages/project/project.wxml +++ b/pages/project/project.wxml @@ -7,17 +7,21 @@ - + - 项目名称文字占位符项目名称文字占位符项目名称文字占位符 - 2021-12-12 + {{item.chargeUse_dictText}} + {{item.year}}年 - 需要发票 - 到账 - 开票 - 邮寄 + {{item.needInvoice === 0 ? '不需要发票' : '需要发票'}} + 到账 + 开票 + 邮寄 + + 暂无数据 + + diff --git a/pages/project/project.wxss b/pages/project/project.wxss index c249d29..809b31c 100644 --- a/pages/project/project.wxss +++ b/pages/project/project.wxss @@ -71,3 +71,9 @@ page { justify-content: space-between; align-items: center; } +.half{ + color: burlywood; +} +.all{ + color: #069F99; +} diff --git a/contractDetail/contractDetail.js b/pages/scanSign/scanSign.js similarity index 58% rename from contractDetail/contractDetail.js rename to pages/scanSign/scanSign.js index 3349a12..6a9270f 100644 --- a/contractDetail/contractDetail.js +++ b/pages/scanSign/scanSign.js @@ -1,13 +1,31 @@ -// pages/meeting/meeting.js +import UserApi from '../../assets/js/http/userApi' Page({ /** * 页面的初始数据 */ data: { - + isSigned: false, // 默认未报名 + meetingId: '', // 会议id + fileId: '', // 图片id + src: null // 签名之后，保存签名的图片地址 }, + // 去签到页 + scanSign(){ + wx.navigateTo({ + url: '../writtenSign/writtenSign', + }) + }, + // 确定签到 + sureSign(){ + }, + // 去报名 + goSignUp(){ + wx.navigateTo({ + url: 'url', + }) + }, /** * 生命周期函数--监听页面加载 */ @@ -26,7 +44,13 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { + let params = { + fileId: this.data.fileId, + meetingId: this.data.meetingId + } + // UserApi.scanCode(params).then(res=>{ + // }) }, /** @@ -63,4 +87,4 @@ Page({ onShareAppMessage: function () { } -}) \ No newline at end of file +}) diff --git a/pages/scanSign/scanSign.json b/pages/scanSign/scanSign.json new file mode 100644 index 0000000..75a11b2 --- /dev/null +++ b/pages/scanSign/scanSign.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "扫码签到", + "usingComponents": {} +} diff --git a/pages/scanSign/scanSign.wxml b/pages/scanSign/scanSign.wxml new file mode 100644 index 0000000..66122fc --- /dev/null +++ b/pages/scanSign/scanSign.wxml @@ -0,0 +1,48 @@ + + + 会议名称 + 会议名称会议名称 + + + 会议类型 + arff4ds8a3s6651 + + + 召开时间 + 找找 + + + + 参会单位 + 张三张三张三张三张三张三张三张三张三张三张三张三张三 + + + 参会人 + 500元 + + + 是否签到 + 500元 + + + 手动签到 + 签到 + + + + + 签到 + + + +、 + + + + 很抱歉，未查询到您的报名信息 + + + 去报名 + diff --git a/pages/scanSign/scanSign.wxss b/pages/scanSign/scanSign.wxss new file mode 100644 index 0000000..29462f6 --- /dev/null +++ b/pages/scanSign/scanSign.wxss @@ -0,0 +1,72 @@ +.basic-info .title{ + height: 40px; +} +.basic-info .title text{ + display: block; + border-left: 3px solid #069F99; + height: 14px; + padding-left: 10px; + border-radius: 2px; + display: flex; + justify-content: center; + align-items: center; + color: #333; + font-size: 15px; + font-weight: 500; +} +.basic-info view text:nth-child(1){ + flex-shrink: 0; + margin-right: 10px; +} +.basic-info view{ + background-color: #FFF; + padding: 15px; + height: 40px; + display: flex; + justify-content: space-between; + align-items: center; + color: #333; + font-size: 14px; + border-bottom: 0.5px solid #f5f5f5; + position: relative; +} +.basic-info view:last-child{ + border-bottom: 0; +} +.scanSign{ + padding: 0 15px; + margin: 10px 0; +} +.scanSign text{ + display: flex; + justify-content: center; + align-items: center; + height: 45px; + background-color: #069F99; + border-radius: 5px; + font-size: 13px; + color: #fff; +} +.imageBox { + border: 1px solid #dedede; + margin: 10px; + height: 160px +} +.imageBox image { + width: 100%; + height: 160px +} +.warning-text{ + margin-bottom: 10px; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + color: #999; + font-size: 12px; +} +.warning-text image{ + width: 100px; + height: 100px; + margin-bottom: 15px; +} diff --git a/pages/setPassword/setPassword.js b/pages/setPassword/setPassword.js index 075aab2..e9a56c2 100644 --- a/pages/setPassword/setPassword.js +++ b/pages/setPassword/setPassword.js @@ -6,16 +6,18 @@ Page({ * 页面的初始数据 */ data: { - newPassword: '', - verifyPassword: '', + password: '', // token + newPassword: '', // 密码 + verifyPassword: '', // 确认密码 rsaPublicKey: '', flag: false }, bindBlurInput(e){ - + }, // 登录 formSubmit(e) { + const that = this if(!e.detail.value.newPassword){ this.data.flag = false wx.showToast({ @@ -68,6 +70,7 @@ Page({ } if (this.data.flag) { let params = { + password: this.data.password, newPassword: encrypt(this.data.rsaPublicKey, e.detail.value.newPassword), verifyPassword: encrypt(this.data.rsaPublicKey, e.detail.value.verifyPassword), rsaPublicKey: this.data.rsaPublicKey @@ -76,7 +79,11 @@ Page({ UserApi.setPassword(params).then(res => { if (res.success) { // 成功设置密码，跳转首页 - wx.navigateTo({ + wx.setStorage({ + key: 'X-Access-Token', + data: that.data.password + }) + wx.switchTab({ url: '../home/home', }) } else { @@ -90,19 +97,6 @@ Page({ // 登录失败 } }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, /** * 生命周期函数--监听页面显示 @@ -115,45 +109,16 @@ Page({ that.setData({ rsaPublicKey: res.data }) - }, - fail: function(){ - // 缓存中没有登录过默认app.json的登录页 } }) - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - + wx.getStorage({ + key: 'token-temp', + success (res) { + that.setData({ + password: res.data + }) + console.log(that.data.password) + } + }) } -}) \ No newline at end of file +}) diff --git a/pages/upDateInfo/upDateInfo.js b/pages/upDateInfo/upDateInfo.js index d7e59ac..af7838b 100644 --- a/pages/upDateInfo/upDateInfo.js +++ b/pages/upDateInfo/upDateInfo.js @@ -1,7 +1,7 @@ // pages/meeting/meeting.js import UserApi from '../../assets/js/http/userApi' import { encrypt } from '../../assets/js/jsencrypt/rsa' -var countdown = 60; // 倒计时秒数 +// var countdown = 60; // 倒计时秒数 Page({ @@ -10,79 +10,114 @@ Page({ */ data: { form: { - phone: '', // 手机号 - verifyCode: '', // 验证码 - newPassword: '', // 新密码 - verifyPassword: '', // 确认密码 - count: 60, // 倒计时秒 + oldpassword: '', // 旧密码 + password: '', // 新密码 + confirmpassword: '', // 确认新密码 + // count: 60, // 倒计时秒 rsaPublicKey: '', // 公钥 }, - showGetCaptcha: true - }, - bindInputPhone(e) { - this.setData({ - "form.phone": e.detail.value - }) - }, - // 获取验证码 - getVerCode() { - if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(this.data.form.phone)) { - UserApi.sendCode({ - phone: this.data.form.phone - }).then(res => { - // 获取成功，倒计时 start - if (res.success) { - this.countDown() - } else { - wx.showToast({ - title: '获取验证码失败', - icon: 'error', - duration: 2000 - }) - } - }) - } else { - wx.showToast({ - title: '请输入正确的手机号', - icon: 'none', - duration: 2000 - }) - } + // showGetCaptcha: true }, + + // // 获取验证码 + // getVerCode() { + // if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(this.data.form.phone)) { + // UserApi.sendCode({ + // phone: this.data.form.phone + // }).then(res => { + // // 获取成功，倒计时 start + // if (res.success) { + // this.countDown() + // } else { + // wx.showToast({ + // title: '获取验证码失败', + // icon: 'error', + // duration: 2000 + // }) + // } + // }) + // } else { + // wx.showToast({ + // title: '请输入正确的手机号', + // icon: 'none', + // duration: 2000 + // }) + // } + // }, // 倒计时 - countDown() { - if (countdown === 0) { - this.setData({ - showGetCaptcha: true - }) - countdown = 60; - return; - } else { - this.setData({ - showGetCaptcha: false - }) - countdown--; - this.setData({ - count: countdown - }) - } - setTimeout(() => { - this.countDown() - }, 1000) - // 倒计时 end - }, + // countDown() { + // if (countdown === 0) { + // this.setData({ + // showGetCaptcha: true + // }) + // countdown = 60; + // return; + // } else { + // this.setData({ + // showGetCaptcha: false + // }) + // countdown--; + // this.setData({ + // count: countdown + // }) + // } + // setTimeout(() => { + // this.countDown() + // }, 1000) + // // 倒计时 end + // }, // 提交 formSubmit(e) { - if(!e.detail.value.newPassword){ + if(!e.detail.value.oldpassword){ this.data.flag = false wx.showToast({ - title: '请输入密码', + title: '请输入旧密码', icon: 'none' }) return } else { let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/ - if(!pattern.test(e.detail.value.newPassword)){ + if(!pattern.test(e.detail.value.oldpassword)){ + wx.showToast({ + title: '旧密码由8位数字、大小写字母和特殊符号组成!!', + icon: 'none' + }) + this.data.flag = false + return + } else { + this.data.flag = true + } + } + if(!e.detail.value.password){ + this.data.flag = false + wx.showToast({ + title: '请输入新密码', + icon: 'none' + }) + return + } else { + let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/ + if(!pattern.test(e.detail.value.password)){ + wx.showToast({ + title: '新密码由8位数字、大小写字母和特殊符号组成!!', + icon: 'none' + }) + this.data.flag = false + return + } else { + this.data.flag = true + } + } + if(!e.detail.value.confirmpassword){ + this.data.flag = false + wx.showToast({ + title: '请输入确认新密码', + icon: 'none' + }) + return + } else { + let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/ + if(!pattern.test(e.detail.value.confirmpassword)){ wx.showToast({ title: '密码由8位数字、大小写字母和特殊符号组成!!', icon: 'none' @@ -93,27 +128,7 @@ Page({ this.data.flag = true } } - if(!e.detail.value.verifyPassword){ - this.data.flag = false - wx.showToast({ - title: '请输入确认密码', - icon: 'none' - }) - return - } else { - let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/ - if(!pattern.test(e.detail.value.verifyPassword)){ - wx.showToast({ - title: '密码由8位数字、大小写字母和特殊符号组成!!', - icon: 'none' - }) - this.data.flag = false - return - } else { - this.data.flag = true - } - } - if(e.detail.value.newPassword === e.detail.value.verifyPassword) { + if(e.detail.value.password === e.detail.value.confirmpassword) { this.data.flag = true } else { this.data.flag = false @@ -125,10 +140,9 @@ Page({ } console.log('form发生了submit事件，携带数据为：', e.detail.value) let params = { - phone: encrypt(this.data.rsaPublicKey, e.detail.value.phone), - newPassword: encrypt(this.data.rsaPublicKey, e.detail.value.newPassword), - verifyPassword: encrypt(this.data.rsaPublicKey, e.detail.value.verifyPassword), - verifyCode: e.detail.value.verifyCode, + password: encrypt(this.data.rsaPublicKey, e.detail.value.oldpassword), + newPassword: encrypt(this.data.rsaPublicKey, e.detail.value.password), + verifyPassword: encrypt(this.data.rsaPublicKey, e.detail.value.confirmpassword), rsaPublicKey: this.data.rsaPublicKey, } console.log(params) @@ -150,7 +164,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + }, /** @@ -172,9 +186,9 @@ Page({ rsaPublicKey: res.data }) }, - fail: function(){ + fail: function(){ // 缓存中没有登录过默认app.json的登录页 } }) } -}) \ No newline at end of file +}) diff --git a/pages/upDateInfo/upDateInfo.wxml b/pages/upDateInfo/upDateInfo.wxml index c6039bd..e1a9482 100644 --- a/pages/upDateInfo/upDateInfo.wxml +++ b/pages/upDateInfo/upDateInfo.wxml @@ -2,29 +2,29 @@

- 手机号 + 旧密码 - + - + - 密码 + 新密码 - + - 确认密码 + 确认新密码 - + diff --git a/pages/upDateInfo/upDateInfo.wxss b/pages/upDateInfo/upDateInfo.wxss index 3c2b3ac..f18450f 100644 --- a/pages/upDateInfo/upDateInfo.wxss +++ b/pages/upDateInfo/upDateInfo.wxss @@ -1,4 +1,7 @@ /* pages/meeting/meeting.wxss */ .form-box{ transform: translateY(110pt); -} \ No newline at end of file +} +.text-label { + width: 80px !important; +} diff --git a/pages/writtenSign/writtenSign.js b/pages/writtenSign/writtenSign.js new file mode 100644 index 0000000..bb26f93 --- /dev/null +++ b/pages/writtenSign/writtenSign.js @@ -0,0 +1,86 @@ +import Api from '../../assets/js/http/api' +Page({ + data: { + context1: null, + hasDraw:false, //默认没有画 + id: '', + }, + onLoad: function() { + var context1 = wx.createCanvasContext('handWriting1'); + context1.setStrokeStyle("#000000") // 画笔的颜色 + context1.setLineWidth(3); // 画笔的线条宽度 + this.setData({ + context1: context1, + }) + }, + touchstart1: function(e) { + var context1 = this.data.context1; + context1.moveTo(e.touches[0].x, e.touches[0].y); // 把画笔的开始点移到当前触摸点 + this.setData({ + // context1: context1, + hasDraw : true, //要签字了 + }); + }, + touchmove1: function(e) { + var x = e.touches[0].x; + var y = e.touches[0].y; + var context1 = this.data.context1; + context1.setLineWidth(3); + context1.lineTo(x, y); // 移动绘制的点（关键步骤） + context1.stroke(); // 画出当前路径的边框====创建线条 + context1.setLineCap('round'); // 设置线条的端点样式 + context1.draw(true); // 将之前在绘图上下文中的描述（路径、变形、样式）画到 canvas 中 + context1.moveTo(x, y); // 把路径移动到画布中的指定点，不创建线条 + }, + reSign1: function() { //重新画 + var that = this; + var context1 = that.data.context1; + context1.draw(); //清空画布 + that.setData({ + hasDraw: false, //没有画 + src: null + }); + }, + sign1ok: function () { + const that = this; + if(!that.data.hasDraw){ + console.log("签字是空白的 没有签字") + }else{ + var context1 = that.data.context1; + context1.draw(true, wx.canvasToTempFilePath({ // 把当前画布指定区域的内容导出生成指定大小的图片。在 draw() 回调里调用该方法才能保证图片导出成功 + canvasId: 'handWriting1', + success(res) { // 完成签字 + //得到了图片 上传到服务器 + wx.uploadFile({ + url: Api.baseUrl + Api.URL_CONFIG + "/sys/common/upload", + filePath: res.tempFilePath, + name: "file", + formData: { + filetype: "image", + }, + success: function (result) { + let data = JSON.parse(result.data) + that.setData({ + id: data.result.id + }) + let pages = getCurrentPages(); + let prevPage = pages[pages.length - 2]; + //将数值信息赋值给上一页面id变量 + prevPage.setData({ + fileId: data.result.id + }); + wx.navigateBack({ + delta: 1, + }) + }, + fail: function(err){ + wx.showToast({ + title: '上传失败', + }) + } + }) + } + })) + } + }, +}); diff --git a/contractDetail/contractDetail.json b/pages/writtenSign/writtenSign.json similarity index 92% rename from contractDetail/contractDetail.json rename to pages/writtenSign/writtenSign.json index 8835af0..a97367d 100644 --- a/contractDetail/contractDetail.json +++ b/pages/writtenSign/writtenSign.json @@ -1,3 +1,3 @@ { "usingComponents": {} -} \ No newline at end of file +} diff --git a/pages/writtenSign/writtenSign.wxml b/pages/writtenSign/writtenSign.wxml new file mode 100644 index 0000000..dbda11c --- /dev/null +++ b/pages/writtenSign/writtenSign.wxml @@ -0,0 +1,16 @@ + + + 参会人签字 + + + + + + + + + + + diff --git a/pages/writtenSign/writtenSign.wxss b/pages/writtenSign/writtenSign.wxss new file mode 100644 index 0000000..3b35e67 --- /dev/null +++ b/pages/writtenSign/writtenSign.wxss @@ -0,0 +1,38 @@ +.paper { + border: 1px solid #dedede; + margin: 10px; + height: 160px +} + +.imageBox { + border: 1px solid #dedede; + margin: 10px; + height: 160px +} + +.signBtn { + display: flex; + margin-top: 20px; +} + +.signTitle { + text-align: center; + font-size: 1.2em; + margin: 10px auto; +} + +.handWriting { + width: 100%; + height: 100%; +} + +.imageBox image { + width: 100%; + height: 160px +} +button[type='primary']{ + background-color: #069F99 !important; +} +button[type='warn']{ + color: #999 !important; +}