1

app/Http/Controllers/Admin/Album/CatController.php

@@ -96,9 +96,6 @@ class CatController extends Controller
         $data = (array) request('data');
         $ids = request('id');
         $data['store_id'] = $this->getStoreId();
-        if (!empty($data['pic_url'])) {
-            $data['pic_url'] = $this->formatImgUrl($data['pic_url']);
-        }
         $data['parent_id'] = 0;
         $id = $this->repository->create($data);
         if ($ids == 0) {
@@ -153,6 +150,16 @@ class CatController extends Controller
         return view('admin.album.cat.edit', compact('data', 'cat'));
     }
 
+    public function updateFirst(Request $request)
+    {
+        if ($request->method() == 'POST') {
+            return $this->_updateSave();
+        }
+        $data = $this->repository->find($request->get('id'));
+
+        return view('admin.album.cat.edit-first', compact('data'));
+    }
+
     /**
      * 保存修改
      */

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

@@ -100,7 +100,7 @@ class AlbumPosterController extends Controller
     }
 
     /**
-     * @api {post} /api/album_post/download 生成海报(download)
+     * @api {post} /api/album_post/download 下载海报(download)
      * @apiDescription 生成海报(download)
      * @apiGroup Album_Post
      * @apiPermission 需要登录

public/apidoc/api_data.js

@@ -1727,7 +1727,7 @@ define({ "api": [
   {
     "type": "post",
     "url": "/api/album_post/download",
-    "title": "生成海报(download)",
+    "title": "下载海报(download)",
     "description": "<p>生成海报(download)</p>",
     "group": "Album_Post",
     "permission": [

public/apidoc/api_data.json

@@ -1727,7 +1727,7 @@
   {
     "type": "post",
     "url": "/api/album_post/download",
-    "title": "生成海报(download)",
+    "title": "下载海报(download)",
     "description": "<p>生成海报(download)</p>",
     "group": "Album_Post",
     "permission": [

public/apidoc/api_project.js

@@ -9,7 +9,7 @@ define({
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-05-30T08:33:02.131Z",
+    "time": "2019-05-30T10:01:27.015Z",
     "url": "http://apidocjs.com",
     "version": "0.17.6"
   }

public/apidoc/api_project.json

@@ -9,7 +9,7 @@
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-05-30T08:33:02.131Z",
+    "time": "2019-05-30T10:01:27.015Z",
     "url": "http://apidocjs.com",
     "version": "0.17.6"
   }

resources/views/admin/album/cat/edit-first.blade.php

@@ -48,31 +48,11 @@
                                 
                 </div>
 
-                <div class="form-group">
-                    <label class="control-label col-sm-3">父分类</label>
-
-                    <div class="col-sm-9">
-                        <select name="data[parent_id]" id="" class="form-control">
-                            <option value="0">顶级</option>
-                            @if(isset($cat))
-                                @foreach($cat as $key=>$val)
-                                            <option value="{{$val->id}}" @if($val['id'] == $data['parent_id'])selected @endif>{{$val->name}}</option>
-                                @endforeach
-                            @endif
-                        </select>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="control-label col-sm-3">图片(300*300)</label>
-                    <div class="col-sm-9">
-                        {!!  widget('Tools.ImgUpload')->single2('/upload/cat_pic_url','pic_url',"pic_url",  isset($data['pic_url'])? $data['pic_url'] : '',array("sizex"=>300,"sizey"=>300)) !!}
-                    </div>
-                </div>
-
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">排序</label>
-                                    <div class="col-sm-9">
-                                        <input id="data_sort" name="data[sort]" class="form-control" value="{{ $data['sort'] or ''}}" required="" aria-required="true"  placeholder="数值越大越靠前">
+                                    <div class="col-sm-5">
+                                        <input id="data_sort" name="data[sort]" class="form-control" value="{{ $data['sort'] or 0}}" required="" aria-required="true"  placeholder="数值越大越靠前">
+                                        <span class="help-block m-b-none">数值越大越靠前</span>
                                     </div>
                                 </div>
 

resources/views/admin/album/cat/index.blade.php

@@ -58,7 +58,7 @@
 									<td>
 										<div class="pull-left">
 											@if(role('Album/Cat/update'))
-												<a href="{{ U('Album/Cat/update',['id'=>$item->id])}}" class="btn btn-sm btn-warning pull-right">修改</a>
+												<a href="{{ U('Album/Cat/updateFirst',['id'=>$item->id])}}" class="btn btn-sm btn-warning pull-right">修改</a>
 											@endif
 											@if(role('Album/Cat/destroy'))
 												<a href="{{ U('Album/Cat/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>

resources/views/admin/album/news/index.blade.php

@@ -40,7 +40,7 @@
 
                                 <th class="sorting" data-sort="id">ID</th>
                                 <th class="sorting" data-sort="title"> 标题</th>
-                                <th class="sorting" data-sort="sort"> 排序：越大越靠前</th>
+                                <th class="sorting" data-sort="sort"> 排序</th>
                                 <th class="sorting" data-sort="created_at">创建时间</th>
                                 <th class="sorting" data-sort="updated_at">更新时间</th>
                                 <th width="22%">相关操作</th>
@@ -64,12 +64,13 @@
                                                 @if(role('Album/News/destroy'))
                                                     <a href="{{ U('Album/News/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
                                                 @endif
+                                                    @if(role('Album/News/view'))
+                                                        <a onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Album/News/view',['id'=>$item->id])}}'});"
+                                                           class="btn btn-sm btn-primary pull-right">查看
+                                                        </a>
+                                                    @endif
                                             </div>
-                                            @if(role('Album/News/view'))
-                                                <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Album/News/view',['id'=>$item->id])}}'});"
-                                                        class="btn btn-primary ">查看
-                                                </button>
-                                            @endif
+
                                         </td>
                                     </tr>
                                 @endforeach

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

@@ -64,11 +64,16 @@
                                         <td>
                                             <div class="pull-left">
                                                 @if(role('Furniture/Newgoods/Comment/update'))
-                                                    <a href="{{ U('Furniture/Newgoods/Comment/update',['id'=>$item->id])}}" class="btn btn-sm btn-warning pull-right">修改</a>
+                                                    <a href="{{ U('Furniture/Newgoods/Comment/update',['id'=>$item->id])}}" class="btn btn-sm btn-warning pull-right">回复</a>
                                                 @endif
                                                 @if(role('Furniture/Newgoods/Comment/destroy'))
                                                     <a href="{{ U('Furniture/Newgoods/Comment/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
                                                 @endif
+                                                    @if(role('Album/News/view'))
+                                                        <a onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Album/News/view',['id'=>$item->id])}}'});"
+                                                           class="btn btn-sm btn-primary pull-right">查看
+                                                        </a>
+                                                    @endif
                                             </div>
                                        {{--     @if(role('Furniture/Newgoods/Comment/view'))
                                                 <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Furniture/Newgoods/Comment/view',['id'=>$item->id])}}'});"

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

@@ -105,10 +105,11 @@
                 </div>    
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">排序，越大越靠前</label>
+                 <label class="control-label col-sm-3">排序</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_sort" name="data[sort]" class="form-control" value="{{ $data['sort'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <input id="data_sort" name="data[sort]" class="form-control" value="{{ $data['sort'] or 0}}" required="" aria-required="true"  placeholder="">
+                       <span class="help-block m-b-none">数值越大越靠前</span>
                     </div>
                                 
                 </div>

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

@@ -57,30 +57,16 @@
                                         <td>{{ $item->created_at }}</td>
                                         <td>{{ $item->updated_at }}</td>
                                         <td>
-                                            <div class="btn-group">
-                                                <button data-toggle="dropdown"
-                                                        class="btn btn-warning btn-sm dropdown-toggle"
-                                                        aria-expanded="false">
-                                                    操作 <span class="caret"></span>
-                                                </button>
-                                                <ul class="dropdown-menu">
-
-
-                                                    @if(role('Furniture/Newgoods/Info/update'))
-                                                        <li>
-                                                            <a href="{{ U('Furniture/Newgoods/Info/update',['id'=>$item->id])}}"
-                                                               class="font-bold">修改</a></li>
-                                                    @endif
+                                            @if(role('Furniture/Newgoods/Info/update'))
+                                                    <a href="{{ U('Furniture/Newgoods/Info/update',['id'=>$item->id])}}"
+                                                       class="btn btn-sm btn-warning">修改</a>
+                                            @endif
 
-                                                    @if(role('Furniture/Newgoods/Info/destroy'))
-                                                        <li class="divider"></li>
-                                                        <li>
-                                                            <a href="{{ U('Furniture/Newgoods/Info/destroy',['id'=>$item->id])}}"
-                                                               onclick="return confirm('你确定执行删除操作？');">删除</a></li>
-                                                    @endif
+                                            @if(role('Furniture/Newgoods/Info/destroy'))
 
-                                                </ul>
-                                            </div>
+                                                    <a href="{{ U('Furniture/Newgoods/Info/destroy',['id'=>$item->id])}}"
+                                                       class="btn btn-sm btn-danger">删除</a>
+                                            @endif
                                             @if(role('Furniture/Newgoods/Info/view'))
                                                 <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Furniture/Newgoods/Info/view',['id'=>$item->id])}}'});"
                                                         class="btn btn-primary ">查看