From 00b79140eca562e8720f74fd40b97c2e76536707 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Oct 2021 21:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=AD=BE=E5=88=B0=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cannotSignUp/cannotSignUp.wxml   |  2 +-
 pages/scanSign/scanSign.js             | 14 +++++++++++---
 pages/signUpEntrance/signUpEntrance.js |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pages/cannotSignUp/cannotSignUp.wxml b/pages/cannotSignUp/cannotSignUp.wxml
index d91ad43..2e4c9ea 100644
--- a/pages/cannotSignUp/cannotSignUp.wxml
+++ b/pages/cannotSignUp/cannotSignUp.wxml
@@ -4,7 +4,7 @@
   <!-- 不需要审核的显示 -->
   <view class="audit">
 
-    <image class="img" src="../../assets/images/signUpSuccess.png"></image>
+    <image class="img" src="../../assets/images/warning.png"></image>
     <view>报名未开始或已结束</view>
   </view>
 
diff --git a/pages/scanSign/scanSign.js b/pages/scanSign/scanSign.js
index ecfe435..7751d0d 100644
--- a/pages/scanSign/scanSign.js
+++ b/pages/scanSign/scanSign.js
@@ -56,9 +56,17 @@ Page({
   },
   // 去报名
   goSignUp(){
-    wx.navigateTo({
-      url: `../signUpPage/signUpPage?id=${meetingId}`,
-    })
+    // 国际研讨会去国际研讨会的报名
+    if(this.data.form.meetingType !== 3){
+      wx.navigateTo({
+        url: `../signUpPage/signUpPage?id=${this.data.form.meetingId}`,
+      })
+    }else{
+      wx.navigateTo({
+        url: `../signUpPageGuoji/signUpPageGuoji?id=${this.data.form.meetingId}`,
+      })
+  
+    }
   },
   /**
    * 生命周期函数--监听页面加载
diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js
index 52b85f9..6dc7316 100644
--- a/pages/signUpEntrance/signUpEntrance.js
+++ b/pages/signUpEntrance/signUpEntrance.js
@@ -53,6 +53,7 @@ Page({
     }).catch(err => {
       wx.showToast({
         title: '加载失败',
+        icon:'none'
       })
     })
   },