Merge branch 'master' of gitlab.julyedu.com:baiguangyao/mr-julyedu

src/components/detail/index.js

@@ -18,8 +18,6 @@ import {compose, bindActionCreators} from "redux";
 
 class Detail extends Component {
 
-    courseId
-
     constructor(props) {
         super(props)
         this.state = {
@@ -37,7 +35,10 @@ class Detail extends Component {
             countdown: '00:00:00',
             outList: [],
             list: [],
-            course: {}
+            course: {},
+
+            nowPrice: 0,
+            laterPrice: 0,
         }
     }
 
@@ -529,6 +530,8 @@ class Detail extends Component {
                     data={this.state.singMess}
                         singleType={singleType} 
                         videoId={this.state.singMess.video_id}
+                        nowPrice={this.state.nowPrice}
+                        laterPrice={this.state.laterPrice}
                         payCallBack={this.payCallBack}
                     />
                 }

src/components/passport/login/index.js

@@ -40,7 +40,6 @@ class Login extends Component {
                 window.location.assign(`${API["passport-api"]}/mob/qqlogin?redirect_url=${encodeURIComponent(redirectURI)}`);
                 break;
             default:
-                alert(item.url);
                 window.location.assign(item.url)
         }