Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/admin/logic/OrderLogic.php

@@ -156,9 +156,9 @@ class OrderLogic extends BaseLogic
 
             if (empty($da)) throw new Exception('没有可供导出的数据');
         } catch (Exception $exception) {
-            $da[] = $exception->getMessage();
+            $da = [[$exception->getMessage()]];
         } catch (ValidateException $validateException) {
-            $da[] = $validateException->getError();
+            $da = [[$validateException->getError()]];
         }
         $headerArr = array_keys($da[0]);
         excel_save('订单导出' . date('YmdHis'), $headerArr, $da);

app/mobile/logic/OrderLogic.php

@@ -296,7 +296,7 @@ class OrderLogic extends BaseLogic
             return json_show(CommonModel::$success, '下单成功', $res);
         } catch (Exception $exception) {
             Db::rollback();
-            return json_show(CommonModel::$success, '下单失败,' . $exception->getMessage());
+            return json_show(CommonModel::$error_param, '下单失败,' . $exception->getMessage());
         }