wesley 7 роки тому
батько
коміт
e743ea80a6

+ 1 - 1
app/Services/Base/Attachment.php

@@ -25,7 +25,7 @@ class Attachment
         if( !$this->_model ) $this->_model = new BaseAttachmentModel();
         if( !$this->_model ) $this->_model = new BaseAttachmentModel();
     }
     }
 
 
-    public function aliUpload($field, $request, $tag = 'files', $size = 1 * 1024 * 1024, array $mimeType = ['image/jpeg', 'image/png', 'image/gif','video/mp4','video/quicktime']){
+    public function aliUpload($field, $request, $tag = 'files', $size = 10 * 1024 * 1024, array $mimeType = ['image/jpeg', 'image/png', 'image/gif','video/mp4','video/quicktime']){
         $class = isset($request['class']) ? $request['class'] : '未分类';
         $class = isset($request['class']) ? $request['class'] : '未分类';
         $sizex = isset($request['sizex']) ? $request['sizex'] : 0;
         $sizex = isset($request['sizex']) ? $request['sizex'] : 0;
         $sizey = isset($request['sizey']) ? $request['sizey'] : 0;
         $sizey = isset($request['sizey']) ? $request['sizey'] : 0;

+ 2 - 2
resources/views/admin/order/info/index.blade.php

@@ -69,9 +69,9 @@
                                             </button>
                                             </button>
                                         @endif
                                         @endif
 
 
-                                        @if($item->status == 2 && !$item->photo)
+                                        @if($item->status ==2 )
                                             <button onclick="window.location.href='{{ U('Order/Info/upload',['id'=>$item->id])}}'"
                                             <button onclick="window.location.href='{{ U('Order/Info/upload',['id'=>$item->id])}}'"
-                                                    class="btn btn-success">上传图片
+                                                    class="btn btn-success">@if(!$item->photo)上传图片@else 修改图片@endif
                                             </button>
                                             </button>
                                         @endif
                                         @endif
 
 

+ 2 - 0
resources/views/admin/product/category/index.blade.php

@@ -40,6 +40,7 @@
                             <th class="sorting" data-sort="id"> ID</th>
                             <th class="sorting" data-sort="id"> ID</th>
                             <th class="sorting" data-sort="name"> 产品名称</th>
                             <th class="sorting" data-sort="name"> 产品名称</th>
                             <th class="sorting" data-sort="img"> 封面图</th>
                             <th class="sorting" data-sort="img"> 封面图</th>
+                            <th class="sorting" data-sort="sort">排序</th>
                             <th class="sorting" data-sort="created_at"> 创建时间</th>
                             <th class="sorting" data-sort="created_at"> 创建时间</th>
                             <th class="sorting" data-sort="updated_at"> 更新时间</th>
                             <th class="sorting" data-sort="updated_at"> 更新时间</th>
                             <th width="22%">相关操作</th>
                             <th width="22%">相关操作</th>
@@ -53,6 +54,7 @@
                                     <td>{{ $item->id }}</td>
                                     <td>{{ $item->id }}</td>
                                     <td>{{ $item->name }}</td>
                                     <td>{{ $item->name }}</td>
                                     <td><img src="{{ $item->img }}" style="height: 50px"></td>
                                     <td><img src="{{ $item->img }}" style="height: 50px"></td>
+                                    <td>{{ $item->sort }}</td>
                                     <td>{{ $item->created_at }}</td>
                                     <td>{{ $item->created_at }}</td>
                                     <td>{{ $item->updated_at }}</td>
                                     <td>{{ $item->updated_at }}</td>
                                     <td>
                                     <td>