diff --git a/app.json b/app.json index f38af5c..2e8ba10 100644 --- a/app.json +++ b/app.json @@ -30,7 +30,13 @@ "pages/signUpPageGuoji/signUpPageGuoji", "pages/signUpSuccess/signUpSuccess", "pages/upDateInfo/upDateInfo", - "pages/writtenSign/writtenSign" + "pages/writtenSign/writtenSign", + "pages/standardRouter/standardRouter", + "pages/standardBasicInfo/standardBasicInfo", + "pages/council/council", + "pages/councilDetail/councilDetail" + + ], "window":{ "backgroundTextStyle": "dark", diff --git a/assets/js/http/standardApi.js b/assets/js/http/standardApi.js new file mode 100644 index 0000000..f2ebe8f --- /dev/null +++ b/assets/js/http/standardApi.js @@ -0,0 +1,9 @@ +import http from './http.js' +let URL_CONFIG = '/jero-boot/' + +// 标协会员基本信息 +const getStandardBasicInfo = (params) => http.get(`${URL_CONFIG}`, params) + +export { + getStandardBasicInfo +} \ No newline at end of file diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js index 2106377..b562ef7 100644 --- a/assets/js/http/userApi.js +++ b/assets/js/http/userApi.js @@ -63,6 +63,10 @@ const UserApi = { committeeList: (params) => http.get(`${URL_CONFIG}payCaseCommitteeSubitem/payCaseCommitteeSubitem/findTwo`, params), // 分标委详情 committeeDetail: (params) => http.get(`${URL_CONFIG}payCaseCommittee/payCaseCommittee/detail`, params), + // 理事会列表 + councilList:(params) => http.get(`${URL_CONFIG}payCaseCouncilSubitem/payCaseCouncilSubitem/findTwo`, params), + // 理事会详情 + councilDetail: (params) => http.get(`${URL_CONFIG}payCaseCouncil/payCaseCouncil/detail`, params), // 资料网员分页接口 queryDataMemberList: (params) => http.get(`${URL_CONFIG}jero/memberProjectSubitem/pageCompany`, params), // 获取用户的信息 diff --git a/pages/committeeDetail/committeeDetail.js b/pages/committeeDetail/committeeDetail.js index f2d8e88..8faa030 100644 --- a/pages/committeeDetail/committeeDetail.js +++ b/pages/committeeDetail/committeeDetail.js @@ -44,7 +44,7 @@ Page({ icon: 'loading' }) this.data.id = options.id - MeetingApi.meetingList({caseCommitteeId: this.data.id, meetingSignUpType: 2, column: 'pm.createTime', order: 'desc'}).then(res=>{ + MeetingApi.meetingList({caseCommitteeId: this.data.id, meetingSignUpType: 2, column: 'createTime', order: 'desc'}).then(res=>{ if(res.success){ if(res.result.records && res.result.records.length <= 2){ this.setData({ diff --git a/pages/contractDetail/contractDetail.wxss b/pages/contractDetail/contractDetail.wxss index 89e1351..d3db967 100644 --- a/pages/contractDetail/contractDetail.wxss +++ b/pages/contractDetail/contractDetail.wxss @@ -87,5 +87,4 @@ page{ top: 6%; right: 20%; z-index: 2; - } \ No newline at end of file diff --git a/pages/council/council.js b/pages/council/council.js new file mode 100644 index 0000000..2ff5c8c --- /dev/null +++ b/pages/council/council.js @@ -0,0 +1,109 @@ +// pages/council/council.js +import UserApi from '../../assets/js/http/userApi' +Page({ + + /** + * 页面的初始数据 + */ + data: { + statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], + pageNo: 1, + pageSize: 10, + list: [] + }, + goBack(){ + wx.navigateBack() + }, + loadData(){ + wx.showToast({ + title: '加载中...', + icon: 'loading' + }) + let params = { + pageNo: this.data.pageNo, + pageSize: this.data.pageSize, + // 创建时间倒叙排序 + column:'createTime', + order:'desc' + } + UserApi.councilList(params).then(res=>{ + if(res.success){ + if(res.result.records && res.result.records.length){ + this.setData({ + list: [...this.data.list, ...res.result.records] + }) + } + } + }).catch(err => { + wx.showToast({ + title: '加载失败', + icon: 'none', + duration: 2000 + }) + }) + }, + // 理事会详情页 + detail(e){ + wx.navigateTo({ + url: `../councilDetail/councilDetail?id=${e.currentTarget.dataset.committee.id}&name=${e.currentTarget.dataset.committee.name}&type=council`, + }) + }, + + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.loadData() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.data.pageNo++ + this.loadData() + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/council/council.json b/pages/council/council.json new file mode 100644 index 0000000..ced5b27 --- /dev/null +++ b/pages/council/council.json @@ -0,0 +1,4 @@ +{ + "navigationStyle": "custom", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/council/council.wxml b/pages/council/council.wxml new file mode 100644 index 0000000..52a0016 --- /dev/null +++ b/pages/council/council.wxml @@ -0,0 +1,19 @@ + + + + + + 理事会 + + + + + + {{item.name}} + 项目负责人:{{item.principal}} + + + 暂无数据 + + + diff --git a/pages/council/council.wxss b/pages/council/council.wxss new file mode 100644 index 0000000..5e8e285 --- /dev/null +++ b/pages/council/council.wxss @@ -0,0 +1,25 @@ +/* pages/council/council.wxss */ +page{ + padding-bottom: 20px; + background-color: #f5f5f5; + padding: 15px; + box-sizing: border-box; +} +.item{ + box-sizing: border-box; + padding: 0 15px; + width: 100%; + height: 80px; + line-height: 40px; + background-color: #fff; + border-radius: 10px; + color: #333; + font-size: 14px; + margin-bottom: 10px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} +.item:last-child{ + margin-bottom: 0; +} \ No newline at end of file diff --git a/pages/councilDetail/councilDetail.js b/pages/councilDetail/councilDetail.js new file mode 100644 index 0000000..c06136e --- /dev/null +++ b/pages/councilDetail/councilDetail.js @@ -0,0 +1,129 @@ +// pages/councilDetail/councilDetail.js +import UserApi from '../../assets/js/http/userApi' +import { previewFile } from '../../assets/js/preview' +import MeetingApi from '../../assets/js/http/meetingApi' +Page({ + + /** + * 页面的初始数据 + */ + data: { + form: {}, + name: '', + id: '', // ,项目id + projectFileList: [], // 项目资料文件 + meetingList: [] // 会议文件 + }, + // 预览 + preview(e){ + const fileObj = e.currentTarget.dataset.file + previewFile(fileObj.fileId ,fileObj.fileName) + }, + // 获取更多会议信息数据 + goMoreMeeting(){ + wx.navigateTo({ + url: `../meeting/meeting?councilId=${this.data.id}`, + }) + }, + // 会议详情 + meetingDetail(e){ + console.log(e); + const meetingInfo = JSON.stringify(e.currentTarget.dataset.meetinginfo) + wx.navigateTo({ + url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, + }) + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + name: options.name + }) + wx.showToast({ + title: '加载中...', + icon: 'loading' + }) + this.data.id = options.id + MeetingApi.meetingList({councilId: this.data.id, meetingSignUpType: 2, column: 'createTime', order: 'desc'}).then(res=>{ + if(res.success){ + if(res.result.records && res.result.records.length <= 2){ + this.setData({ + meetingList: res.result.records + }) + }else if(res.result.records && res.result.records.length > 2){ + this.setData({ + meetingList: res.result.records.slice(0,2) + }) + } + } + }).catch(err => { + wx.showToast({ + title: '加载失败', + icon: 'none', + duration: 2000 + }) + }) + UserApi.councilDetail({id: this.data.id}).then(res=>{ + this.setData({ + form: res.result + }) + }).catch(err => { + wx.showToast({ + title: '加载失败', + icon: 'none', + duration: 2000 + }) + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/councilDetail/councilDetail.json b/pages/councilDetail/councilDetail.json new file mode 100644 index 0000000..503673b --- /dev/null +++ b/pages/councilDetail/councilDetail.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "项目详情", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/councilDetail/councilDetail.wxml b/pages/councilDetail/councilDetail.wxml new file mode 100644 index 0000000..98bb39c --- /dev/null +++ b/pages/councilDetail/councilDetail.wxml @@ -0,0 +1,41 @@ + + + + + 项目名称 + {{name}} + + + 项目负责人 + {{form.principal}} + + + 目标简介 + {{form.remarks}} + + + 项目资料 + + {{item.fileName}} + + 无 + + + + + 会议信息 + 更多>> + + + + {{item.meetingName}} + 查看详情 + + + 暂无会议记录！ + + + + 更多功能和信息请到pc端操作 + diff --git a/pages/councilDetail/councilDetail.wxss b/pages/councilDetail/councilDetail.wxss new file mode 100644 index 0000000..50415f1 --- /dev/null +++ b/pages/councilDetail/councilDetail.wxss @@ -0,0 +1,290 @@ +/* pages/councilDetail/councilDetail.wxss */ +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; +} +.basic-info view text:nth-child(1){ + flex-shrink: 0; + margin-right: 10px; +} +.meeting-name{ + margin-bottom: 10px; +} +.meeting-name text:nth-child(2){ + text-overflow:ellipsis; + overflow: hidden; + white-space: nowrap; +} +.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; +} +.way-box{ + display: block !important; + padding: 0 !important; + height: auto !important; +} +.info-file{ + padding: 0 !important; + display: flex; + flex-direction: column; + align-items: flex-end !important; + height: auto !important; + overflow: hidden; +} +.info-file text{ + display: block; + width: 100%; + text-align: right; + overflow:hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin: 0 !important; +} +.meeting-info{ + width: 100%; + height: auto !important; + display: flex; + justify-content: space-between !important; + align-items: center; + padding: 0 !important; + border: none; +} +.meeting-info text:nth-child(1){ + flex-shrink: 1 !important; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} +.meeting-info text:nth-child(2){ + flex-shrink: 0 !important; +} +.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; + flex-shrink: 0; +} +.way-info .way-center text:nth-child(2){ + color: #999; + font-size: 11px; + flex-shrink: 0; +} +.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; +} + +.remark { + height: auto!important; + margin-bottom: 10px; +} + +.tips { + margin-top: 20px; + color: #000; + font-weight: 700; + font-size: 14px; + text-align: center; +} diff --git a/pages/standardBasicInfo/standardBasicInfo.js b/pages/standardBasicInfo/standardBasicInfo.js new file mode 100644 index 0000000..0cc9b15 --- /dev/null +++ b/pages/standardBasicInfo/standardBasicInfo.js @@ -0,0 +1,81 @@ +// pages/standardBasicInfo/standardBasicInfo.js +import {getStandardBasicInfo} from '../../assets/js/http/standardApi' +Page({ + + /** + * 页面的初始数据 + */ + data: { + secretariatInfo:{},// 秘书处信息 + companyInfo:{} // 本企业信息 + }, + // 获取基本信息 + getBasicInfo(){ + getStandardBasicInfo().then(res => { + console.log(res); + if(res.success){ + this.setData({ + secretariatInfo:res.result, + companyInfo:res.result + }) + } + }).catch(err => { + console.log(err,'err'); + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getBasicInfo() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/standardBasicInfo/standardBasicInfo.json b/pages/standardBasicInfo/standardBasicInfo.json new file mode 100644 index 0000000..349aacc --- /dev/null +++ b/pages/standardBasicInfo/standardBasicInfo.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "基本信息", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/standardBasicInfo/standardBasicInfo.wxml b/pages/standardBasicInfo/standardBasicInfo.wxml new file mode 100644 index 0000000..8b2bac4 --- /dev/null +++ b/pages/standardBasicInfo/standardBasicInfo.wxml @@ -0,0 +1,54 @@ + + + + + + 秘书处信息： + + + 地址： + {{secretariatInfo.address}} + + + 联系人： + {{secretariatInfo.contract}} + + + 联系人电话： + {{secretariatInfo.phone}} + + + 联系人邮箱： + {{secretariatInfo.email}} + + + + + + + + 本企业信息： + + + 企业名称： + {{companyInfo.name}} + + + 企业管理员： + {{companyInfo.email}} + + + 管理员电话： + {{companyInfo.phone}} + + + 管理人邮箱： + {{companyInfo.email}} + + + 会员有效期： + {{companyInfo.email}} + + + + \ No newline at end of file diff --git a/pages/standardBasicInfo/standardBasicInfo.wxss b/pages/standardBasicInfo/standardBasicInfo.wxss new file mode 100644 index 0000000..2029771 --- /dev/null +++ b/pages/standardBasicInfo/standardBasicInfo.wxss @@ -0,0 +1,38 @@ +/* pages/standardBasicInfo/standardBasicInfo.wxss */ +page{ + padding: 10px; + box-sizing: border-box; + background-color: #F5F5F5; + padding-bottom: 20px; +} + +.basic-info .title text{ + border-left: 3px solid #069F99; + height: 14px; + padding-left: 10px; + border-radius: 2px; + display: flex; + align-items: center; + color: #333; + font-size: 15px; + font-weight: 500; + margin-bottom: 10px; +} +.mishu { + padding: 30rpx; + background-color: #fff; + border-radius: 10px; + height: auto; +} +.mishu view{ + display: flex; + padding: 14rpx; + font-size: 14px; +} +.mishu view text:nth-child(1){ + flex-shrink: 0; +} + +.company { + margin-top: 20px; +} \ No newline at end of file diff --git a/pages/standardRouter/standardRouter.js b/pages/standardRouter/standardRouter.js index 79b9662..2c6ac83 100644 --- a/pages/standardRouter/standardRouter.js +++ b/pages/standardRouter/standardRouter.js @@ -7,7 +7,7 @@ Page({ data: { pageRputers: [ { - path: "", + path: "../standardBasicInfo/standardBasicInfo", imgPath:'../../assets/images/basic-info.png', val: "1", name: "基本信息" @@ -31,7 +31,7 @@ Page({ name: "信息交流会" }, { - path: "../meeting/meeting?type=", // 这里应该是一个新的页面 或者用分标委的页面 + path: "../council/council", imgPath:'../../assets/images/lishi.png', val: "5", name: "理事会" diff --git a/pages/standardRouter/standardRouter.wxml b/pages/standardRouter/standardRouter.wxml index 74de857..0e19b90 100644 --- a/pages/standardRouter/standardRouter.wxml +++ b/pages/standardRouter/standardRouter.wxml @@ -1,7 +1,11 @@ - + + + + + - @@ -14,4 +18,6 @@ + + \ No newline at end of file diff --git a/pages/standardRouter/standardRouter.wxss b/pages/standardRouter/standardRouter.wxss index dd2b823..224b1b3 100644 --- a/pages/standardRouter/standardRouter.wxss +++ b/pages/standardRouter/standardRouter.wxss @@ -1,6 +1,11 @@ /* pages/standardRouter/standardRouter.wxss */ +page { + background: #f5f5f5; + padding: 15px; + box-sizing: border-box; +} .select-box { - transform: translateY(40rpx); + transform: translateY(60rpx); } .select { padding: 20rpx; @@ -38,4 +43,11 @@ border-radius: 50%; background-color: #069f99; opacity: .2; +} + +.wrap { + margin: 0 auto; + background-color: #fff; + border-radius: 10px; + height: 150pt; } \ No newline at end of file