合并分支 'wxg' 到 'master'

订单模块问题修改



查看合并请求 !68

@@ -196,7 +196,7 @@ class Member extends Frontend
             $return = [
             $return = [
                 'pay_type' => $order['pay_type'],
                 'pay_type' => $order['pay_type'],
                 'order_id'=>$param['order_id'],
                 'order_id'=>$param['order_id'],
-                'url'=>url("index/order/pay",array('order_id'=>$param['order_id']),false,true)
+                'url'=>url("index/order/pay",array('order_detail_id'=>$param['order_id']),false,true)
             ];
             ];
             $this->success('SUCCESS','',$return);
             $this->success('SUCCESS','',$return);
         }
         }

@@ -1086,7 +1086,8 @@
                     }else if(e.data.pay_type == 2){
                     }else if(e.data.pay_type == 2){
                         //支付宝支付
                         //支付宝支付
                         order_id = e.data.order_id;
                         order_id = e.data.order_id;
-                        window.open(e.data.url);
+                        console.log(e);
+                        // window.open(e.data.url);
                     }
                     }
                 } else {
                 } else {
                     toast(e.msg);
                     toast(e.msg);