From 098c5bde7ec90f022b0a3458956ca97bc7da5d33 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 24 Dec 2021 15:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/home.js | 216 +++++++++--------- .../meetingDetailSigned.wxss | 4 + 2 files changed, 112 insertions(+), 108 deletions(-) diff --git a/pages/home/home.js b/pages/home/home.js index 876df41..61353c4 100644 --- a/pages/home/home.js +++ b/pages/home/home.js @@ -25,29 +25,29 @@ Page({ startTime: '', // 开始日期 endTime: '' // 结束日期 }, - content:'',// 消息内容 - showModal:false, // 是否显示弹窗 - clickItem:null, - signUpBool:false // 是否跳转可报名 + content: '', // 消息内容 + showModal: false, // 是否显示弹窗 + clickItem: null, + signUpBool: false // 是否跳转可报名 }, showDialogBtn: function (e) { - let content = e.currentTarget.dataset.message.msgContent - // 是否可跳转报名 - const templateCode = e.currentTarget.dataset.message.templateCode - if(templateCode === 'QY_1_HYTZ_WORK_GROUP_CREATE' || templateCode === "QY_13_HYTZ_FBW_CREATE"){ - this.setData({ - signUpBool:true - }) - }else{ + let content = e.currentTarget.dataset.message.msgContent + // 是否可跳转报名 + const templateCode = e.currentTarget.dataset.message.templateCode + if (templateCode === 'QY_1_HYTZ_WORK_GROUP_CREATE' || templateCode === "QY_13_HYTZ_FBW_CREATE") { + this.setData({ + signUpBool: true + }) + } else { - this.setData({ - signUpBool:false - }) - } + this.setData({ + signUpBool: false + }) + } const that = this that.setData({ showModal: true, - content:content, + content: content, clickItem: e }) console.log(this.data.clickItem); @@ -55,8 +55,7 @@ Page({ /** * 弹出框蒙层截断touchmove事件 */ - preventTouchMove: function () { - }, + preventTouchMove: function () {}, /** * 隐藏模态对话框 */ @@ -66,10 +65,10 @@ Page({ this.loadData() that.setData({ showModal: false, - content:'', - clickItem:null + content: '', + clickItem: null }); - + }, loadData() { wx.showToast({ @@ -119,14 +118,14 @@ Page({ url = '../project/project?type=work' } else if (this.data.selectArr[index].val === '2') { // 分标委 url = '../committee/committee' - } else if (this.data.selectArr[index].val=== '3') { // 会议活动 + } else if (this.data.selectArr[index].val === '3') { // 会议活动 url = '../meeting/meeting' - } else if(this.data.selectArr[index].val === '4'){ // 资料网员 + } else if (this.data.selectArr[index].val === '4') { // 资料网员 // url = '../data/data' url = '../project/project?type=ziliao' - }else if(this.data.selectArr[index].val === '6'){ // 标协会员 - url= '../standardRouter/standardRouter' - }else if(this.data.selectArr[index].val === '5'){ // 合同 + } else if (this.data.selectArr[index].val === '6') { // 标协会员 + url = '../standardRouter/standardRouter' + } else if (this.data.selectArr[index].val === '5') { // 合同 url = '../mineContract/mineContract' } wx.navigateTo({ @@ -136,7 +135,7 @@ Page({ // 会议去报名，切换已读状态 messageDetail(e) { const readFlag = e.currentTarget.dataset.message.readFlag - + if (readFlag == 0) { // 标记已读 UserApi.messageStatus({ anntId: e.currentTarget.dataset.message.anntId @@ -144,16 +143,16 @@ Page({ this.loadData() wx.showToast({ title: '已读成功', - icon: 'none' + icon: 'none' }) }) } - + }, // 去报名 - goSignUpPage(){ + goSignUpPage() { const templateCode = this.data.clickItem.currentTarget.dataset.message.templateCode - const meetingId = JSON.parse( this.data.clickItem.currentTarget.dataset.message.busId).id + const meetingId = JSON.parse(this.data.clickItem.currentTarget.dataset.message.busId).id if (templateCode == 'QY_1_HYTZ_WORK_GROUP_CREATE' || templateCode == "QY_13_HYTZ_FBW_CREATE") { // 去报名页 // 需要调用会议详情的接口 判断该会议是否还在报名时间内 并跳转不同的页面或者操作 MeetingApi.meetingDetail({ @@ -234,73 +233,74 @@ Page({ onShow: function () { const that = this let menuArrStand = [{ - path: '../../assets/images/laikuan-new.png', - val:'0', - text: '项目' - }, - { - path: '../../assets/images/gongzuozu-new.png', - text: '工作组', - val:'1', - }, - { - path: '../../assets/images/fenbiaowei-new.png', - text: '分标委', - val:'2', - }, - { - path: '../../assets/images/huiyi-new.png', - text: '会议活动', - val:'3', - }, - { - path: '../../assets/images/ziliao-new .png', - text: '资料网员', - val:'4', - }, - { - path: '../../assets/images/standard.png', - text: '标协会员', - val:'6', - }, - { - path: '../../assets/images/new-contract.png', - text: '合同', - val:'5', - }, - ] + path: '../../assets/images/gongzuozu-new.png', + text: '工作组', + val: '1', + }, + { + path: '../../assets/images/fenbiaowei-new.png', + text: '分标委', + val: '2', + }, + { + path: '../../assets/images/ziliao-new .png', + text: '资料网员', + val: '4', + }, + { + path: '../../assets/images/standard.png', + text: '标协会员', + val: '6', + }, + { + path: '../../assets/images/laikuan-new.png', + val: '0', + text: '项目' + }, + { + path: '../../assets/images/huiyi-new.png', + text: '会议', + val: '3', + }, + { + path: '../../assets/images/new-contract.png', + text: '合同', + val: '5', + }, + ] - let menuArr = [{ - path: '../../assets/images/laikuan-new.png', - text: '项目', - val:'0', - }, - { - path: '../../assets/images/gongzuozu-new.png', - text: '工作组', - val:'1', - }, - { - path: '../../assets/images/fenbiaowei-new.png', - text: '分标委', - val:'2', - }, - { - path: '../../assets/images/huiyi-new.png', - text: '会议活动', - val:'3', - }, - { - path: '../../assets/images/ziliao-new.png', - text: '资料网员', - val:'4', - }, - { - path: '../../assets/images/new-contract.png', - text: '合同', - val:'5', - }, -] + let menuArr = [{ + path: '../../assets/images/gongzuozu-new.png', + text: '工作组', + val: '1', + }, + { + path: '../../assets/images/fenbiaowei-new.png', + text: '分标委', + val: '2', + }, + { + path: '../../assets/images/ziliao-new.png', + text: '资料网员', + val: '4', + }, + { + path: '../../assets/images/laikuan-new.png', + text: '项目', + val: '0', + }, + + { + path: '../../assets/images/huiyi-new.png', + text: '会议', + val: '3', + }, + { + path: '../../assets/images/new-contract.png', + text: '合同', + val: '5', + }, + ] let searchParams = { pageNo: 1, pageSize: 10, @@ -315,26 +315,26 @@ Page({ this.loadData() // 默认不显示标协会员的菜单 wx.getStorage({ - key:'userInfo', - success(res){ + key: 'userInfo', + success(res) { console.log(res); - if(res.data.companyRole === '1' ){ + if (res.data.companyRole === '1') { // 说明不是会员系统的企业 that.setData({ - 'selectArr':menuArr + 'selectArr': menuArr }) - }else{ + } else { // 是会员的企业 that.setData({ - 'selectArr':menuArrStand + 'selectArr': menuArrStand }) } - + }, - fail(){ + fail() { // this.data.selectArr = [] that.setData({ - 'selectArr':menuArr + 'selectArr': menuArr }) } }) @@ -346,4 +346,4 @@ Page({ this.data.searchParams.pageNo++ this.loadData() } -}) +}) \ No newline at end of file diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss index f6aa2ed..0d9fc0d 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.wxss +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss @@ -36,6 +36,10 @@ page{ .meeting-name{ margin-bottom: 10px; } +.meeting-name text{ + min-width: 140rpx; +} + .meeting-files{ margin-top: 10px; flex-direction: column;