pull and solve

src/assets/css/index.scss

@@ -28,9 +28,6 @@ $z-max: 999999; //为了应付某些插件z-index 值过高的问题
 // --------------------------------------------------
 
 //
-body {
-  position: relative;
-}
 html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
   border: 0 none;
   font-size: inherit;

src/components/coupons/myCoupons/index.js

@@ -53,42 +53,52 @@ class UseCoupon extends PureComponent {
         const {location: {state = {}}} = this.props;
         if (this.state.redeemCode !== '') {
             http.post(`${API.home}/m/coupon/exchange`, {
-                code: this.state.redeemCode
+                code: this.state.redeemCode,
+                type: state.from.substr(1)
             })
                 .then(res => {
                     const data = res.data
                     if (data.code === 200) {
-
+                        // 如果从我的页面进来，点击兑换直接兑换成功课程，弹出弹窗
+                        // 如果从订单页面进来，点击兑换兑换成券
                         const coupon = data.data
 
-                        if (coupon['ctype'] == 2) {
-                            this.setState({
-                                courseCouponData: coupon,
-                                courseCouponExchange: true,
-                                redeemCode: ''
-                            })
-                        } else {
-                            if (this.state.showUseButton) {
+                        if (state.from === '/my') {
+                            if (coupon['ctype'] == 2) {
                                 this.setState({
-                                    couponList: [...this.state.couponList, coupon],
+                                    courseCouponData: coupon,
+                                    courseCouponExchange: true,
                                     redeemCode: ''
                                 })
                             } else {
+                                this.setState({
+                                    couponList: [...this.state.couponList, coupon],
+                                    redeemCode: ''
+                                })
+                                Toast.info('兑换成功')
+                                this.getMyCoupons()
+                            }
+                        }
+                        if (state.from === '/order') {
+                            const coupon = data.data
 
-                                const coupon = data.data
+                            if (coupon['ctype'] == 2
+                                && coupon['limit_course'] != this.state.courseId) {
+                                this.setState({
+                                    invalid_coupons: [...this.state.invalid_coupons, coupon],
+                                    showUseButton: null,
+                                    redeemCode: ''
+                                });
+                            } else {
                                 this.setState({
                                     valid_coupons: [...this.state.valid_coupons, coupon],
                                     redeemCode: ''
                                 })
                             }
                             Toast.info('兑换成功')
-                            if (state.from === '/my') {
-                                this.getMyCoupons()
-                            }
-                            if (state.from === '/order') {
-                                this.getAllCoupons()
-                            }
+                            this.getAllCoupons()
                         }
+
                     } else {
                         Toast.info(data.msg)
                     }
@@ -136,15 +146,14 @@ class UseCoupon extends PureComponent {
     }
 
     // 立即兑换课程
-    toExchangeCourse = (e,code)=>{
+    toExchangeCourse = (e, code) => {
         e.stopPropagation();
-        http.post(`${API['base-api']}/pay/miandan/${code}`, {
-        }).then(res => {
+        http.post(`${API['base-api']}/pay/miandan/${code}`, {}).then(res => {
             const data = res.data
             if (data.errno === 200) {
                 this.setState({
                     courseCouponExchange: true,
-                    courseCouponData:res.data.data
+                    courseCouponData: res.data.data
                 })
                 this.getMyCoupons()
             } else {

src/components/passport/index.js

@@ -46,13 +46,13 @@ class Passport extends Component {
                 {
                     logo: qq,
                     text: 'QQ',
-                    url: `${API["passport-api"]}/mob/qqlogin?redirect_url=${this.redirectURL}`,
+                    url: `${API["passport-api"]}/mob/qqlogin?redirect_url=${encodeURIComponent(this.redirectURL)}`,
                     id: 'qq'
                 },
                 {
                     logo: sina,
                     text: '新浪',
-                    url: `${API['passport-api']}/mob/sinalogin?redirect_url=${this.redirectURL}`,
+                    url: `${API['passport-api']}/mob/sinalogin?redirect_url=${encodeURIComponent(this.redirectURL)}`,
                     id: 'sina'
                 }
             ]

src/components/study/freeCourses/index.js

@@ -70,7 +70,7 @@ class FreeCourse extends PureComponent {
     toLive = live => {
         const {room_id, live_status} = live
         if (live_status) {
-            window.location.assign(`http://www-test.julyedu.com/live/m_room/${room_id}`)
+            window.location.assign(`http://www.julyedu.com/live/m_room/${room_id}`)
         } else {
             Toast.info('直播即将开始，敬请期待', 2, null, false)
         }

src/components/video/index.js

@@ -591,6 +591,9 @@ class Video extends Component {
         let url = '';
         if (getParam('video_id')) {
             url = `${API.home}/m/course/play/${this.courseID + '?video_id=' + getParam('video_id')}`
+            http.post(`${API['base-api']}/sys/get_class_audition`, {
+                video_id: getParam('video_id')
+            })
         } else {
             url = `${API.home}/m/course/play/${this.courseID}`
         }