Merge branch 'master' of github.com:Patrick-Jun/PopRun-b

.env.example

@@ -1,4 +1,4 @@
-APP_NAME=Laravel
+APP_NAME=PopRun
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true

app/Http/Controllers/MomentsController.php

@@ -101,10 +101,9 @@ public function delMoment(Request $request)
         }
     }
 
-    // 发表评论 遗留：缺少判断是否存在moid
-    public function doComment(Request $request)
-    {
-        if ($request->has('rid') && $request->has('moid') && $request->has('comment')) {
+    // 发表评论
+    public function doComment(Request $request){
+        if($request->has('rid') && $request->has('moid') && $request->has('comment')){
             $comment = new Comments();
             $comment->fill([
                 'rid' => $request->rid,
@@ -137,6 +136,23 @@ public function doComment(Request $request)
         }
     }
 
+    // 删除评论
+    public function delComment(Request $request){
+        if($request->has('coid')){
+            DB::beginTransaction(); //事务开始
+            try {
+                Comments::where('coid', $request->coid)->delete(); //删除评论
+                DB::commit(); //提交事务
+                return returnData(true, "操作成功", null);
+            } catch (\Throwable $th) {
+                DB::rollback(); //回滚
+                return returnData(false, $th);
+            }
+        }else{
+            return returnData(false, "缺coid", null);
+        }
+    }
+
     // 点赞
     public function doLike(Request $request)
     {

public/resources/.gitignore

@@ -1,4 +1,5 @@
 images
+medals
 userImgs
 files
 !.gitignore

routes/api.php

@@ -88,6 +88,8 @@
     Route::post('/delMoment', 'MomentsController@delMoment');
     // 发表评论
     Route::post('/doComment', 'MomentsController@doComment');
+    // 删除评论
+    Route::get('delComment', 'MomentsController@delComment');
     // 点赞
     Route::post('/doLike', 'MomentsController@doLike');
     // 取消点赞