直播见

src/App.js

@@ -35,8 +35,6 @@ class App extends Component {
         })
 
 
-
-
         //微信
         let code = getParam('code')
 
@@ -52,10 +50,10 @@ class App extends Component {
                         } else {
                             let user = this.transformWxUser(res)
                             let {role, uid, token} = data.data
-                            let expires = {expires: addDays(new Date(), 90)}
-                            cookie.set('role', role, expires)
-                            cookie.set('uid', uid, expires)
-                            cookie.set('token', token, expires)
+                            let expires = addDays(new Date(), 90)
+                            cookie.set('role', role, {expires, domain: '.julyedu.com', path: '/'})
+                            cookie.set('uid', uid, {expires, domain: '.julyedu.com', path: '/'})
+                            cookie.set('token', token, {expires, domain: '.julyedu.com', path: '/'})
                             this.props.setCurrentUser(user)
                         }
                     } else {

src/components/order/payOrder/PayOrder.js

@@ -109,13 +109,13 @@ export default class PayOrder extends Component {
     weixinPay = (orderId) => {
         // 微信内部-支付
         if (is_weixin()) {
-            window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(window.location.href + "&aa=bb").toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
+            window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(window.location.href + "&aa=bb&oid=" + orderId).toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
         } else {
             // 微信外部-支付
             http.get(`${API['base-api']}/pay/wxpay/wap_charge/oid/${orderId}`).then((res) => {
                 console.log(res);
                 if (res.data.errno === 0) {
-                    window.location.href = res.data.data.url + "&redirect_url=" + encodeURIComponent(window.location.href + "&weixinpay=1").toLowerCase();
+                    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)
                 }
@@ -152,7 +152,27 @@ export default class PayOrder extends Component {
     }
     // 支付完成之后获取状态
     payCallback = () => {
-        // 调到已购课程  /purchased 不需要传递任何参数
+        const _this = this;
+        // 支付回调
+        // 定时器轮训获取订单状态
+        _this.intervalPayStatus = setInterval(function(){
+            http.get(`${API.home}/m/orderState/oid/${getParam('oid')}`).then(res => {
+                if (res.data.errno === 401) {
+                    clearInterval(_this.intervalPayStatus);
+                    _this.intervalPayStatus = null;
+                    // 获取课程类型
+                    http.get(`${API.home}/m/app_order/detail/${getParam('oid')}`).then(res => {
+                        if(res.data.data.course_type === '2') {
+                            this.props.history.replace(`/togroup?id=${getParam('oid')}`);
+                        }else{
+                            // 跳转到已购课程  /purchased 不需要传递任何参数
+                            this.props.history.replace(`/purchased`);
+                        }
+
+                    });
+                }
+            })
+        }, 1000)
     }
 
     onBridgeReady = (data) => {