From 877622c36bddfc255e01c2534bd76c58415a057a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 7 Jan 2022 11:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E4=BF=AE=E6=94=B92022-?=
 =?UTF-8?q?01-4=20=E7=89=88=E6=9C=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/councilDetail/councilDetail.js           |  4 ++--
 pages/councilDetail/councilDetail.wxml         |  4 ++--
 .../meetingDetailSigned/meetingDetailSigned.js | 18 ++++++++++++++++++
 .../meetingDetailSigned.wxml                   |  4 ++--
 pages/project/project.wxml                     |  2 +-
 pages/project/project.wxss                     |  5 +++++
 pages/projectDetail/projectDetail.wxml         |  6 +++---
 pages/scanSign/scanSign.wxml                   |  1 +
 pages/standardBasicInfo/standardBasicInfo.js   |  2 +-
 pages/standardBasicInfo/standardBasicInfo.wxml |  6 +++---
 10 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/pages/councilDetail/councilDetail.js b/pages/councilDetail/councilDetail.js
index d1d4143..ef88a78 100644
--- a/pages/councilDetail/councilDetail.js
+++ b/pages/councilDetail/councilDetail.js
@@ -46,8 +46,8 @@ Page({
       icon: 'loading'
     })
     this.data.id = options.id
-    // meetingSignUpType: 2, 可报名的 会议 或者已报名的会议
-    MeetingApi.meetingList({councilId: this.data.id,  column: 'createTime', order: 'desc'}).then(res=>{
+    //,  可报名的 会议 或者已报名的会议
+    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({
diff --git a/pages/councilDetail/councilDetail.wxml b/pages/councilDetail/councilDetail.wxml
index 98bb39c..27ba03e 100644
--- a/pages/councilDetail/councilDetail.wxml
+++ b/pages/councilDetail/councilDetail.wxml
@@ -13,14 +13,14 @@
 			<text>目标简介</text>
 			<text>{{form.remarks}}</text>
 		</view>
-		<view style="height: auto !important;">
+		<!-- <view style="height: auto !important;">
 			<text>项目资料</text>
 			<view class="info-file" wx:if="{{form.files && form.files.length}}">
 				<text class='color-green' data-file="{{item}}" wx:for="{{form.files}}" wx:key='item'
 				bindtap="preview">{{item.fileName}}</text>
 			</view>
 			<text wx:if="{{form.files.length == 0}}">无</text>
-		</view>
+		</view> -->
 	</view>
 	<view class="basic-info" style="margin-top: 10px;">
 		<view class="title">
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index 570a18a..0d67109 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -48,6 +48,16 @@ Page({
     userId: '',
     form: {},
     showSignInBtn:false, // 是否显示签到按钮
+    isMoreTime:false, // 是否超过 会议截止报名时间 
+  },
+  compareCurrentTime(time) {
+    let date = new Date()
+    let compareTime = new Date(time)
+    if (date.getTime() > compareTime.getTime()) {
+      return true
+    } else {
+      return false
+    }
   },
 
   // 获取图片的id
@@ -333,12 +343,20 @@ Page({
       this.setData({
         meetingInfo:meetingInfo
       })
+      let flag = this.compareCurrentTime(meetingInfo.registerDeadline)
+      this.setData({
+        isMoreTime:flag
+      })
     }else{
       MeetingApi.meetingDetail({id:meetingInfo.id}).then(res => {
         if(res.success){
           this.setData({
             meetingInfo:res.result
           })
+          let flag = this.compareCurrentTime(res.result.registerDeadline)
+          this.setData({
+            isMoreTime:flag
+          })
         }
       })
     }
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index aa9e767..a72ed8f 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -468,8 +468,8 @@
 
 
 	</view>
-	<!-- 会议状态未可报名 并且会议类型是未开始 或者进行中  -->
-	<view class="join-meeting" wx:if="{{meetingInfo.meetingSignUpType === 1 && (meetingInfo.meetingStatus === 2 || meetingInfo.meetingStatus === 3)}}">
+	<!-- 会议状态未可报名 并且未超过截止时间 -->
+	<view class="join-meeting" wx:if="{{meetingInfo.meetingSignUpType === 1 && !isMoreTime}}">
 	<text bindtap='joinMeeting'>报名</text>
 	</view>
 
diff --git a/pages/project/project.wxml b/pages/project/project.wxml
index 0231eb4..9f58b83 100644
--- a/pages/project/project.wxml
+++ b/pages/project/project.wxml
@@ -43,7 +43,7 @@
 			<view class="item-content">项目负责人：{{item.name || item.directorName || item.principalName }}</view>
 			<view class="item-content">负责人电话：{{item.phone || item.principalPhone}}</view>
 			<view class="item-content">负责人邮箱：{{item.email || item.principalEmail}}</view>
-			<view class="item-content">运行周期：一年</view>
+			<view class="item-content"><text>运行周期：</text>{{item.operationCycle || ''}}</view>
 			<view class="item-content">缴费凭证:{{item.paymentStatus_dictText || '无'}}</view>
 		</block>
 		<!-- 工作组项目展示end -->
diff --git a/pages/project/project.wxss b/pages/project/project.wxss
index 8301e15..62e3d25 100644
--- a/pages/project/project.wxss
+++ b/pages/project/project.wxss
@@ -68,6 +68,11 @@ page {
   padding: 10rpx 0;
   box-sizing: border-box;
   font-size: 14px;
+  height: auto;
+  display: flex;
+}
+.item-content text{
+  flex-shrink: 0;
 }
 .content-text{
   width: 100%;
diff --git a/pages/projectDetail/projectDetail.wxml b/pages/projectDetail/projectDetail.wxml
index 876b67f..ed81ce8 100644
--- a/pages/projectDetail/projectDetail.wxml
+++ b/pages/projectDetail/projectDetail.wxml
@@ -47,7 +47,7 @@
 		<!-- 工作组项目展示 -->
 		<view style="height:auto" wx:if="{{type === 'work' }}">
 			<text>任务及目标</text>
-			<text></text>
+			<text>{{form.missionAndObjectives || ''}}</text>
 		</view>
 		<view>
 			<text>需要发票</text>
@@ -79,7 +79,7 @@
 			<text wx:if="{{noticeFileList.length == 0}}">无</text>
 		</view>
 		<!-- 资料网员的项目详情不显示项目资料 -->
-		<view style="height: auto !important;" wx:if="{{showProjectData}}">
+		<!-- <view style="height: auto !important;" wx:if="{{showProjectData}}">
 
 			<text>项目资料</text>
 			<view class="info-file" wx:if="{{projectFileList && projectFileList.length}}">
@@ -87,7 +87,7 @@
 				bindtap="preview">{{item.name}}</text>
 			</view>
 			<text wx:if="{{projectFileList.length == 0}}">无</text>
-		</view>
+		</view> -->
 	</view>
 	<view class="basic-info" style="margin-top: 10px;" wx:if="{{showMeeting}}">
 		<view class="title">
diff --git a/pages/scanSign/scanSign.wxml b/pages/scanSign/scanSign.wxml
index 898395f..7e89f33 100644
--- a/pages/scanSign/scanSign.wxml
+++ b/pages/scanSign/scanSign.wxml
@@ -11,6 +11,7 @@
     <text wx:if="{{form.meetingType == 3}}">国际研讨会</text>
     <text wx:if="{{form.meetingType == 4}}">其他会议</text>
     <text wx:if="{{form.meetingType == 5}}">分标委会议</text>
+    <text wx:if="{{form.meetingType == 6}}">理事会会议</text>
   </view>
   <view>
     <text>召开时间</text>
diff --git a/pages/standardBasicInfo/standardBasicInfo.js b/pages/standardBasicInfo/standardBasicInfo.js
index e6e552a..81298b1 100644
--- a/pages/standardBasicInfo/standardBasicInfo.js
+++ b/pages/standardBasicInfo/standardBasicInfo.js
@@ -15,7 +15,7 @@ Page({
       console.log(res);
       if(res.success){
         this.setData({
-          secretariatInfo:res.result.secretariat,
+          secretariatInfo:res.result.tbContacts,
           companyInfo:res.result.memberInfo
         })
       }
diff --git a/pages/standardBasicInfo/standardBasicInfo.wxml b/pages/standardBasicInfo/standardBasicInfo.wxml
index 9f94722..32741da 100644
--- a/pages/standardBasicInfo/standardBasicInfo.wxml
+++ b/pages/standardBasicInfo/standardBasicInfo.wxml
@@ -7,15 +7,15 @@
     </view>
     <view>
       <text>地址：</text>
-      <text>{{secretariatInfo.address || ''}}</text>
+      <text>{{secretariatInfo.address || '天津市东丽开发区先锋东路68号'}}</text>
     </view>
     <view>
       <text>联系人：</text>
-      <text>{{secretariatInfo.username}}</text>
+      <text>{{secretariatInfo.realname || '郭琳'}}</text>
     </view>
     <view>
       <text>联系人电话：</text>
-      <text>{{secretariatInfo.phone}}</text>
+      <text>{{secretariatInfo.telephone}}</text>
     </view>
     <view>
       <text>联系人邮箱：</text>