diff --git a/epdc-resident-mp-yushan/subpages/heart/pages/heartDetail/heartDetail.js b/epdc-resident-mp-yushan/subpages/heart/pages/heartDetail/heartDetail.js
index 4894d4b..20f85e9 100644
--- a/epdc-resident-mp-yushan/subpages/heart/pages/heartDetail/heartDetail.js
+++ b/epdc-resident-mp-yushan/subpages/heart/pages/heartDetail/heartDetail.js
@@ -17,6 +17,7 @@ Page({
     dialogConfirmText: '',
     dialogCancelText: '',
     uservolunteerflag: '',
+    volunteerflag:"",
     cancelSignupVisible: false,
     cancelSignupTipValue: '',
     cancelSignupTipVisible: false
@@ -77,50 +78,72 @@ Page({
     // 2 - 待认证   提示用户去认证
     // 3 - 黑名单   提示用户已被拉入黑名单，不能报名
     const uservolunteerflag = e.currentTarget.dataset.uservolunteerflag
+    const volunteerflag = e.currentTarget.dataset.volunteerflag
     this.setData({
-      uservolunteerflag: uservolunteerflag
+      uservolunteerflag: uservolunteerflag,
+      volunteerflag:volunteerflag
     })
-    if (uservolunteerflag == 0) {
-      // this.setData({
-      //   dialogVisible: !this.data.dialogVisible,
-      //   dialogTitle: '正在审核',
-      //   dialogContent: ['志愿者身份审核中'],
-      //   dialogConfirmText: '确定',
-      //   dialogCancelText: ''
-      // })
-      this.setData({
-        dialogVisible: !this.data.dialogVisible,
-        dialogTitle: '报名提醒',
-        dialogContent: ['报名时间截止之前可取消', `缺席活动扣除${this.data.detail.punishmentPoints}积分，是否确定报名`],
-        dialogConfirmText: '是',
-        dialogCancelText: '否'
-      })
-    } else if (uservolunteerflag == 1) {
-      this.setData({
-        dialogVisible: !this.data.dialogVisible,
-        dialogTitle: '报名提醒',
-        dialogContent: ['报名时间截止之前可取消', `缺席活动扣除${this.data.detail.punishmentPoints}积分，是否确定报名`],
-        dialogConfirmText: '是',
-        dialogCancelText: '否'
-      })
-
-    } else if (uservolunteerflag == 2) {
-      this.setData({
-        dialogVisible: !this.data.dialogVisible,
-        dialogTitle: '志愿者认证',
-        dialogContent: ['是否认证志愿者,完成报名'],
-        dialogConfirmText: '是',
-        dialogCancelText: '否'
-      })
-    } else if (uservolunteerflag == 3) {
-      this.setData({
-        dialogVisible: !this.data.dialogVisible,
-        dialogTitle: '已被拉入黑名单',
-        dialogContent: ['您已被拉入黑名单，不能报名'],
-        dialogConfirmText: '确定',
-        dialogCancelText: ''
-      })
+    if(volunteerflag == "0"){
+      let id = this.data.id
+        api.signup(id).then(res => {
+          if (res.code == 0) {
+            this.setData({
+              dialogVisible: !this.data.dialogVisible,
+              dialogTitle: '报名成功',
+              dialogContent: ['正在审核中', '请耐心等待消息通知！'],
+              dialogConfirmText: '确定',
+              dialogCancelText: '',
+              uservolunteerflag: ''
+            })
+            this.getDetail()
+          } else { //点击我要报名，刚好已经报满，此时弹出已报满的提示框，点击确定后，我要报名按钮变成已报满按钮（置灰）
+            this.getDetail()
+          }
+        })
+    }else{
+      if (uservolunteerflag == 0) {
+        // this.setData({
+        //   dialogVisible: !this.data.dialogVisible,
+        //   dialogTitle: '正在审核',
+        //   dialogContent: ['志愿者身份审核中'],
+        //   dialogConfirmText: '确定',
+        //   dialogCancelText: ''
+        // })
+        this.setData({
+          dialogVisible: !this.data.dialogVisible,
+          dialogTitle: '报名提醒',
+          dialogContent: ['报名时间截止之前可取消', `缺席活动扣除${this.data.detail.punishmentPoints}积分，是否确定报名`],
+          dialogConfirmText: '是',
+          dialogCancelText: '否'
+        })
+      } else if (uservolunteerflag == 1) {
+        this.setData({
+          dialogVisible: !this.data.dialogVisible,
+          dialogTitle: '报名提醒',
+          dialogContent: ['报名时间截止之前可取消', `缺席活动扣除${this.data.detail.punishmentPoints}积分，是否确定报名`],
+          dialogConfirmText: '是',
+          dialogCancelText: '否'
+        })
+  
+      } else if (uservolunteerflag == 2) {
+        this.setData({
+          dialogVisible: !this.data.dialogVisible,
+          dialogTitle: '志愿者认证',
+          dialogContent: ['是否认证志愿者,完成报名'],
+          dialogConfirmText: '是',
+          dialogCancelText: '否'
+        })
+      } else if (uservolunteerflag == 3) {
+        this.setData({
+          dialogVisible: !this.data.dialogVisible,
+          dialogTitle: '已被拉入黑名单',
+          dialogContent: ['您已被拉入黑名单，不能报名'],
+          dialogConfirmText: '确定',
+          dialogCancelText: ''
+        })
+      }
     }
+    
   },
   //已报满
   signUpFull() {
diff --git a/epdc-resident-mp-yushan/subpages/heart/pages/heartDetail/heartDetail.wxml b/epdc-resident-mp-yushan/subpages/heart/pages/heartDetail/heartDetail.wxml
index 861a52f..ee3f974 100644
--- a/epdc-resident-mp-yushan/subpages/heart/pages/heartDetail/heartDetail.wxml
+++ b/epdc-resident-mp-yushan/subpages/heart/pages/heartDetail/heartDetail.wxml
@@ -199,7 +199,7 @@
 
     <block wx:if="{{detail.currentUserStatus == 0}}">
       <!-- 0-我要报名 -->
-      <view class="button-right" data-userVolunteerFlag="{{detail.userVolunteerFlag}}" bindtap="goVolunteer">
+      <view class="button-right" data-userVolunteerFlag="{{detail.userVolunteerFlag}}" data-volunteerflag="{{detail.volunteerFlag}}" bindtap="goVolunteer">
         <view class="button-right3">
           <view class="button1">
             <image class='header-bg' src="../../images/yuanjiao-red.png"></image>