Browse Source

编辑优化

wufeng 2 years ago
parent
commit
340c428301
1 changed files with 3 additions and 3 deletions
  1. 3 3
      app/admin/controller/OrderImport.php

+ 3 - 3
app/admin/controller/OrderImport.php

@@ -178,8 +178,8 @@ class OrderImport extends Base
             'price',
             'num',
             'before_discount_all_price',
-            'activity_id',
-            'activity_name',
+            'activity_id' => 0,
+            'activity_name' => '',
             'mode',
             'order_remark',
             'contactor',
@@ -261,7 +261,7 @@ class OrderImport extends Base
 
             Db::rollback();
 
-            return error_show(1004, $exception->getMessage().'|'.$exception->getFile().'|'.$exception->getLine());
+            return error_show(1004, $exception->getMessage() . '|' . $exception->getFile() . '|' . $exception->getLine());
         }
 
     }