1

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

@@ -37,20 +37,20 @@
                                 <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">
-                                            <select name="data[open_type]" id="data_open_type" class="form-control"
-                                                    required="" aria-required="true">
-                                                @foreach(dict()->get('album','nav') as $key=>$val)
-                                                    <option value="{{$key}}"
-                                                            @if($key == (isset($data['open_type'])? $data['open_type']: '' ))selected @endif>{{$val}}</option>
-                                                @endforeach
-                                            </select>
+
+                                        <label class="control-label col-sm-3">图标名称</label>
+
+                                        <div class="col-sm-5">
+                                            <input id="data_name" name="data[name]" class="form-control"
+                                                   value="{{ $data['name'] 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">
+                                        <div class="col-sm-5">
                                             <select name="data[state]" id="data_state" class="form-control" required=""
                                                     aria-required="true">
                                                 @foreach(dict()->get('album','top_buttom') as $key=>$val)
@@ -63,39 +63,45 @@
 
                                     <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_name" name="data[name]" class="form-control"
-                                                   value="{{ $data['name'] or ''}}" required="" aria-required="true"
-                                                   placeholder="">
+                                        <div class="col-sm-5">
+                                            {!!  widget('Tools.ImgUpload')->single('pic_url',"data[pic_url]", isset($data['pic_url'])? $data['pic_url'] : "") !!}
                                         </div>
 
                                     </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">
-                                            {!!  widget('Tools.ImgUpload')->single('pic_url',"data[pic_url]", isset($data['pic_url'])? $data['pic_url'] : "") !!}
+                                        <div class="col-sm-5">
+                                            {!!  widget('Tools.ImgUpload')->single('pic_url_active',"data[pic_url_active]", isset($data['pic_url_active'])? $data['pic_url_active'] : "") !!}
                                         </div>
 
                                     </div>
+
                                     <div class="form-group">
+                                        <label class="control-label col-sm-3">跳转类型</label>
+                                        <div class="col-sm-5">
+                                            <select name="data[open_type]" id="data_open_type" class="form-control"
+                                                    required="" aria-required="true">
+                                                @foreach(dict()->get('album','nav') as $key=>$val)
+                                                    <option value="{{$key}}"
+                                                            @if($key == (isset($data['open_type'])? $data['open_type']: '' ))selected @endif>{{$val}}</option>
+                                                @endforeach
+                                            </select>
+                                        </div>
+                                    </div>
+
 
-                                        <label class="control-label col-sm-3">导航栏选中图标</label>
 
-                                        <div class="col-sm-9">
-                                            {!!  widget('Tools.ImgUpload')->single('pic_url_active',"data[pic_url_active]", isset($data['pic_url_active'])? $data['pic_url_active'] : "") !!}
-                                        </div>
 
-                                    </div>
 
                                     <div class="form-group re_xcx" style="display: none">
 
                                         <label class="control-label col-sm-3">App_ID</label>
 
-                                        <div class="col-sm-9">
+                                        <div class="col-sm-5">
                                             <input id="data_app_id" name="data[app_id]" class="form-control re_xcx"
                                                    value="{{ $data['app_id'] or ''}}" placeholder="">
                                         </div>
@@ -105,7 +111,7 @@
 
                                         <label class="control-label col-sm-3">页面</label>
 
-                                        <div class="col-sm-9">
+                                        <div class="col-sm-5">
                                             <select name="data[url]" id="data_select_url" class="form-control nav">
 
                                                 @foreach($page as $k=>$v)
@@ -121,7 +127,7 @@
 
                                         <label class="control-label col-sm-3">路径配置</label>
 
-                                        <div class="col-sm-9">
+                                        <div class="col-sm-5">
                                             <input id="data_url" name="data[url]" class="form-control re_xcx"
                                                    value="{{ $data['url'] or ''}}" placeholder="">
                                         </div>
@@ -132,7 +138,7 @@
 
                                         <label class="control-label col-sm-3">拨号电话</label>
 
-                                        <div class="col-sm-9">
+                                        <div class="col-sm-5">
                                             <input id="data_mobile" name="data[mobile]" class="form-control call"
                                                    value="{{ $data['mobile'] or ''}}" placeholder="">
                                         </div>
@@ -148,7 +154,7 @@
 
                                         <label class="control-label col-sm-3">导航地址</label>
 
-                                        <div class="col-sm-9">
+                                        <div class="col-sm-5">
                                             <input n name="data[address]" readonly="true"
                                                    value="{{ (isset($data['address'])?$data['address'] : "")}}"
                                                    class="form-control address" id="add" data-toggle="modal"
@@ -168,7 +174,7 @@
 
                                         <label class="control-label col-sm-3 nav_zhi_name">路径参数</label>
 
-                                        <div class="col-sm-9">
+                                        <div class="col-sm-5">
                                             <input id="data_zhi" name="zhi" class="form-control nav_zhi"
                                                    value="{{$data['zhi'] or ''}}" placeholder="">
                                         </div>
@@ -179,10 +185,11 @@
 
                                         <label class="control-label col-sm-3">排序</label>
 
-                                        <div class="col-sm-9">
+                                        <div class="col-sm-5">
                                             <input id="data_sort" name="data[sort]" class="form-control"
-                                                   value="{{ $data['sort'] or '100'}}" required="" aria-required="true"
+                                                   value="{{ $data['sort'] or '0'}}" required="" aria-required="true"
                                                    placeholder="数值越大越靠前">
+                                            <span class="help-block m-b-none">数值越大越靠前</span>
                                         </div>
 
                                     </div>

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

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

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

@@ -16,7 +16,7 @@
                     </div>
                     <div class="ibox-content">
                         <div class="row">
-                            <form method="GET" action="" accept-charset="UTF-8">
+                           {{-- <form method="GET" action="" accept-charset="UTF-8">
                                 <div class="col-sm-6" style="margin: auto;float: none">
                                     <div class="input-group">
                                         <input type="text" value="{{Request::get('keyword')}}" placeholder="搜索全部订单"
@@ -26,7 +26,7 @@
 								</span>
                                     </div>
                                 </div>
-                            </form>
+                            </form>--}}
                             @if(role('Album/Order/create'))
                                 <div class="col-sm-3 pull-right">
                                     <a href="{{ U('Album/Order/create')}}"
@@ -37,9 +37,9 @@
                         <div class="row">
                             <form method="GET" action="" accept-charset="UTF-8">
 
-                                <div class="col-sm-6">
+                                <div class="col-sm-8">
                                     <div class="input-group">
-                                        <div class="col-sm-4" style="padding-left: 0">
+                                        <div class="col-sm-5" style="padding-left: 0">
                                             <input type="text" value="{{Request::get('keyword')}}"
                                                    placeholder="订单号/分类/型号/姓名/电话/地址"
                                                    name="keyword" class="input-sm form-control">
@@ -85,7 +85,7 @@
                                     <tr>
                                         <td>{{ $item->sno }}</td>
                                         <td>
-                                            @if(role('Album/Order/getpic')))<span style="cursor: pointer"
+                                            @if(role('Album/Order/getpic'))<span style="cursor: pointer"
                                                   onclick="layer.open({type: 2,area: ['80%', '90%'],title:'图片',content: '{{ U('Album/Order/picture',['id'=>$item->id])}}'});"
                                                   class="label label-default">查看图片</span>
                                             @else