139_修改

component/AloneStudy/JiShi/index.js

@@ -28,7 +28,7 @@ class JiShi extends Component {
       rDisplay: null,
       state1: 0,
       state: 0,
-      dao: null,
+      dao: 0,
       start: null,
       end: null,
       id: 1,
@@ -40,7 +40,7 @@ class JiShi extends Component {
     this.f = 0;
     this.s1 = 59;
     this._timer = null;
-    this.dao1 = this.state.dao;
+    this.dao1 = this.state.dao - 1;
     this.lastClickTime = 0;
   }
   //引入提示语设置
@@ -95,7 +95,7 @@ class JiShi extends Component {
     }
     if (
       this.state.state1 == 1 &&
-      (this.state.dao == null || this.state.dao == 0 || this.state.dao > 1440)
+      (this.state.dao == 0 || this.state.dao > 1440)
     ) {
       alert('请先输入倒计时分钟');
       this.lastClickTime = 0;
@@ -123,14 +123,14 @@ class JiShi extends Component {
             tDisplay: null,
             state: 1,
           });
-          if (this.s1 == 0 && this.state.dao == 0) {
+          if (this.state.data == 0 && this.state.data1 == 0) {
             this.setState({
               tDisplay: 'none',
               jDisplay: null,
               end: this.getMyDate(),
             });
             this._timer && clearInterval(this._timer);
-          } else if (this.state.data == 0) {
+          } else if (this.s1 == 0) {
             this.state.dao--;
             this.s1 = 59;
           } else {
@@ -152,6 +152,7 @@ class JiShi extends Component {
     });
   }
   onSelect(index, value) {
+    if (this.lastClickTime == 1) return '';
     if (index == 1) {
       this.setState({state1: index, sDisplay: null, rDisplay: 'none'});
     } else if (index == 0) {

component/AloneStudy/meditation/index.js

@@ -136,14 +136,14 @@ class Meditation extends Component {
             tDisplay: null,
             state: 1,
           });
-          if (this.s1 == 0 && this.state.dao == 0) {
+          if (this.state.data == 0 && this.state.data1 == 0) {
             this.setState({
               tDisplay: 'none',
               jDisplay: null,
               end: this.getMyDate(),
             });
             this._timer && clearInterval(this._timer);
-          } else if (this.state.data == 0) {
+          } else if (this.s1 == 0) {
             this.state.dao--;
             this.s1 = 59;
           } else {
@@ -166,6 +166,7 @@ class Meditation extends Component {
     });
   };
   onSelect(index, value) {
+    if (this.lastClickTime == 1) return '';
     if (index == 1) {
       this.setState({state1: index, sDisplay: null, rDisplay: 'none'});
     } else if (index == 0) {