合并分支 'liuzhen' 到 'master'

支付调试



查看合并请求 !23

@@ -186,7 +186,7 @@ class Store extends Api
             $prepayId = $order_result->prepay_id;
             $prepayId = $order_result->prepay_id;
             $pay_data = $payment->configForJSSDKPayment($prepayId);
             $pay_data = $payment->configForJSSDKPayment($prepayId);
         } else {
         } else {
-            $this->error($order_result['return_msg']);
+            $this->error($order_result['return_msg'],$order_result['return_msg']);
         }
         }
         Db::startTrans();
         Db::startTrans();
         $result = false;
         $result = false;