Merge branch 'master' of ssh://git.9026.com:2212/wesley/furniture

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

@@ -89,8 +89,8 @@ class NavController extends Controller
         //dd($zhi);die;
         if($zhi!=null)
             $data['url'].=$zhi;
-        $data['pic_url'] = $this->formatImgUrl($data['pic_url']);
-        $data['pic_url_active'] = $this->formatImgUrl($data['pic_url_active']);
+        $data['pic_url'] = isset($data['pic_url'])?$this->formatImgUrl($data['pic_url']):null;
+        $data['pic_url_active'] = isset($data['pic_url_active'])?$this->formatImgUrl($data['pic_url_active']):null;
         $id = $this->repository->create($data);
         if($id) {
             $url[] = array('url'=>U( 'Album/Nav/index'),'title'=>'返回列表');
@@ -110,6 +110,7 @@ class NavController extends Controller
      */
     public function update(Request $request) {
         if($request->method() == 'POST') {
+            \Log::info($request->all());
             return $this->_updateSave();
         }
         $data = $this->repository->find($request->get('id'));
@@ -137,8 +138,8 @@ class NavController extends Controller
         $zhi = request('zhi');
         //dump($zhi);die;
         $data['url'].=$zhi;
-        $data['pic_url'] = $this->formatImgUrl($data['pic_url']);
-        $data['pic_url_active'] = $this->formatImgUrl($data['pic_url_active']);
+        $data['pic_url'] = isset($data['pic_url'])?$this->formatImgUrl($data['pic_url']):null;
+        $data['pic_url_active'] = isset($data['pic_url_active'])?$this->formatImgUrl($data['pic_url_active']):null;
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
             $url[] = array('url'=>U( 'Album/Nav/index'),'title'=>'返回列表');

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

@@ -112,6 +112,22 @@
                                         </div>
 
                                     </div>
+                                    <div class="form-group re_nav" style="display: none">
+
+                                        <label class="control-label col-sm-3">页面</label>
+
+                                        <div class="col-sm-9">
+                                            <select name="data[url]" id="data_url" class="form-control nav">
+
+                                                @foreach($page as $k=>$v)
+                                                    <option value="{{$v['value']}}"
+                                                            @if($v['value'] == (isset($data['url'])? $data['url']: '' ))selected @endif>{{$v['name']}}</option>
+                                                @endforeach
+                                            </select>
+                                        </div>
+
+                                    </div>
+
                                     <div class="form-group re_xcx" style="display: none">
 
                                         <label class="control-label col-sm-3">路径配置</label>
@@ -157,21 +173,7 @@
 
                                     </div>
 
-                                    <div class="form-group re_nav" style="display: none">
-
-                                        <label class="control-label col-sm-3">页面</label>
-
-                                        <div class="col-sm-9">
-                                            <select name="data[url]" id="data_url" class="form-control nav">
 
-                                                @foreach($page as $k=>$v)
-                                                    <option value="{{$v['value']}}"
-                                                            @if($v['value'] == (isset($data['url'])? $data['url']: '' ))selected @endif>{{$v['name']}}</option>
-                                                @endforeach
-                                            </select>
-                                        </div>
-
-                                    </div>
 
                                     <div class="form-group re_nav_zhi" style="display: none">