add

app/Http/Controllers/Admin/Furniture/Newgoods/CommentController.php

@@ -30,7 +30,8 @@ class CommentController extends Controller
         if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
         $query = $query->pushCriteria(new OrderBy($request['sort_field'],$request['sort_field_by']));
         }
-        $list = $query->paginate();
+        $list = $query->paginate(20);
+
         return view('admin.furniture.newgoods.comment.index',compact('list'));
     }
 

app/Http/Controllers/Admin/Furniture/Newgoods/InfoController.php

@@ -37,7 +37,7 @@ class InfoController extends Controller
         if (isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
             $query = $query->pushCriteria(new OrderBy($request['sort_field'], $request['sort_field_by']));
         }
-        $list = $query->paginate();
+        $list = $query->paginate(20);
         return view('admin.furniture.newgoods.info.index', compact('list'));
     }
 

app/Http/Controllers/Api/V1/FurnitureController.php

@@ -646,6 +646,7 @@ class FurnitureController extends Controller
         $list = FurnitureNewgoodsInfoModel::where('store_id', $store_id)->orderBy('sort', 'desc')->paginate(10);
         foreach ($list as $item) {
             $item->comments_total = $item->comments->count();
+            unset($item->comments);
         }
         return $this->api($list);
     }
@@ -693,6 +694,12 @@ class FurnitureController extends Controller
      * "comments_field_3": 3,
      * "comments_field_4": 3,
      * "content": "第一条评价",         //评价详情
+     *  "picture": [                  //图片
+     *      "https://t6.9026.com/upload/img/20181119/4ee5baa103921e9d40e1c291d3c64f29.jpg",
+     *      "https://t6.9026.com/upload/img/20181119/4ee5baa103921e9d40e1c291d3c64f29.jpg",
+     *      "https://t6.9026.com/upload/img/"
+     * ],
+     * "response": null,                //商家回复
      * "created_at": null,
      * "updated_at": null,
      * "store_id": 1,
@@ -732,6 +739,7 @@ class FurnitureController extends Controller
         foreach ($comments as $item) {
             $item->username = $item->user->username;
             $item->avatar = $item->user->avatar;
+            $item->picture = explode(',', $item->picture);
             unset($item->user);
         }
 
@@ -747,7 +755,7 @@ class FurnitureController extends Controller
      * @api {post} /api/furniture/newgoods_addcomment 新品发布添加评论
      * @apiDescription 添加评论(newgoods_addcomment)
      * @apiGroup Furniture
-     * @apiPermission none
+     * @apiPermission passport
      * @apiVersion 0.1.0
      * @apiParam {int}    store_id  商户id 模拟值为1
      * @apiParam {int}    newgoods_id  新品id 模拟值为1
@@ -831,7 +839,7 @@ class FurnitureController extends Controller
      * @api {post} /api/furniture/newgoods_addbooking 新品发布添加预售
      * @apiDescription 添加预售(newgoods_addbooking)
      * @apiGroup Furniture
-     * @apiPermission none
+     * @apiPermission passport
      * @apiVersion 0.1.0
      * @apiParam {int}    store_id  商户id 模拟值为1
      * @apiParam {int}    newgoods_id  新品id 模拟值为1

app/Models/FurnitureNewgoodsCommentModel.php

@@ -41,7 +41,9 @@ class FurnitureNewgoodsCommentModel extends BaseModel
         'comments_field_3',
         'comments_field_4',
         'content',
