diff --git a/assets/images/signupSuccess.png b/assets/images/signupSuccess.png
new file mode 100644
index 0000000..d219298
Binary files /dev/null and b/assets/images/signupSuccess.png differ
diff --git a/pages/cannotSignUp/cannotSignUp.js b/pages/cannotSignUp/cannotSignUp.js
new file mode 100644
index 0000000..16be78d
--- /dev/null
+++ b/pages/cannotSignUp/cannotSignUp.js
@@ -0,0 +1,66 @@
+// pages/cannotSignUp/cannotSignUp.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/cannotSignUp/cannotSignUp.json b/pages/cannotSignUp/cannotSignUp.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/cannotSignUp/cannotSignUp.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/cannotSignUp/cannotSignUp.wxml b/pages/cannotSignUp/cannotSignUp.wxml
new file mode 100644
index 0000000..d91ad43
--- /dev/null
+++ b/pages/cannotSignUp/cannotSignUp.wxml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+ 报名未开始或已结束
+
+
+
+
+
+
+
diff --git a/pages/cannotSignUp/cannotSignUp.wxss b/pages/cannotSignUp/cannotSignUp.wxss
new file mode 100644
index 0000000..e331ab0
--- /dev/null
+++ b/pages/cannotSignUp/cannotSignUp.wxss
@@ -0,0 +1,41 @@
+/* pages/cannotSignUp/cannotSignUp.wxss */
+
+/* pages/signUpSuccess/signUpSuccess.wxss */
+
+
+/* 不需要审核的报名提示样式 */
+.audit {
+ text-align: center;
+ width: 100%;
+ margin-top: 100px;
+ font-size: 16px;
+}
+.audit image.img {
+ width: 156px;
+ height: 146px;
+ max-width: 100%;
+ margin-bottom: 10px;
+}
+/* 需要审核的样式 */
+
+/* 我知道了的样式 */
+
+.exit-wrap {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-left: -50px;
+}
+
+.exit {
+ margin: 0 auto;
+ text-align: center;
+ color: #fff;
+ width: 100px;
+ height: 30px;
+ line-height: 30px;
+ border-radius: 4px;
+ letter-spacing: 2px;
+ background: #069F99;
+}
+
diff --git a/pages/home/home.js b/pages/home/home.js
index 155392e..20f8b70 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,4 +1,5 @@
import UserApi from '../../assets/js/http/userApi'
+import MeetingApi from '../../assets/js/http/meetingApi'
// pages/home/home.js
Page({
@@ -106,10 +107,34 @@ Page({
const meetingId = JSON.parse(e.currentTarget.dataset.message.busId).id
if(templateCode == 'QY_1_HYTZ_WORK_GROUP_CREATE'){ // 去报名页
// 需要调用会议详情的接口 判断该会议是否还在报名时间内 并跳转不同的页面或者操作
- wx.navigateTo({
- // 这里传入的是会议id
- url: `../signUpPage/signUpPage?meetingId=${meetingId}&type=indexMsg`,
+ MeetingApi.meetingDetail({id:meetingId}).then(res => {
+ if(res.success){
+ let flag = this.judgeCurrentTime(res.result.registerDeadline)
+ if(flag){
+ // 超过报名时间了
+ wx.navigateTo({
+ // 这里传入的是会议id
+ url: `../cannotSignUp/cannotSignUp`,
+ })
+ }else{
+ wx.navigateTo({
+ // 这里传入的是会议id
+ url: `../signUpPage/signUpPage?meetingId=${meetingId}&type=indexMsg`,
+ })
+ }
+ }
})
+
+ }
+ },
+ // 判断当前时间与会议报名截止时间
+ judgeCurrentTime(time){
+ let date = new Date();
+ let compareTime = new Date(time)
+ if(date.getTime() > compareTime.getTime()){
+ return true
+ }else{
+ return false
}
},
// 类型选中
diff --git a/pages/signUpSuccess/signUpSuccess.wxml b/pages/signUpSuccess/signUpSuccess.wxml
index b91e17d..e88131f 100644
--- a/pages/signUpSuccess/signUpSuccess.wxml
+++ b/pages/signUpSuccess/signUpSuccess.wxml
@@ -3,13 +3,13 @@
-
-
+
+
报名成功,请按时参会
-
+
报名成功,请等待管理员审核
审核通过后会发送短信提醒通知报名成功,即可参会。
diff --git a/pages/signUpSuccess/signUpSuccess.wxss b/pages/signUpSuccess/signUpSuccess.wxss
index 3394995..28311a1 100644
--- a/pages/signUpSuccess/signUpSuccess.wxss
+++ b/pages/signUpSuccess/signUpSuccess.wxss
@@ -9,8 +9,8 @@
font-size: 16px;
}
.audit image.img {
- width: 60px;
- height: 60px;
+ width: 156px;
+ height: 146px;
max-width: 100%;
margin-bottom: 10px;
}