diff --git a/app.js b/app.js index da5348a..7a99176 100644 --- a/app.js +++ b/app.js @@ -9,18 +9,18 @@ App({ key:"key", data:"登录过，存到了缓存flag,跳转首页" }) - wx.getStorage({ - key: 'key', - success (res) {// 缓存中登录过，直接进小程序 - console.log(res.data) - wx.switchTab({ - url: 'pages/home/home', - }) - }, - fail: function(){ - // 缓存中没有登录过默认app.json的登录页 - } - }) + // wx.getStorage({ + // key: 'key', + // success (res) {// 缓存中登录过，直接进小程序 + // console.log(res.data) + // wx.switchTab({ + // url: '../home/home', + // }) + // }, + // fail: function(){ + // // 缓存中没有登录过默认app.json的登录页 + // } + // }) // 登录 wx.login({ success: res => { diff --git a/app.json b/app.json index 9e4b118..7162c37 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,7 @@ { "pages":[ - "pages/login/login", "pages/home/home", + "pages/login/login", "pages/mine/mine", "pages/index/index", "pages/logs/logs", diff --git a/assets/images/ems.png b/assets/images/ems.png new file mode 100644 index 0000000..9307089 Binary files /dev/null and b/assets/images/ems.png differ diff --git a/assets/images/finished.png b/assets/images/finished.png new file mode 100644 index 0000000..e39cad7 Binary files /dev/null and b/assets/images/finished.png differ diff --git a/assets/images/pdf.png b/assets/images/pdf.png new file mode 100644 index 0000000..368d342 Binary files /dev/null and b/assets/images/pdf.png differ diff --git a/assets/images/sf.png b/assets/images/sf.png new file mode 100644 index 0000000..7c699b3 Binary files /dev/null and b/assets/images/sf.png differ diff --git a/assets/images/uploadImage.png b/assets/images/uploadImage.png new file mode 100644 index 0000000..7aadeb3 Binary files /dev/null and b/assets/images/uploadImage.png differ diff --git a/assets/images/warn.png b/assets/images/warn.png new file mode 100644 index 0000000..85e8fa1 Binary files /dev/null and b/assets/images/warn.png differ diff --git a/assets/js/http/api.js b/assets/js/http/api.js index 9ccea87..b6aed76 100644 --- a/assets/js/http/api.js +++ b/assets/js/http/api.js @@ -2,7 +2,7 @@ import http from './http.js' // let baseUrl = 'https://share.hzwlsoft.com' // let baseUrl = 'http://localhost:8080' -let baseUrl = 'http://192.168.18.133:8080' +let baseUrl = 'http://10.0.1.9:8080' // let baseUrl = 'http://192.168.1.110:8080' /* 配置路径 */ diff --git a/assets/js/http/http.js b/assets/js/http/http.js index 2d76833..39620cf 100644 --- a/assets/js/http/http.js +++ b/assets/js/http/http.js @@ -6,7 +6,7 @@ let headerDefault1 = { 'content-type': 'application/x-www-form-urlencoded' } let TokenKey = 'X-Access-Token' -let baseUrl = 'http://192.168.18.133:8080' +let baseUrl = 'http://10.0.1.9:8080' // let baseUrl = 'http://localhost:8080' const http = (method, url, data, header= headerDefault) => { let Authorization = wx.getStorageSync(TokenKey) ? wx.getStorageSync(TokenKey) : ''; diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js index d5c153e..c5764ca 100644 --- a/assets/js/http/userApi.js +++ b/assets/js/http/userApi.js @@ -26,8 +26,17 @@ const UserApi = { updatePassword: (params) => http.post(`${URL_CONFIG}company/verificationChangePassword`, params), // 个人信息 mineInfo: (params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryByIdMeeting`, params), - // 编辑个人信息提交 + // 编辑个人信息提交 editMineInfo: (params) => http.get(`${URL_CONFIG}company/payContactsManagement/companyEdit`, params), + // 首页接口 + // 来款项目分页 + 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 \ No newline at end of file +export default UserApi diff --git a/contractDetail/contractDetail.js b/contractDetail/contractDetail.js new file mode 100644 index 0000000..3349a12 --- /dev/null +++ b/contractDetail/contractDetail.js @@ -0,0 +1,66 @@ +// pages/meeting/meeting.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/contractDetail/contractDetail.json b/contractDetail/contractDetail.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/contractDetail/contractDetail.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/contractDetail/contractDetail.wxml b/contractDetail/contractDetail.wxml new file mode 100644 index 0000000..46c9876 --- /dev/null +++ b/contractDetail/contractDetail.wxml @@ -0,0 +1,26 @@ + + 基本信息 + + + 合同编号 + arff4ds8a3s6651 + + + 合同名称 + 找找 + + + 负责人 + 张三 + + + 合同金额 + 500元 + + + 邮寄信息 + + 001由李四于2021年12月20日邮寄，快递号：14567 + 查看物流 + + diff --git a/contractDetail/contractDetail.wxss b/contractDetail/contractDetail.wxss new file mode 100644 index 0000000..fcab94c --- /dev/null +++ b/contractDetail/contractDetail.wxss @@ -0,0 +1,34 @@ +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/package.json b/package.json new file mode 100644 index 0000000..46d4e8e --- /dev/null +++ b/package.json @@ -0,0 +1,15 @@ +{ + "name": "miniprogram-custom-component", + "version": "1.0.0", + "description": "", + "main": "app.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "http://10.0.1.9:9090/income_payments/income_payments_applet" + }, + "author": "", + "license": "ISC" +} diff --git a/pages/contractDetail/contractDetail.js b/pages/contractDetail/contractDetail.js new file mode 100644 index 0000000..3349a12 --- /dev/null +++ b/pages/contractDetail/contractDetail.js @@ -0,0 +1,66 @@ +// pages/meeting/meeting.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/contractDetail/contractDetail.json b/pages/contractDetail/contractDetail.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/contractDetail/contractDetail.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/contractDetail/contractDetail.wxml b/pages/contractDetail/contractDetail.wxml new file mode 100644 index 0000000..46c9876 --- /dev/null +++ b/pages/contractDetail/contractDetail.wxml @@ -0,0 +1,26 @@ + + 基本信息 + + + 合同编号 + arff4ds8a3s6651 + + + 合同名称 + 找找 + + + 负责人 + 张三 + + + 合同金额 + 500元 + + + 邮寄信息 + + 001由李四于2021年12月20日邮寄，快递号：14567 + 查看物流 + + diff --git a/pages/contractDetail/contractDetail.wxss b/pages/contractDetail/contractDetail.wxss new file mode 100644 index 0000000..fcab94c --- /dev/null +++ b/pages/contractDetail/contractDetail.wxss @@ -0,0 +1,34 @@ +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/meeting/meeting.js b/pages/meeting/meeting.js index ea1ac9f..e62b8f0 100644 --- a/pages/meeting/meeting.js +++ b/pages/meeting/meeting.js @@ -5,6 +5,13 @@ Page({ * 页面的初始数据 */ data: { + searchParams: { + pageNo: 1, + pageSize: 10, + meetingStatus: 0, // 会议状态 + meetingType: 0, // 标协会议 2 工作组会议 1 国际研讨会 3 其他 4 + month: '', // 运行月份 + }, selects: [ // 自定义选择框参数 { select: '状态', @@ -23,7 +30,13 @@ Page({ } ] }, - + + // 会议详情 + meetingDetail(){ + wx.navigateTo({ + url: '../meetingDetailSigned/meetingDetailSigned', // (已报名) + }) + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/meeting/meeting.json b/pages/meeting/meeting.json index 8835af0..4848ff2 100644 --- a/pages/meeting/meeting.json +++ b/pages/meeting/meeting.json @@ -1,3 +1,4 @@ { + "navigationBarTitleText": "会议", "usingComponents": {} } \ No newline at end of file diff --git a/pages/meeting/meeting.wxml b/pages/meeting/meeting.wxml index d1d3023..a58bdfa 100644 --- a/pages/meeting/meeting.wxml +++ b/pages/meeting/meeting.wxml @@ -1,4 +1,4 @@ - + {{select.select}} @@ -7,7 +7,7 @@ - + 项目名称文字占位符项目名称文字占位符项目名称文字占位符 2021-12-12 diff --git a/pages/meetingDetail/meetingDetail.js b/pages/meetingDetail/meetingDetail.js new file mode 100644 index 0000000..b83c133 --- /dev/null +++ b/pages/meetingDetail/meetingDetail.js @@ -0,0 +1,88 @@ +// pages/meeting/meeting.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + payProveImage: '' + }, + + // 上传缴费凭证 + uploadImage(){ + const that = this + wx.chooseImage({ + count: 1, + sizeType: ['original', 'compressed'], + sourceType: ['album', 'camera'], + success (res) { + // tempFilePath可以作为img标签的src属性显示图片 + that.setData({ + payProveImage: res.tempFilePaths + }) + console.log(that.data.payProveImage) + } + }) + }, + // 删除缴费凭证 + delete(){ + this.setData({ + payProveImage: '' + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/meetingDetail/meetingDetail.json b/pages/meetingDetail/meetingDetail.json new file mode 100644 index 0000000..28c7f23 --- /dev/null +++ b/pages/meetingDetail/meetingDetail.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "会议详情", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/meetingDetail/meetingDetail.wxml b/pages/meetingDetail/meetingDetail.wxml new file mode 100644 index 0000000..28da33a --- /dev/null +++ b/pages/meetingDetail/meetingDetail.wxml @@ -0,0 +1,117 @@ + + + + 会议名称 + 会议名称会议名称 + + + 会议类型 + arff4ds8a3s6651 + + + 负责人 + 找找 + + + 召开时间 + 张三 + + + 召开地点 + 500元 + + + 会议费用 + 500元 + + + 年份 + 500元 + + + 签到时间 + 500元 + + + 会议费用（VIP） + 500元 + + + 会议内容 + 500元 + + + 备注 + 500元 + + + 附件 + + + + 文件名内阁成员函数的工具包 + + 查看 + + + + 会议文件 + + + 单个账号会议文件只可发送五次 + + + + + 文件名内阁成员函数的工具包 + + 查看 + + + + + + 报名信息 + + + 参会人1 + 会议名称会议名称 + + + 参会人2 + 会议名称会议名称 + + + 缴费方式 + 会议名称会议名称 + + + 是否需要发票 + 会议名称会议名称 + + + 邮寄地址 + 会议名称会议名称 + + + 邮编 + 会议名称会议名称 + + + 缴费凭证 + + + + × + + + + + + + + + + diff --git a/pages/meetingDetail/meetingDetail.wxss b/pages/meetingDetail/meetingDetail.wxss new file mode 100644 index 0000000..5ea690f --- /dev/null +++ b/pages/meetingDetail/meetingDetail.wxss @@ -0,0 +1,151 @@ +page{ + box-sizing: border-box; + background-color: #F5F5F5; +} +.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{ + 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; +} +.meeting-name{ + margin-bottom: 10px; +} +.meeting-files{ + margin-top: 10px; + flex-direction: column; + align-items: flex-start !important; + height: auto !important; +} +.basic-info .meeting-files .file-name{ + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + box-sizing: border-box; + padding: 0; + height: 40px; + margin-top: 10px; +} +.file-name view{ + padding: 0; + height: 30px; + line-height: 30px; + border-bottom: 0; +} +.file-name view image{ + width: 30px; + height: 30px; + margin-right: 10px; +} +.basic-info .meeting-files .file-name .look-file{ + color: #069F99; +} +.warning-text{ + position: absolute !important; + top: 5px; + left: 75px; + color: #FF5E60 !important; + font-size: 10px !important; + padding: 0 !important; +} +.warning-text image{ + width: 10px; + height: 10px; +} +.pay-prove-box{ + display: flex !important; + flex-direction: column !important; + justify-content: flex-start !important; + align-items: flex-start !important; + padding: 0; + height: 120px !important; +} +.pay-prove-box .pay-prove-content{ + margin-top: 20px; + display: flex; + justify-content: flex-start; + align-items: center; + padding: 0; + height: 80px; +} +.pay-prove-box .pay-prove-content .pay-prove{ + width: 80px; + height: 80px; + margin-right: 10px; + position: relative !important; + background-color: #D1D1D1; + padding: 0; + border-radius: 5px; + display: flex; + justify-content: center; + align-items: center; +} +.pay-prove-box .pay-prove-content .pay-prove image{ + width: 80px; + height: 80px; +} +.pay-prove-box .pay-prove-content .pay-prove .delete-image{ + width: 12px; + height: 12px; + color: #fff; + background-color: #FF5E60; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + font-size: 7px; + position: absolute; + top: -3px; + right: -3px; +} +.sign-up-empty{ + height: 60px; + width: 100%; + display: block; + margin-top: 10px; +} +.sign-up{ + width: 100%; + padding: 10px 15px; + box-sizing: border-box; + background-color: #fff; + position: fixed; + bottom: 0; +} +.sign-up text{ + background-color: #069F99; + height: 40px; + border-radius: 10px; + color: #fff; + font-size: 16px; + font-weight: 600; + display: block; + text-align: center; + line-height: 40px; +} \ No newline at end of file diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js new file mode 100644 index 0000000..b83c133 --- /dev/null +++ b/pages/meetingDetailSigned/meetingDetailSigned.js @@ -0,0 +1,88 @@ +// pages/meeting/meeting.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + payProveImage: '' + }, + + // 上传缴费凭证 + uploadImage(){ + const that = this + wx.chooseImage({ + count: 1, + sizeType: ['original', 'compressed'], + sourceType: ['album', 'camera'], + success (res) { + // tempFilePath可以作为img标签的src属性显示图片 + that.setData({ + payProveImage: res.tempFilePaths + }) + console.log(that.data.payProveImage) + } + }) + }, + // 删除缴费凭证 + delete(){ + this.setData({ + payProveImage: '' + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/meetingDetailSigned/meetingDetailSigned.json b/pages/meetingDetailSigned/meetingDetailSigned.json new file mode 100644 index 0000000..28c7f23 --- /dev/null +++ b/pages/meetingDetailSigned/meetingDetailSigned.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "会议详情", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml new file mode 100644 index 0000000..28da33a --- /dev/null +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml @@ -0,0 +1,117 @@ + + + + 会议名称 + 会议名称会议名称 + + + 会议类型 + arff4ds8a3s6651 + + + 负责人 + 找找 + + + 召开时间 + 张三 + + + 召开地点 + 500元 + + + 会议费用 + 500元 + + + 年份 + 500元 + + + 签到时间 + 500元 + + + 会议费用（VIP） + 500元 + + + 会议内容 + 500元 + + + 备注 + 500元 + + + 附件 + + + + 文件名内阁成员函数的工具包 + + 查看 + + + + 会议文件 + + + 单个账号会议文件只可发送五次 + + + + + 文件名内阁成员函数的工具包 + + 查看 + + + + + + 报名信息 + + + 参会人1 + 会议名称会议名称 + + + 参会人2 + 会议名称会议名称 + + + 缴费方式 + 会议名称会议名称 + + + 是否需要发票 + 会议名称会议名称 + + + 邮寄地址 + 会议名称会议名称 + + + 邮编 + 会议名称会议名称 + + + 缴费凭证 + + + + × + + + + + + + + + + diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss new file mode 100644 index 0000000..5ea690f --- /dev/null +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss @@ -0,0 +1,151 @@ +page{ + box-sizing: border-box; + background-color: #F5F5F5; +} +.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{ + 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; +} +.meeting-name{ + margin-bottom: 10px; +} +.meeting-files{ + margin-top: 10px; + flex-direction: column; + align-items: flex-start !important; + height: auto !important; +} +.basic-info .meeting-files .file-name{ + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + box-sizing: border-box; + padding: 0; + height: 40px; + margin-top: 10px; +} +.file-name view{ + padding: 0; + height: 30px; + line-height: 30px; + border-bottom: 0; +} +.file-name view image{ + width: 30px; + height: 30px; + margin-right: 10px; +} +.basic-info .meeting-files .file-name .look-file{ + color: #069F99; +} +.warning-text{ + position: absolute !important; + top: 5px; + left: 75px; + color: #FF5E60 !important; + font-size: 10px !important; + padding: 0 !important; +} +.warning-text image{ + width: 10px; + height: 10px; +} +.pay-prove-box{ + display: flex !important; + flex-direction: column !important; + justify-content: flex-start !important; + align-items: flex-start !important; + padding: 0; + height: 120px !important; +} +.pay-prove-box .pay-prove-content{ + margin-top: 20px; + display: flex; + justify-content: flex-start; + align-items: center; + padding: 0; + height: 80px; +} +.pay-prove-box .pay-prove-content .pay-prove{ + width: 80px; + height: 80px; + margin-right: 10px; + position: relative !important; + background-color: #D1D1D1; + padding: 0; + border-radius: 5px; + display: flex; + justify-content: center; + align-items: center; +} +.pay-prove-box .pay-prove-content .pay-prove image{ + width: 80px; + height: 80px; +} +.pay-prove-box .pay-prove-content .pay-prove .delete-image{ + width: 12px; + height: 12px; + color: #fff; + background-color: #FF5E60; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + font-size: 7px; + position: absolute; + top: -3px; + right: -3px; +} +.sign-up-empty{ + height: 60px; + width: 100%; + display: block; + margin-top: 10px; +} +.sign-up{ + width: 100%; + padding: 10px 15px; + box-sizing: border-box; + background-color: #fff; + position: fixed; + bottom: 0; +} +.sign-up text{ + background-color: #069F99; + height: 40px; + border-radius: 10px; + color: #fff; + font-size: 16px; + font-weight: 600; + display: block; + text-align: center; + line-height: 40px; +} \ No newline at end of file diff --git a/pages/mine/mine.js b/pages/mine/mine.js index 028a99e..a6407c1 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -6,12 +6,6 @@ Page({ */ data: { - }, - // 修改密码 - upDateInfo(){ - wx.navigateTo({ - url: '../upDateInfo/upDateInfo', - }) }, // 个人信息 mineInfo(){ @@ -19,6 +13,12 @@ Page({ url: '../mineInfo/mineInfo', }) }, + // 修改密码 + upDateInfo(){ + wx.navigateTo({ + url: '../upDateInfo/upDateInfo', + }) + }, // 扫码签到 scanCode(){ wx.scanCode({ @@ -29,6 +29,18 @@ Page({ complete: (res) => {}, }) }, + // 我的资料 + mineData(){ + wx.navigateTo({ + url: '../mineData/mineData', + }) + }, + // 我的合同 + mineContract(){ + wx.navigateTo({ + url: '../mineContract/mineContract', + }) + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 2d0b9b0..9864347 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -48,14 +48,14 @@ - + 我的资料 - + 我的合同 diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index c9069b1..fdd5237 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -111,7 +111,7 @@ page{ } .logout{ padding: 0 15px; - margin-top: 10px; + margin: 10px 0; } .logout text{ display: flex; diff --git a/pages/mineContract/mineContract.js b/pages/mineContract/mineContract.js new file mode 100644 index 0000000..1134c57 --- /dev/null +++ b/pages/mineContract/mineContract.js @@ -0,0 +1,71 @@ +// pages/minedata/minedata.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + list: [,1,1,1,1,1,1,1,1] + }, + // 合同详情 + contractDetail(){ + wx.navigateTo({ + url: '../contractDetail/contractDetail', + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/mineContract/mineContract.json b/pages/mineContract/mineContract.json new file mode 100644 index 0000000..ea6ac39 --- /dev/null +++ b/pages/mineContract/mineContract.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "我的合同", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/mineContract/mineContract.wxml b/pages/mineContract/mineContract.wxml new file mode 100644 index 0000000..2f3b461 --- /dev/null +++ b/pages/mineContract/mineContract.wxml @@ -0,0 +1,13 @@ + + + + + 合同名称 + 合同金额：5000元 + + + 合同编号：002 + 负责人：张三 + + + diff --git a/pages/mineContract/mineContract.wxss b/pages/mineContract/mineContract.wxss new file mode 100644 index 0000000..6324f25 --- /dev/null +++ b/pages/mineContract/mineContract.wxss @@ -0,0 +1,24 @@ +/* pages/mineContract/mineContract.wxss */ +page{ + background-color: #F5F5F5; + padding: 15px; + width: 100%; + box-sizing: border-box; +} +.list-item{ + display: flex; + padding: 15px; + flex-direction: column; + background-color: #fff; + border-radius: 10px; +} +.list-item:not(:first-child){ + margin-top: 10px; +} +.list-item .list-info{ + color: #333; + display: flex; + justify-content: space-between; + align-items: center; + font-size: 14px; +} diff --git a/pages/mineData/mineData.js b/pages/mineData/mineData.js new file mode 100644 index 0000000..b6cb894 --- /dev/null +++ b/pages/mineData/mineData.js @@ -0,0 +1,65 @@ +Page({ + + /** + * 页面的初始数据 + */ + data: { + list: [1,1,1,1,,1,1,1] + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/mineData/mineData.json b/pages/mineData/mineData.json new file mode 100644 index 0000000..b10fba0 --- /dev/null +++ b/pages/mineData/mineData.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "我的资料", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/mineData/mineData.wxml b/pages/mineData/mineData.wxml new file mode 100644 index 0000000..a299962 --- /dev/null +++ b/pages/mineData/mineData.wxml @@ -0,0 +1,13 @@ + + + 2021-10-12 12:00:00 + + 1文件名称列表文件名称列表文件名称列表文件名称列表.PDF + 2文件名称列表文件名称列表文件名称列表文件名称列表.PDF + 3文件名称文件名称列表文件名称列表.PDF + 4文件名称列表文件名称列表文件名称列表文件名称列表.PDF + 5文件名称列表文件名称列表文件名称列表文件名称列表.PDF + 6文件名称.PDF + + + diff --git a/pages/mineData/mineData.wxss b/pages/mineData/mineData.wxss new file mode 100644 index 0000000..fcf3d13 --- /dev/null +++ b/pages/mineData/mineData.wxss @@ -0,0 +1,35 @@ +page{ + background-color: #F5F5F5; + padding: 15px; + width: 100%; + box-sizing: border-box; +} +.list-item{ + display: flex; + padding: 15px; + flex-direction: column; + background-color: #fff; + border-radius: 10px; +} +.list-item:not(:first-child){ + margin-top: 10px; +} +.list-item .list-time{ + color: #999; + font-size: 14px; +} +.list-item .list-files{ + margin-top: 5px; + color: #069F99; + font-size: 15px; + display: flex; + flex-direction: column; +} +.list-item .list-files text{ + display: block; + width: 100%; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + line-height: 24px; +} \ No newline at end of file diff --git a/pages/mineMeeting/mineMeeting.js b/pages/mineMeeting/mineMeeting.js new file mode 100644 index 0000000..c903bcc --- /dev/null +++ b/pages/mineMeeting/mineMeeting.js @@ -0,0 +1,67 @@ +// pages/meeting/meeting.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + list: [,1,1,1,1,1,1,1,1] + }, + + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/mineMeeting/mineMeeting.json b/pages/mineMeeting/mineMeeting.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/mineMeeting/mineMeeting.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/mineMeeting/mineMeeting.wxml b/pages/mineMeeting/mineMeeting.wxml new file mode 100644 index 0000000..d893413 --- /dev/null +++ b/pages/mineMeeting/mineMeeting.wxml @@ -0,0 +1,14 @@ + + + + + 会议列表未定 + 合同金额：5000元 + + + 合同编号：002 + 负责人：张三 + + + + diff --git a/pages/mineMeeting/mineMeeting.wxss b/pages/mineMeeting/mineMeeting.wxss new file mode 100644 index 0000000..6324f25 --- /dev/null +++ b/pages/mineMeeting/mineMeeting.wxss @@ -0,0 +1,24 @@ +/* pages/mineContract/mineContract.wxss */ +page{ + background-color: #F5F5F5; + padding: 15px; + width: 100%; + box-sizing: border-box; +} +.list-item{ + display: flex; + padding: 15px; + flex-direction: column; + background-color: #fff; + border-radius: 10px; +} +.list-item:not(:first-child){ + margin-top: 10px; +} +.list-item .list-info{ + color: #333; + display: flex; + justify-content: space-between; + align-items: center; + font-size: 14px; +} diff --git a/pages/project/project.js b/pages/project/project.js index 3349a12..9f5249b 100644 --- a/pages/project/project.js +++ b/pages/project/project.js @@ -1,18 +1,56 @@ -// pages/meeting/meeting.js +import UserApi from '../../assets/js/http/userApi' Page({ /** * 页面的初始数据 */ data: { - + searchParams: { + pageNo: 1, + pageSize: 10, + needInvoice: 0, // 是否需要发票 0 1 + pack: 0, // 是否打包 0 1 + year: '', // 运行年份 + }, + selects: [ // 自定义选择框参数 + { + select: '发票', + active: false, + tabIndex: 1 + }, + { + select: '打包', + active: false, + tabIndex: 2 + }, + { + select: '时间', + active: false, + tabIndex: 3 + } + ] + }, + // 项目详情 + projectDetail(){ + wx.navigateTo({ + url: '../projectDetail/projectDetail', + }) }, - /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + console.log(this.data.searchParams) + UserApi.projectList(this.data.searchParams).then(res=>{ + console.log(res) + + }).catch(err=>{ + wx.showToast({ + title: '加载失败', + icon: 'fail', + duration: 2000 + }) + }) }, /** diff --git a/pages/project/project.json b/pages/project/project.json index 8835af0..0e892df 100644 --- a/pages/project/project.json +++ b/pages/project/project.json @@ -1,3 +1,4 @@ { + "navigationBarTitleText": "项目", "usingComponents": {} } \ No newline at end of file diff --git a/pages/project/project.wxml b/pages/project/project.wxml index d29988a..60b671d 100644 --- a/pages/project/project.wxml +++ b/pages/project/project.wxml @@ -1,4 +1,22 @@ - - - 来款项目 + + + + {{select.select}} + + + + + + + + 项目名称文字占位符项目名称文字占位符项目名称文字占位符 + 2021-12-12 + + + 需要发票 + 到账 + 开票 + 邮寄 + + diff --git a/pages/project/project.wxss b/pages/project/project.wxss index 94874ac..c249d29 100644 --- a/pages/project/project.wxss +++ b/pages/project/project.wxss @@ -1,9 +1,15 @@ /* pages/meeting/meeting.wxss */ +page { + background-color: #F5F5F5; +} +/* 头部筛选 start */ .select-list { - height: 92rpx; + border-top: 0.5px solid #F5F5F5; + height: 40px; + font-size: 14px; display: flex; align-items: center; - background-color: #F5F5F5; + background-color: #fff; } .select-item { @@ -14,7 +20,54 @@ } .select-item image { - width: 21rpx; - height: 12rpx; - margin-left: 20rpx; -} \ No newline at end of file + width: 11px; + height: 6px; + margin-left: 9px; +} +/* 头部筛选end */ +/* 列表start */ +.list{ + padding: 15px; +} +.list-item{ + height: 90px; + background-color: #fff; + border-radius: 5px; + padding: 10px 15px; + display: flex; + justify-content: space-around; + align-items: center; + flex-direction: column; +} +.list-item:not(:first-child) { + margin-top: 10px; +} +.list-item .title{ + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; +} +.list-item .title text:nth-child(1){ + font-size: 14px; + color: #333; + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.list-item .title text:nth-child(2){ + font-size: 12px; + color: #999; + width: 70px; + text-align: right; + flex-shrink: 0; +} +.content-text{ + width: 100%; + color: #999; + font-size: 12px; + display: flex; + justify-content: space-between; + align-items: center; +} diff --git a/pages/projectDetail/projectDetail.js b/pages/projectDetail/projectDetail.js new file mode 100644 index 0000000..3349a12 --- /dev/null +++ b/pages/projectDetail/projectDetail.js @@ -0,0 +1,66 @@ +// pages/meeting/meeting.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/projectDetail/projectDetail.json b/pages/projectDetail/projectDetail.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/projectDetail/projectDetail.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/projectDetail/projectDetail.wxml b/pages/projectDetail/projectDetail.wxml new file mode 100644 index 0000000..414b684 --- /dev/null +++ b/pages/projectDetail/projectDetail.wxml @@ -0,0 +1,117 @@ + + + + 项目名称 + 会议名称会议名称 + + + 款项用途 + arff4ds8a3s6651 + + + 运行年份 + 找找 + + + 企业负责人 + 张三 + + + 应付金额 + 500元 + + + 实付金额 + 500元 + + + 经办人 + 500元 + + + 是否打包 + 500元 + + + 需要发票 + 500元 + + + 付款方式 + 500元 + + + 备注 + 500元 + + + + + 到账信息 + + + 2021年到账12021元 + + + + + 开票邮寄信息 + + + + 顺丰速递 + + + + 票 + + 开票人：张三 + 开票时间：2021年10月9日 + + + 开票号5465 + + + + 票 + + 开票人：张三 + 开票时间：2021年10月9日 + + + 开票号5465 + + + 金额：200元 + 查看物流 + + + + EMS速运 + + + + 票 + + 开票人：张三 + 开票时间：2021年10月9日 + + + 开票号5465 + + + + 票 + + 开票人：张三 + 开票时间：2021年10月9日 + + + 开票号5465 + + + 金额：200元 + 查看物流 + + + diff --git a/pages/projectDetail/projectDetail.wxss b/pages/projectDetail/projectDetail.wxss new file mode 100644 index 0000000..a315a86 --- /dev/null +++ b/pages/projectDetail/projectDetail.wxss @@ -0,0 +1,225 @@ +page{ + box-sizing: border-box; + background-color: #F5F5F5; + padding-bottom: 20px; +} +.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{ + 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; +} +.meeting-name{ + margin-bottom: 10px; +} +.meeting-files{ + margin-top: 10px; + flex-direction: column; + align-items: flex-start !important; + height: auto !important; +} +.basic-info .meeting-files .file-name{ + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + box-sizing: border-box; + padding: 0; + height: 40px; + margin-top: 10px; +} +.file-name view{ + padding: 0; + height: 30px; + line-height: 30px; + border-bottom: 0; +} +.file-name view image{ + width: 30px; + height: 30px; + margin-right: 10px; +} +.basic-info .meeting-files .file-name .look-file{ + color: #069F99; +} +.warning-text{ + position: absolute !important; + top: 5px; + left: 75px; + color: #FF5E60 !important; + font-size: 10px !important; + padding: 0 !important; +} +.warning-text image{ + width: 10px; + height: 10px; +} +.pay-prove-box{ + display: flex !important; + flex-direction: column !important; + justify-content: flex-start !important; + align-items: flex-start !important; + padding: 0; + height: 120px !important; +} +.pay-prove-box .pay-prove-content{ + margin-top: 20px; + display: flex; + justify-content: flex-start; + align-items: center; + padding: 0; + height: 80px; +} +.pay-prove-box .pay-prove-content .pay-prove{ + width: 80px; + height: 80px; + margin-right: 10px; + position: relative !important; + background-color: #D1D1D1; + padding: 0; + border-radius: 5px; + display: flex; + justify-content: center; + align-items: center; +} +.pay-prove-box .pay-prove-content .pay-prove image{ + width: 80px; + height: 80px; +} +.pay-prove-box .pay-prove-content .pay-prove .delete-image{ + width: 12px; + height: 12px; + color: #fff; + background-color: #FF5E60; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + font-size: 7px; + position: absolute; + top: -3px; + right: -3px; +} +.basic-info .way{ + padding: 0 15px; + display: flex; + justify-content: flex-start !important; +} +.basic-info .way image{ + width: 23px; + height: 23px; + margin-right: 10px; +} +.way-info .way-left{ + padding: 0; + display: flex; + justify-content: flex-start !important; +} +.way-info .way-center{ + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: flex-start; +} +.way-info .way-center text:nth-child(1){ + color: #333; + font-size: 14px; +} +.way-info .way-center text:nth-child(2){ + color: #999; + font-size: 11px; +} +.way-info .green { + width: 20px; + height: 20px; + background: #069F99; + color: #fff; + font-size: 11px; + text-align: center; + line-height: 20px; + border-radius: 5px; +} +.way-info .blue { + width: 20px; + height: 20px; + background: #0A72F7; + color: #fff; + font-size: 11px; + text-align: center; + line-height: 20px; + border-radius: 5px; +} +.way-info .way-right{ + flex-shrink: 0; + padding: 0; + color: #666; + font-size: 12px; +} +.basic-info .look-progress{ + padding: 0 15px; +} +.basic-info .look-progress text:nth-child(1){ + color: #FF5E60; + font-size: 14px; +} +.basic-info .look-progress text:nth-child(2){ + display: block; + width: 70px; + height: 26px; + color: #069F99; + font-size: 11px; + border-radius: 13px; + border: 0.5px solid #069F99; + text-align: center; + line-height: 26px; +} +.sign-up-empty{ + height: 60px; + width: 100%; + display: block; + margin-top: 10px; +} +.sign-up{ + width: 100%; + padding: 10px 15px; + box-sizing: border-box; + background-color: #fff; + position: fixed; + bottom: 0; +} +.sign-up text{ + background-color: #069F99; + height: 40px; + border-radius: 10px; + color: #fff; + font-size: 16px; + font-weight: 600; + display: block; + text-align: center; + line-height: 40px; +} \ No newline at end of file diff --git a/project.config.json b/project.config.json index 04f042f..63cab1d 100644 --- a/project.config.json +++ b/project.config.json @@ -22,9 +22,9 @@ "uploadWithSourceMap": true, "compileHotReLoad": false, "lazyloadPlaceholderEnable": false, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": true, + "useMultiFrameRuntime": false, + "useApiHook": false, + "useApiHostProcess": false, "babelSetting": { "ignore": [], "disablePlugins": [],