Merge branch 'dev'

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

@@ -37,6 +37,8 @@ class OrderController extends Controller
         $search['keyword'] = $request->input('keyword');
         $search['status'] = $request->input('status');
         $search['expected'] = $request->input('expected');
+        $search['start'] = $request->input('start');
+        $search['end'] = $request->input('end');
         $search['storeid'] = $this->getStoreId();
 
         $order = array();

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

@@ -75,4 +75,16 @@ class PosterController extends Controller
         }
     }
 
+
+    public function viewPoster(Request $request)
+    {
+        $img = '/base/img/poster.jpg';
+        return view('admin.album.poster.view', compact('img'));
+    }
+
+    public function viewShare(Request $request)
+    {
+        $img = '/base/img/share.jpg';
+        return view('admin.album.poster.view', compact('img'));
+    }
 }

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

@@ -23,14 +23,7 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                        @if(role('Album/Order/index'))
-                            <div class="row">
-                                <div class="col-sm-3 pull-right">
-                                    <a href="{{ U('Album/Order/index')}}"
-                                       class="btn btn-sm btn-primary pull-right">返回列表</a>
-                                </div>
-                            </div>
-                        @endif
+
 
                         <div class="row">
                             <div class="col-lg-10">

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

@@ -34,7 +34,9 @@
                                     <label class="control-label col-sm-3">海报(440*440)</label>
                                     <div class="col-sm-9">
                                         {!!  widget('Tools.ImgUpload')->multi2('/upload/posters','posters',"data[posters]", isset($data['posters'])? $data['posters'] : '',array("sizex"=>440,"sizey"=>440)) !!}
+                                        <button type="button" onclick="layer.open({type: 2,area: ['80%', '65%'],content: '{{ U('Album/Poster/viewPoster')}}'});"  class="btn btn-primary col-sm-offset-3">查看示例</button>
                                     </div>
+
                                 </div>
                                 <div class="form-group">
 
@@ -78,6 +80,7 @@
                                     <div class="col-sm-9">
                                         {{--{!!  widget('Tools.ImgUpload')->single2('/upload/cover_pic','cover_pic',"cover_pic",  isset($data['cover_pic'])? $data['cover_pic'] : '',array("sizex"=>662,"sizey"=>510)) !!}--}}
                                         {!!  widget('Tools.ImgUpload')->single2('/upload/share','share',"share",  isset($data['share'])? $data['share'] : '',array("sizex"=>1080,"sizey"=>1080)) !!}
+                                        <button type="button" onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Album/Poster/viewShare')}}'});"  class="btn btn-primary col-sm-offset-3">查看示例</button>
                                     </div>
                                 </div>
                                 <div class="form-group">

resources/views/admin/album/poster/view.blade.php

@@ -0,0 +1,15 @@
+@extends('admin.layout')
+
+@section('content')
+    <div class="row">
+        <div class="ibox-content">
+            <div class="list-group">
+
+                <div class="list-group-item">
+                    <img width="100%" src="{{ $img }}"/>
+                </div>
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/admin/album/product/attr/view.blade.php

@@ -1,61 +0,0 @@
-@extends('admin.layout')
-
-@section('content')
-    <div class="row">
-        <div class="ibox-content">
-            <div class="list-group">
-
-                <div class="list-group-item">
-
-                    <h3 class="list-group-item-heading">ID</h3>
-
-                    <p class="list-group-item-text"> {{ $data['id'] or ''}}</p>
-
-                </div>
-                <div class="list-group-item">
-
-                    <h3 class="list-group-item-heading">产品分类</h3>
-
-                    <p class="list-group-item-text"> {{ $data['category'] or ''}}</p>
-
-                </div>
-                <div class="list-group-item">
-
-                    <h3 class="list-group-item-heading">产品型号</h3>
-
-                    <p class="list-group-item-text"> {{ $data['type'] or ''}}</p>
-
-                </div>
-                <div class="list-group-item">
-
-                    <h3 class="list-group-item-heading">产品颜色</h3>
-
-                    <p class="list-group-item-text"> {{ $data['color'] or ''}}</p>
-
-                </div>
-                <div class="list-group-item">
-
-                    <h3 class="list-group-item-heading">排序，越大越靠前</h3>
-
-                    <p class="list-group-item-text"> {{ $data['sort'] or ''}}</p>
-
-                </div>
-
-                <div class="list-group-item">
-
-                    <h3 class="list-group-item-heading">创建时间</h3>
-
-                    <p class="list-group-item-text"> {{ $data['created_at'] or ''}}</p>
-
-                </div>
-                <div class="list-group-item">
-
-                    <h3 class="list-group-item-heading">更新时间</h3>
-
-                    <p class="list-group-item-text"> {{ $data['updated_at'] or ''}}</p>
-
-                </div>
-            </div>
-        </div>
-    </div>
-@endsection

resources/views/admin/base/user/edit.blade.php

@@ -63,7 +63,7 @@
                                     </div>
 
                                     <div class="col-sm-3">
-                                        <button type="button" class="btn btn-w-m btn-primary" data-toggle="modal" data-target="#myModal5" @if(!empty($data['mobile'])) disabled="disabled" @endif>选择</button>
+                                        <button type="button" class="btn btn-w-m btn-primary" data-toggle="modal" data-target="#myModal5" onclick="SearchStore()" @if(!empty($data['mobile'])) disabled="disabled" @endif>选择</button>
                                     </div>
                                 </div>
                                 <div class="form-group">