139_修改

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) {