-        'store_id'
+        'store_id',
+        'picture',
+        'response'
     ];
 
     public function user(){

database/migrations/2018_12_20_174352_add_response_to_furniture_newsgoods_comment.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddResponseToFurnitureNewsgoodsComment extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('furniture_newgoods_comment', function (Blueprint $table) {
+            $table->string('response')->after('picture')->nullable()->comment('商家回复');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('furniture_newgoods_comment', function (Blueprint $table) {
+            //
+        });
+    }
+}

public/apidoc/api_project.js

@@ -1 +1 @@
-define({
  "name": "模板1",
  "version": "0.1.0",
  "description": "模板1接口",
  "title": "MB",
  "url": "https://t6.9026.com",
  "sampleUrl": false,
  "defaultVersion": "0.0.0",
  "apidoc": "0.3.0",
  "generator": {
    "name": "apidoc",
    "time": "2018-12-20T09:14:44.182Z",
    "url": "http://apidocjs.com",
    "version": "0.17.6"
  }
});
+define({
  "name": "模板1",
  "version": "0.1.0",
  "description": "模板1接口",
  "title": "MB",
  "url": "https://t6.9026.com",
  "sampleUrl": false,
  "defaultVersion": "0.0.0",
  "apidoc": "0.3.0",
  "generator": {
    "name": "apidoc",
    "time": "2018-12-20T09:54:31.943Z",
    "url": "http://apidocjs.com",
    "version": "0.17.6"
  }
});

public/apidoc/api_project.json

@@ -1 +1 @@
-{
  "name": "模板1",
  "version": "0.1.0",
  "description": "模板1接口",
  "title": "MB",
  "url": "https://t6.9026.com",
  "sampleUrl": false,
  "defaultVersion": "0.0.0",
  "apidoc": "0.3.0",
  "generator": {
    "name": "apidoc",
    "time": "2018-12-20T09:14:44.182Z",
    "url": "http://apidocjs.com",
    "version": "0.17.6"
  }
}
+{
  "name": "模板1",
  "version": "0.1.0",
  "description": "模板1接口",
  "title": "MB",
  "url": "https://t6.9026.com",
  "sampleUrl": false,
  "defaultVersion": "0.0.0",
  "apidoc": "0.3.0",
  "generator": {
    "name": "apidoc",
    "time": "2018-12-20T09:54:31.943Z",
    "url": "http://apidocjs.com",
    "version": "0.17.6"
  }
}

resources/views/admin/album/comments/edit.blade.php

@@ -2,87 +2,93 @@
 
 @section('content')
 
-<?php
-    if(!isset($data)) $data = array();
-    if(!$data && session("data")){
+    <?php
+    if (!isset($data)) $data = array();
+    if (!$data && session("data")) {
         $data = session("data");
     }
-    if(!$data && session('_old_input')){
+    if (!$data && session('_old_input')) {
         $data = session("_old_input");
     }
-?>
-<div class="wrapper wrapper-content animated fadeInRight">
-	<div class="row">
-		<div class="col-sm-12">
-			<div class="ibox float-e-margins">
-				<div class="ibox-title">
-					<h5>评论管理</h5>
-					<div class="ibox-tools">
-						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
-						</a>
-					</div>
-				</div>
-				<div class="ibox-content">
-                    @if(role('Album/Comments/index'))
-				    <div class="row">
-    					<div class="col-sm-3 pull-right">
-    					   <a href="{{ U('Album/Comments/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
-    					</div>
-					</div>
-                    @endif
-
-		            <div class="row">
-                        <div class="col-lg-10">
-                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
-
-
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">用户昵称</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_user_id" class="form-control" readonly value="{{ $data->username() }}" placeholder="">
+    ?>
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox float-e-margins">
+                    <div class="ibox-title">
+                        <h5>评论管理</h5>
+                        <div class="ibox-tools">
+                            <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+                            </a>
+                        </div>
                     </div>
-                                
-                </div>
-            <div class="form-group">
+                    <div class="ibox-content">
+                        @if(role('Album/Comments/index'))
+                            <div class="row">
+                                <div class="col-sm-3 pull-right">
+                                    <a href="{{ U('Album/Comments/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+                                </div>
+                            </div>
+                        @endif
 
-                <label class="control-label col-sm-3">用户评论内容</label>
+                        <div class="row">
+                            <div class="col-lg-10">
+                                <form name="form_product" id="form-validation" action=""
+                                      class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
 
-                <div class="col-sm-9">
-                    <textarea style="resize: none" readonly  class="form-control" rows="5">{{ $data['content'] or ''}}</textarea>
-                </div>
 
-            </div>
-            <div class="form-group">
-                 <label class="control-label col-sm-3">评论内容</label>
-                                    
-                   <div class="col-sm-9">
-                       <textarea name="data[sys_reply]" style="resize: none" required="" aria-required="true" class="form-control" rows="5">{{ $data['sys_reply'] or ''}}</textarea>
-                                            
-                    </div>
-                                
-            </div>
-                                
-                                <div class="form-group">
-                                    <label class="control-label col-sm-3">&nbsp;</label>
-                                    <div class="col-sm-9">
-                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
-                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
-                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
-                                        <input type="reset" class="btn btn-default" >
+                                    <div class="form-group">
+
+                                        <label class="control-label col-sm-3">用户昵称</label>
+
+                                        <div class="col-sm-9">
+                                            <input id="data_user_id" class="form-control" readonly
+                                                   value="{{ $data->username() }}" placeholder="">
+                                        </div>
+
                                     </div>
-                                </div>
-        
-                            </form>
+                                    <div class="form-group">
+
+                                        <label class="control-label col-sm-3">用户评论内容</label>
+
+                                        <div class="col-sm-9">
+                                            <textarea style="resize: none" readonly class="form-control"
+                                                      rows="5">{{ $data['content'] or ''}}</textarea>
+                                        </div>
+
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-3">评论内容</label>
+
+                                        <div class="col-sm-9">
+                                            <textarea name="data[sys_reply]" style="resize: none" required=""
+                                                      aria-required="true" class="form-control"
+                                                      rows="5">{{ $data['sys_reply'] or ''}}</textarea>
+
+                                        </div>
+
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-3">&nbsp;</label>
+                                        <div class="col-sm-9">
+                                            <input type="hidden" name="_referer"
+                                                   value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                            <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                            <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                            <input type="reset" class="btn btn-default">
+                                        </div>
+                                    </div>
+
+                                </form>
+                            </div>
+                            <!-- /.col-lg-10 -->
                         </div>
-                        <!-- /.col-lg-10 -->
+                        <!-- /.row -->
                     </div>
-                    <!-- /.row -->
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
+                </div>
+            </div>
+        </div>
+    </div>
 
 @endsection

resources/views/admin/furniture/newgoods/comment/edit.blade.php

@@ -2,126 +2,95 @@
 
 @section('content')
 
-<?php
-    if(!isset($data)) $data = array();
-    if(!$data && session("data")){
+    <?php
+    if (!isset($data)) $data = array();
+    if (!$data && session("data")) {
         $data = session("data");
     }
-    if(!$data && session('_old_input')){
+    if (!$data && session('_old_input')) {
         $data = session("_old_input");
     }
-?>
-<div class="wrapper wrapper-content animated fadeInRight">
-	<div class="row">
-		<div class="col-sm-12">
-			<div class="ibox float-e-margins">
-				<div class="ibox-title">
-					<h5>新品评价</h5>
-					<div class="ibox-tools">
-						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
-						</a>
-					</div>
-				</div>
-				<div class="ibox-content">
-                    @if(role('Furniture/Newgoods/Comment/index'))
-				    <div class="row">
-    					<div class="col-sm-3 pull-right">
-    					   <a href="{{ U('Furniture/Newgoods/Comment/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
-    					</div>
-					</div>
-                    @endif
-
-		            <div class="row">
-                        <div class="col-lg-10">
-                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
-
-                                    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">用户ID</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_user_id" name="data[user_id]" class="form-control" value="{{ $data['user_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">新品ID</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_newgoods_id" name="data[newgoods_id]" class="form-control" value="{{ $data['newgoods_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">评价条目1评分</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_comments_field_1" name="data[comments_field_1]" class="form-control" value="{{ $data['comments_field_1'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">评价条目2评分</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_comments_field_2" name="data[comments_field_2]" class="form-control" value="{{ $data['comments_field_2'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">评价条目3评分</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_comments_field_3" name="data[comments_field_3]" class="form-control" value="{{ $data['comments_field_3'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">评价条目4评分</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_comments_field_4" name="data[comments_field_4]" class="form-control" value="{{ $data['comments_field_4'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">评论详情</label>
-                                    
-                   <div class="col-sm-9">
-                     {!! ueditor('') !!}
-                                       
-                     <script id="container" name="data[content]" type="text/plain">{!! $data['content'] or '' !!}</script>
-                                            
+    ?>
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox float-e-margins">
+                    <div class="ibox-title">
+                        <h5>新品评价</h5>
+                        <div class="ibox-tools">
+                            <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+                            </a>
+                        </div>
                     </div>
-                                
-                </div>
-                                
-                                <div class="form-group">
-                                    <label class="control-label col-sm-3">&nbsp;</label>
-                                    <div class="col-sm-9">
-                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
-                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
-                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
-                                        <input type="reset" class="btn btn-default" >
-                                    </div>
+                    <div class="ibox-content">
+                        @if(role('Furniture/Newgoods/Comment/index'))
+                            <div class="row">
+                                <div class="col-sm-3 pull-right">
+                                    <a href="{{ U('Furniture/Newgoods/Comment/index')}}"
+                                       class="btn btn-sm btn-primary pull-right">返回列表</a>
                                 </div>
-        
-                            </form>
+                            </div>
+                        @endif
+
+
+                        <div class="row">
+                            <div class="col-lg-10">
+                                <form name="form_product" id="form-validation" action=""
+                                      class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+
+                                    <div class="form-group">
+
+                                        <label class="control-label col-sm-3">用户昵称</label>
+
+                                        <div class="col-sm-9">
+                                            <input id="data_user_id" class="form-control" readonly
+                                                   value="{{ $data->user->username }}" placeholder="">
+                                        </div>
+
+                                    </div>
+                                    <div class="form-group">
+
+                                        <label class="control-label col-sm-3">用户评论内容</label>
+
+                                        <div class="col-sm-9">
+                                            <textarea style="resize: none" readonly class="form-control"
+                                                      rows="5">{{ $data['content'] or ''}}</textarea>
+                                        </div>
+
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-3">回复</label>
+
+                                        <div class="col-sm-9">
+                                            <textarea name="data[response]" style="resize: none" required=""
+                                                      aria-required="true" class="form-control"
+                                                      rows="5">{{ $data['response'] or ''}}</textarea>
+
+                                        </div>
+
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-3">&nbsp;</label>
+                                        <div class="col-sm-9">
+                                            <input type="hidden" name="_referer"
+                                                   value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                            <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                            <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                            <input type="reset" class="btn btn-default">
+                                        </div>
+                                    </div>
+
+                                </form>
+                            </div>
+                            <!-- /.col-lg-10 -->
                         </div>
-                        <!-- /.col-lg-10 -->
+                        <!-- /.row -->
                     </div>
-                    <!-- /.row -->
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
+                </div>
+            </div>
+        </div>
+    </div>
 
 @endsection

resources/views/admin/furniture/newgoods/comment/index.blade.php

@@ -26,12 +26,7 @@
                                     </div>
                                 </div>
                             </form>
-                            @if(role('Furniture/Newgoods/Comment/create'))
-                                <div class="col-sm-3 pull-right">
-                                    <a href="{{ U('Furniture/Newgoods/Comment/create')}}"
-                                       class="btn btn-sm btn-primary pull-right">添加</a>
-                                </div>
-                            @endif
+
                         </div>
 
                         <table class="table table-striped table-bordered table-hover dataTables-example dataTable">
@@ -79,7 +74,7 @@
                                                     @if(role('Furniture/Newgoods/Comment/update'))
                                                         <li>
                                                             <a href="{{ U('Furniture/Newgoods/Comment/update',['id'=>$item->id])}}"
-                                                               class="font-bold">修改</a></li>
+                                                               class="font-bold">回复</a></li>
                                                     @endif
 
                                                     @if(role('Furniture/Newgoods/Comment/destroy'))