master

src/components/detail/group/togroup.js

@@ -2,12 +2,13 @@ import React, { Component } from 'react'
 import './togroup.scss'
 import { HeaderBar, VList } from '../../../common'
 
-import { api, getParam, http, browser} from "@/utils";
+import { getParam, http, browser} from "@/utils";
 import { connect } from "react-redux"
 import { Link } from "react-router-dom"
 import { WingBlank, WhiteSpace, Flex, Toast } from 'antd-mobile'
+import {getCourses} from './../../detail/actions';
 
-
+@connect()
 class ToGroup extends Component {
     constructor(props) {
         super(props)

src/components/detail/index.js

@@ -38,7 +38,8 @@ class Detail extends Component {
             this.props.getCourses();
         }
         const { courseInfo } = this.props;
-        if(courseInfo.is_bargain) {
+        console.log(this.props);
+        if(courseInfo.course_info.is_bargain) {
             this.getBargainInfo();
         }
     }

src/components/my/index.js

@@ -7,10 +7,14 @@ import {WithTab} from '@/HOCs'
 import {Link} from "react-router-dom"
 import {connect} from "react-redux"
 import {HeaderBar} from "@/common"
+import {getCourses} from './../detail/actions';
 
 const Item = List.Item;
 const Brief = Item.Brief;
 
+@connect(state => ({
+    user: state.user
+}))
 class My extends PureComponent {
     constructor(props) {
         super(props)
@@ -24,6 +28,14 @@ class My extends PureComponent {
         this.props.history.push('/passport')
     }
 
+    toCourseDetail = (id) => {
+        const { dispatch, history } = this.props;
+        dispatch(getCourses(id, () => {
+            history.push(`/detail?id=${id}`);
+            return false;
+        }));
+    }
+
     render() {
         const {user} = this.props
         const uid = user && user.data && user.data.uid
@@ -64,7 +76,8 @@ class My extends PureComponent {
                 </Link>
                 {
                     (isVIP === 0 || !isVIP) &&
-                    <Link className="my-isvip" to={`/detail?id=139`}></Link>
+                    <a href="javascript:;" className="my-isvip" onClick={() => this.toCourseDetail(139)}></a>
+                    // <Link className="my-isvip" to={`/detail?id=139`}></Link>
                 }
             </List>
         }
@@ -127,7 +140,4 @@ class My extends PureComponent {
 
 }
 
-export default connect(
-    state => ({user: state.user}),
-    null
-)(WithTab(My))
+export default WithTab(My);

src/components/order/index.js

@@ -127,7 +127,7 @@ class Order extends Component {
         if(res.data.errno === 200) {
           sessionStorage.removeItem('orderUseCacheObj');
           if (res.data.data.pay_jump === 1) {
-            this.props.history.push(`/togroup?id=${res.data.data.order_id}`);
+            this.props.history.push(`/togroup?id=${res.data.data.oid}`);
             return;
           }
           this.props.history.replace(`/payorder?oid=${res.data.data.oid}`);

src/components/passport/accountLogin/accountLogin.scss

@@ -32,4 +32,13 @@
         }
 
     }
+
+    .lock-icon{
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        left: 10px;
+        font-size: 22px;
+    }
+
 }
\ No newline at end of file

src/components/passport/accountLogin/index.js

@@ -50,6 +50,9 @@ class AccountLogin extends PureComponent {
                                 {...field}
                                 autoComplete={'on'}
                                 placeholder={'密码'}
+                                icon={
+                                    <i className={'iconfont iconiconfront-74 lock-icon'}/>
+                                }
                             />
                         )}
                     />

src/components/passport/common/passwordInput/index.js

@@ -24,9 +24,6 @@ class PasswordInput extends PureComponent {
                 wrapperClass={'password-input'}
                 placeholder={placeholder}
                 {...rest}
-                icon={
-                    <i className={'iconfont iconiconfront-74 lock-icon'}></i>
-                }
             >
                 <i className={classnames('iconfont', [this.state.showPassword ? 'iconpwd-hidden' : 'iconyanjing'])}
                    onClick={this.togglePasswordVisibility}/>

src/components/passport/common/passwordInput/password-input.scss

 .password-input {
     margin-bottom: 24px;
 
-    .iconfont{
+    .iconfont:last-child{
         position: absolute;
         top: 50%;
         transform: translateY(-50%);
         right: 16px;
         font-size: 20px;
     }
-    .lock-icon{
-        left: 10px;
-        font-size: 22px;
-    }
 }
\ No newline at end of file

src/components/scholarship/index.js

@@ -61,6 +61,15 @@ class _Scholarship extends Component {
     }
     // 提现按钮 根据是否在微信环境中显示提示
     drawCash = () => {
+        if (is_weixin()) {
+            this.setState({
+                drawCashWechat: true
+            });
+        } else {
+            this.setState({
+                drawCashHtml: true
+            });
+        }
         const {hasError, data = {}} = this.props.user;
         if(hasError) {
             Toast.info("请登录提现！", undefined, undefined, false);
@@ -68,16 +77,13 @@ class _Scholarship extends Component {
         }
 
         http.get(`${API['base-api']}/wx/user_temporary_qrcode/${data.uid}`).then(res => {
-            console.log(res)
             if(res.data.errno === 0) {
                 if (is_weixin()) {
                     this.setState({
-                        drawCashWechat: true,
                         codeSrc: res.data.data.qr_image
                     });
                 } else {
                     this.setState({
-                        drawCashHtml: true,
                         codeSrc: res.data.data.qr_image
                     });
                 }