Merge branch 'master' into 8.6

activityPages/specialDetail/specialDetail.vue

@@ -143,9 +143,11 @@ export default {
         ActivityId: this.detailData.ActivityId,
       });
       if (res.Ret === 200) {
-        this.detailData.IsSignup = 1;
         this.currentPages();
         this.modalShow(res);
+        if (res.Data.SignupStatus == 1) {
+          this.detailData.IsSignup = 1;
+        }
       }
     },
 

activityPages/specialResearchPage/specialResearchPage.vue

@@ -146,8 +146,10 @@ export default {
         ActivityId: item.ActivityId,
       });
       if (res.Ret === 200) {
-        item.IsSignup = 1;
         this.modalShow(res);
+        if (res.Data.SignupStatus == 1) {
+          item.IsSignup = 1;
+        }
       }
     },