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

src/components/detail/btnstatus/index.js

@@ -303,7 +303,7 @@ class BtnStatus extends Component {
 
                 {/*砍价*/}
                 {
-                    this.props.data && this.props.data.is_bargain &&
+                    info.is_baoming === 0 && this.props.data && this.props.data.is_bargain &&
                     <div className='btns-box'>
                         <a className='consult consult-s' href="https://q.url.cn/AB8aue?_type=wpa&qidian=true">
                             <i className='iconfont iconerji'></i>

src/components/detail/index.js

@@ -267,7 +267,7 @@ class Detail extends Component {
 
                 {/*砍价*/}
                 {
-                    (!courseInfo.is_aist) && this.props.courseInfo.course_info && this.props.courseInfo.course_info.is_bargain &&
+                    courseInfo.is_baoming === 0 && (!courseInfo.is_aist) && this.props.courseInfo.course_info && this.props.courseInfo.course_info.is_bargain &&
                     <Bargain/>
                 }
 

src/components/order/payOrder/PayOrder.js

@@ -117,7 +117,7 @@ export default class PayOrder extends Component {
                 if (res.data.errno === 0) {
                     window.location.href = res.data.data.url + "&redirect_url=" + encodeURIComponent(window.location.href + "&weixinpay=1&oid=" + orderId).toLowerCase();
                 } else {
-                    Toast.info(res.data.msg, 2)
+                    Toast.info(res.data.msg + 'weixinPay', 2)
                 }
             })
         }
@@ -131,8 +131,8 @@ export default class PayOrder extends Component {
             } else {
                 http.get(`${API['base-api']}/pay/wxpay/pub_charge/oid/${getParam('oid')}/code/${weixin_code}`).then((res) => {
                     if (res.data.errno === 0) {
-                        const data = res.data.data
-                        this.onBridgeReady(data)
+                        this.bridgeData = res.data.data;
+                        // this.onBridgeReady(data)
                         if (typeof WeixinJSBridge == "undefined") {
                             if (document.addEventListener) {
                                 document.addEventListener('WeixinJSBridgeReady', this.onBridgeReady, false)
@@ -144,7 +144,7 @@ export default class PayOrder extends Component {
                             this.onBridgeReady()
                         }
                     } else {
-                        Toast.info(res.data.msg, 2)
+                        Toast.info(res.data.msg + 'isweixinPay', 2)
                     }
                 })
             }
@@ -175,7 +175,9 @@ export default class PayOrder extends Component {
         }, 1000)
     }
 
-    onBridgeReady = (data) => {
+    onBridgeReady = () => {
+        const data = this.bridgeData;
+        console.log(this.bridgeData);
         WeixinJSBridge.invoke(
             'getBrandWCPayRequest', {
                 "appId": data.appId,                //公众号名称，由商户传入
@@ -200,7 +202,7 @@ export default class PayOrder extends Component {
             if (res.data.errno === 0) {
                 window.location = res.data.data.url;
             } else {
-                Toast.info(res.data.msg, 2)
+                Toast.info(res.data.msg + 'alipayPay', 2)
             }
         })
     }
@@ -214,7 +216,7 @@ export default class PayOrder extends Component {
             if (res.data.errno === 0) {
                 window.location = res.data.data.url;
             } else {
-                Toast.info(res.data.msg, 2)
+                Toast.info(res.data.msg + "huabeiPay", 2)
             }
         });
     }
@@ -224,7 +226,7 @@ export default class PayOrder extends Component {
         http.post(`${API['base-api']}/m/order/detail`, { order_id: this.state.orderId }).then((res) => {
             console.log(res);
             if (res.data.errno !== 200) {
-                Toast.info(res.data.msg, 2);
+                Toast.info(res.data.msg + 'componentDidMount', 2);
                 return;
             }
             const { course, pay_amount } = res.data.data;