From 72e4d4b8e2c703f9b10e20299f401ffed1aae220 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 3 Nov 2021 20:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingDetailSigned/meetingDetailSigned.wxml |  1 -
 pages/signUpEntrance/signUpEntrance.js           | 16 +++++++++++-----
 pages/signUpEntrance/signUpEntrance.wxml         |  8 ++++----
 pages/signUpEntrance/signUpEntrance.wxss         |  4 +++-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 49bffdc..5a718bd 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -123,7 +123,6 @@
 			<view class="payment-text"  wx:if="{{singInPersonInfo.checkResult !== 1}}">
 				<image-upload  bindgetIds='getImagesId' maxLength='1' initImgsList="{{singInPersonInfo.paymentRecord}}" id="img"></image-upload>
 			</view>
-
 			<!-- 审核通过的显示 -->
 			<view class="payment-text" wx:if="{{singInPersonInfo.checkResult === 1}}">
 			<image src="{{payRecordImgSrc}}" class="back-img"></image>
diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js
index e0f596c..7379b3c 100644
--- a/pages/signUpEntrance/signUpEntrance.js
+++ b/pages/signUpEntrance/signUpEntrance.js
@@ -62,12 +62,18 @@ Page({
         if(flag){
           wx.showToast({
             title: '当前会议超出报名时间，不可报名',
-            duration:3000
+            icon:'none',
+            duration:4000
+          })
+          that.setData({
+            isMoreBool:false
+          })
+        }else{
+          that.setData({
+            isMoreBool:true
           })
         }
-        that.setData({
-          isMoreBool:false
-        })
+     
       }
     }).catch(err => {
       wx.showToast({
@@ -139,7 +145,7 @@ Page({
     console.log(url,'url');
     let meetingId = url.split('=')[1]
     console.log(meetingId,'meetingId');
-    this.queryMeetingDetail(meetingId)
+    this.queryMeetingDetail('1455716624649428994')
   },
 
   /**
diff --git a/pages/signUpEntrance/signUpEntrance.wxml b/pages/signUpEntrance/signUpEntrance.wxml
index 2b980db..a544f4e 100644
--- a/pages/signUpEntrance/signUpEntrance.wxml
+++ b/pages/signUpEntrance/signUpEntrance.wxml
@@ -64,11 +64,11 @@
       <text>会议内容</text>
       <text class="sign-in-text">{{meetingDetailIngfo.meetingContent}}</text>
     </view>
-    <view class="meeting-files" wx:if="{{meetingFilesList.length >  0}}">
-      <text>会议通知</text>
+    <view class="meeting-files" wx:if="{{meetingFilesList.length > 0}}">
+      <text class="file-title">会议通知</text>
       <view class="file-name" wx:for="{{meetingFilesList}}" wx:key="item">
         <view>
-          <image src="../../assets/images/pdf.png"></image>
+          <image src="../../assets/images/pdf.png" class='file-img'></image>
           <text>{{item.name}}</text>
         </view>
         <text class="look-file" bindtap='preview' data-file="{{item}}">查看</text>
@@ -86,7 +86,7 @@
       </view>
     </view>
 <!-- 会议费为0 不显示  -->
-    <view class="form-payQrCode" wx:if="{{meetingDetailIngfo.meetingCosts !== '0.00' }}">
+    <view class="form-payQrCode" wx:if="{{meetingDetailIngfo.meetingCosts !== '0.00' && meetingDetailIngfo.paymentQrCode }}">
       <text style="padding-left:15px">缴费二维码</text>
       <view>
         <image class="payQrCode" src='{{payOrCode}}'></image>
diff --git a/pages/signUpEntrance/signUpEntrance.wxss b/pages/signUpEntrance/signUpEntrance.wxss
index f5990b9..f55b4fb 100644
--- a/pages/signUpEntrance/signUpEntrance.wxss
+++ b/pages/signUpEntrance/signUpEntrance.wxss
@@ -55,7 +55,7 @@ page{
 }
 .file-name view{
   padding: 0;
-  height: 30px;
+  height: auto!important;
   line-height: 30px;
   border-bottom: 0;
 }
@@ -65,6 +65,8 @@ page{
   margin-right: 10px;
 }
 .basic-info .meeting-files .file-name .look-file{
+  min-width: 45px;
+  text-align:center;
   color: #069F99;
 }
 .warning-text{