123

application/api/controller/Order.php

@@ -47,7 +47,7 @@ class Order extends Base
             'sign_limits'     => 'require'
             'sign_limits'     => 'require'
         ]);
         ]);
         $res      = $validate->check(input('post.'));
         $res      = $validate->check(input('post.'));
-        if (!res) return ['code' => 1, 'msg' => $validate->getError()];
+        if (!$res) return ['code' => 1, 'msg' => $validate->getError()];
         $project = ProjectModel::get(input('post.pid'));
         $project = ProjectModel::get(input('post.pid'));
         if (!$project) {
         if (!$project) {
             return ['code' => 1, 'msg' => '该活动不存在'];
             return ['code' => 1, 'msg' => '该活动不存在'];
@@ -332,10 +332,10 @@ class Order extends Base
         $status = input('post.status/d', 1);
         $status = input('post.status/d', 1);
         $order  = OrderModel::where('status', $status)
         $order  = OrderModel::where('status', $status)
             ->where('uid', $this->userinfo[0])
             ->where('uid', $this->userinfo[0])
-            ->where('type', config('order_type.project'))
+            ->where('type', 1)
             ->page($p, $page)
             ->page($p, $page)
             ->select();
             ->select();
-        $order  = $order ? collection($order)->append(['status_info'])->toArray() : [];
+        $order  = $order ? collection($order)->toArray() : [];
         if (!$order) return ['code' => 1, 'msg' => '没有更多'];
         if (!$order) return ['code' => 1, 'msg' => '没有更多'];
         return ['code' => 0, 'msg' => 'success', 'data' => $order];
         return ['code' => 0, 'msg' => 'success', 'data' => $order];
     }
     }

application/api/controller/Project.php

@@ -353,6 +353,6 @@ class Project extends Base
             'remark'           => input('post.remark'),
             'remark'           => input('post.remark'),
             'uid'              => $this->userinfo[0]
             'uid'              => $this->userinfo[0]
         ]);
         ]);
-        return ['code' => 1, 'msg' => 'success'];
+        return ['code' => 0, 'msg' => '预约成功'];
     }
     }
 }
 }
\ No newline at end of file