update:代码更新

src/views/signIn/Index.vue

@@ -61,23 +61,31 @@ export default {
         console.log(res);
         if (res.code == 0) {
           this.signInfo = res.data; //获取签到详情数据
-          this.status = !!this.signInfo.student.sign_in_status
+          this.status = !!this.signInfo.student.sign_in_status;
           if(this.status){
           this.popupVisible = true;
             return
           }
           let time = new Date().getTime(); //获取当前时间戳
+          let end_time = new Date(this.signInfo.end_time).getTime(); //签到开始
           let sign_start_time = new Date(this.signInfo.sign_start_time).getTime(); //签到开始
+          let sign_end_time = new Date(this.signInfo.sign_end_time).getTime(); //签到开始
           if (this.signInfo.sign_start_time !== "" && this.signInfo.sign_end_time !== "") {
             //限制签到时间
             if (time < sign_start_time) {
               Toast.fail(`该活动将于${this.signInfo.sign_start_time}开始签到`);
-            } else {
-              this.getSignIn(); //调用签到接口
+            } else if (this.status == false && time >= sign_end_time) {
+              Toast.fail(`该活动已于${this.signInfo.sign_end_time}结束签到`);
+            } else{
+              this.getSignIn();
             }
           } else {
             //不限制签到时间
-            this.getSignIn();
+            if (this.status != !!this.signInfo.student.sign_in_status && time >= end_time) {
+              Toast.fail("该活动已结束签到");
+            }else{
+              this.getSignIn();
+            }
           }
         } else {
           Toast.fail(res.message);
@@ -90,22 +98,8 @@ export default {
       signIn(id).then((res) => {
         if (res.code == 0) {
           this.status = res.data.status; //签到状态
-          let time = new Date().getTime(); //获取当前时间戳
-          let end_time = new Date(this.signInfo.sign_end_time).getTime(); //活动结束
-          let sign_start_time = new Date(this.signInfo.sign_start_time).getTime();
-          let sign_end_time = new Date(this.signInfo.sign_end_time).getTime(); //签到结束
-          if (this.signInfo.sign_start_time !== "" &&this.signInfo.sign_end_time !== "") {
-            if (this.status == false && time >= sign_end_time) {
-              Toast.fail(`该活动已于${this.signInfo.sign_end_time}结束签到`);
-            } else if (this.status == true &&time < sign_end_time &&time > sign_start_time) {
-              Toast.success("您已签到成功");
-            }
-          } else {
-            if (this.status == false && time >= end_time) {
-              Toast.fail("该活动已结束签到");
-            } else if (this.status == true && time < end_time) {
-              Toast.success("您已签到成功");
-            }
+          if(this.status == true){
+            Toast.success('签到成功');
           }
         } else {
           Toast.fail(res.message);