From f0c90cbd890e7062973a61391bae441bc17ccf11 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 14 Dec 2021 11:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85=E5=8A=A0=E5=85=A5=E5=8F=AF?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingDetailSigned.js                    | 18 +++++++
 .../meetingDetailSigned.wxml                  |  4 +-
 pages/scanSign/scanSign.js                    | 50 ++++++++++++++++---
 3 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index a00762b..eaec02c 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -45,6 +45,7 @@ Page({
     signImgSrc: '',
     userId: '',
     form: {},
+    showSignInBtn:false, // 是否显示签到按钮
   },
 
   // 获取图片的id
@@ -276,6 +277,13 @@ Page({
       previewFile(fileObj.id, fileObj.name)
     }
   },
+  // 去签到 
+  toSignUp(){
+    let meetingId = this.data.meetingInfo.id
+    wx.navigateTo({
+      url: `../scanSign/scanSign?type=meetingDetail&meetingId=${meetingId}`,
+    })
+  },
 
   /**
    * 生命周期函数--监听页面加载
@@ -290,6 +298,16 @@ Page({
       meetingInfo: meetingInfo,
       paymentQrCodeSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + meetingInfo.paymentQrCode
     })
+    // 如果会议的报名状态是待签到则显示去签到按钮  这里暂时写个5  不知道待签到的报名状态是几 
+    if(this.data.meetingInfo.signUpStatus === 4){
+      this.setData({
+        showSignInBtn:true
+      })
+    }else{
+      this.setData({
+        showSignInBtn:false
+      })
+    }
 
     wx.getStorage({
       key: 'userInfo',
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index f581dee..994f99a 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -84,8 +84,10 @@
 	</view>
 	<!-- 报名信息begin -->
 	<view class="basic-info" style="margin-top: 10px;" wx:if="{{!(meetingInfo.meetingType == 3 && singInPersonInfo.identity === 1)}}">
-		<view class="title">
+		<view class="title to-signup">
 			<text>报名信息</text>
+			<!-- 不需要花钱的会议、打包的会议 报名完显示  花钱的会议 现场缴费需要审核凭证通过显示 汇款的报完名显示 -->
+			<view style="color:#069f99" bindtap="toSignUp" wx:if="{{showSignInBtn}}">去签到</view>
 		</view>
 		<view>
 			<text>参会单位</text>
diff --git a/pages/scanSign/scanSign.js b/pages/scanSign/scanSign.js
index 9b64a38..1f0adc3 100644
--- a/pages/scanSign/scanSign.js
+++ b/pages/scanSign/scanSign.js
@@ -88,10 +88,6 @@ Page({
         UserApi.scanCode({
           meetingId
         }).then(res => {
-          wx.showToast({
-            title: '获取签到信息...',
-            icon: 'loading'
-          })
           if (res.success) {
             that.setData({
               form:res.result
@@ -113,10 +109,6 @@ Page({
             that.setData({
               form:res.result
             })
-            wx.showToast({
-              title: '未查到报名信息...',
-              icon: 'loading'
-            })
             // 未查到报名信息
             that.setData({
               isSigned: 0,
@@ -125,6 +117,48 @@ Page({
         }).catch(err => {})
       })
     }
+    // 这里是会议详情的跳转签到
+    if(options.type === 'meetingDetail'){
+      let meetingId = options.meetingId
+      UserApi.scanCode({
+        meetingId
+      }).then(res => {
+        wx.showToast({
+          title: '获取签到信息...',
+          icon: 'loading'
+        })
+        if (res.success) {
+          that.setData({
+            form:res.result
+          })
+          let src
+          if(res.result.checkFile){ // 签到名回显
+            src = baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.checkFile
+          }else{
+            src = ''
+          }
+          this.setData({
+            isSigned: 1,
+            src
+          })
+          // wx.navigateTo({ // 已报名
+          //   url: `../scanSign/scanSign?signed=1&meeting=${result}`,
+          // })
+        } else {
+          that.setData({
+            form:res.result
+          })
+          wx.showToast({
+            title: '未查到报名信息...',
+            icon: 'loading'
+          })
+          // 未查到报名信息
+          that.setData({
+            isSigned: 0,
+          })
+        }
+      }).catch(err => {})
+    }
 
     // 这里是小程序内部的扫码签到
     if(options.meeting){