push

.gitignore

@@ -3,6 +3,7 @@ composer.lock
 *.log
 application/config.php
 application/database.php
+thinkphp
 runtime
 .env
 

application/Admin/controller/Order.php

@@ -17,7 +17,7 @@ class Order extends Base
         $page = isset($this->post['page']) && $this->post['page'] != "" ? intval($this->post['page']) : 1;
         $size = isset($this->post['size']) && $this->post['size'] != "" ? intval($this->post['size']) : 10;
         $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "";
-        $where = [];
+        $where = ["a.is_del"=>0];
         if ($status !== "") {
             $where['a.status'] = $status;
         }

application/database.php

@@ -13,7 +13,7 @@ return [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
-    'hostname'        => '192.168.10.210',
+    'hostname'        => '172.17.0.2',
     // 数据库名
     'database'        => 'fivechang',
     // 用户名
@@ -21,7 +21,7 @@ return [
     // 密码
     'password'        => '123456',
     // 端口
-    'hostport'        => '3307',
+    'hostport'        => '3306',
     // 连接dsn
     'dsn'             => '',
     // 数据库连接参数