From ae7a2bbc6cb4cea2aa5cc7fff781bb9c90f46b22 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 30 Nov 2021 18:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meeting/meeting.js   |  2 +-
 pages/mine/mine.js         |  3 +-
 pages/scanSign/scanSign.js | 77 ++++++++++++++++++++++++++++++--------
 3 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index 36d46f7..150ce66 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -46,7 +46,7 @@ Page({
         onlyFromCamera: false,
         scanType: [],
         success: (result) => {
-          if (result.result.indexOf("scanSign") > -1) { // 证明是签到二维码
+          if (result.result.indexOf("scansign") > -1) { // 证明是签到二维码
             let meetingId = result.result.split("=")[1] // 会议Id
             // let meetingId = result.result // 会议Id
             // 成功扫码的回调
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index 98aabc8..c99aa16 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -65,7 +65,8 @@ Page({
         onlyFromCamera: false,
         scanType: [],
         success: (result) => {
-          if (result.result.indexOf("scanSign") > -1) { // 证明是签到二维码
+          console.log(result,'saoma result');
+          if (result.result.indexOf("scansign") > -1) { // 证明是签到二维码
             let meetingId = result.result.split("=")[1] // 会议Id
             // let meetingId = result.result // 会议Id
             // 成功扫码的回调
diff --git a/pages/scanSign/scanSign.js b/pages/scanSign/scanSign.js
index 29cf907..30c6abf 100644
--- a/pages/scanSign/scanSign.js
+++ b/pages/scanSign/scanSign.js
@@ -1,5 +1,8 @@
 import UserApi from '../../assets/js/http/userApi'
 import {baseUrl, URL_CONFIG} from '../../assets/js/project.config.js'
+import {
+  isLogin
+} from '../../assets/js/common'
 Page({
 
   /**
@@ -65,28 +68,72 @@ Page({
       wx.navigateTo({
         url: `../signUpPageGuoji/signUpPageGuoji?meetingId=${this.data.form.meetingId}`,
       })
-  
+
     }
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let meeting = JSON.parse(options.meeting)
-    let src
-    if(meeting.checkFile){ // 签到名回显
-      src = baseUrl + URL_CONFIG + 'sys/common/download/' + meeting.checkFile
-    }else{
-      src = ''
+
+    // 这里是 微信扫码进入的逻辑
+
+    // 微信扫码 判断是否登录
+    if(options.q) {
+      // 登录过的就直接签到 否则跳转登录页
+      isLogin( () => {
+        let url = decodeURIComponent(options.q)
+        let meetingId = url.split('=')[1]
+        // 通过会议id 获取签到信息
+        UserApi.scanCode({
+          meetingId
+        }).then(res => {
+          if (res.success) {
+            this.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 {
+            // 未查到报名信息
+            this.setData({
+              isSigned: 0,
+
+            })
+          }
+        }).catch(err => {})
+      })
+    }
+
+    // 这里是小程序内部的扫码签到
+    if(options.meeting){
+      let meeting = JSON.parse(options.meeting)
+      let src
+      if(meeting.checkFile){ // 签到名回显
+        src = baseUrl + URL_CONFIG + 'sys/common/download/' + meeting.checkFile
+      }else{
+        src = ''
+      }
+      this.setData({
+        isSigned: options.signed,
+        src
+      })
+      let form = JSON.parse(options.meeting)
+      this.setData({
+        form
+      })
     }
-    this.setData({
-      isSigned: options.signed,
-      src
-    })
-    let form = JSON.parse(options.meeting)
-    this.setData({
-      form
-    })
   },
 
   /**