From d34b70df1f9eb49715348183b8516b7a0375edba Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 10 Jan 2019 14:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E4=BA=8C=E7=BA=A7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/default/navigation/index.html | 12 ++++++------
 application/service/NavigationService.php            |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/admin/view/default/navigation/index.html b/application/admin/view/default/navigation/index.html
index 8f1e001d0..c338009b6 100755
--- a/application/admin/view/default/navigation/index.html
+++ b/application/admin/view/default/navigation/index.html
@@ -37,15 +37,15 @@
 							</td>
 							<td>{{:lang('common_nav_type_list')[$v['data_type']]}}</td>
 							<td>
-								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_show'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/navigation/StatusUpdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_show']}}" data-is-update-status="1"></a>
+								<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_show'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/navigation/statusupdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_show']}}" data-is-update-status="1"></a>
 							</td>
 							<td>
 								<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-edit submit-edit" data-am-modal="{target: '#nav-{{$v.data_type}}-save-win'}" data-json='{{:json_encode($v)}}' data-tag="nav-{{$v.data_type}}-save-win"></button>
-								<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/navigation/Delete')}}" data-id="{{$v.id}}"></button>
+								<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/navigation/delete')}}" data-id="{{$v.id}}"></button>
 							</td>
 						</tr>
-						{{if !empty($data_list)}}
-							{{foreach $v.item as $vs}}
+						{{if !empty($v['items'])}}
+							{{foreach $v.items as $vs}}
 								<tr id="data-list-{{$vs.id}}" {{if $vs['is_show'] eq 0}}class="am-active"{{/if}}>
 									<td class="p-l-30">{{$vs.name}}
 										<a href="{{$vs.url}}" target="_blank">
@@ -54,11 +54,11 @@
 									</td>
 									<td>{{:lang('common_nav_type_list')[$vs['data_type']]}}</td>
 									<td>
-										<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $vs['is_show'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/navigation/StatusUpdate')}}" data-id="{{$vs.id}}" data-state="{{$vs['is_show']}}" data-is-update-status="1"></a>
+										<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $vs['is_show'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/navigation/statusupdate')}}" data-id="{{$vs.id}}" data-state="{{$vs['is_show']}}" data-is-update-status="1"></a>
 									</td>
 									<td>
 										<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-edit submit-edit" data-am-modal="{target: '#nav-{{$vs.data_type}}-save-win'}" data-json='{{:json_encode($vs)}}' data-tag="nav-{{$vs.data_type}}-save-win"></button>
-										<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/navigation/Delete')}}" data-id="{{$vs.id}}"></button>
+										<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/navigation/delete')}}" data-id="{{$vs.id}}"></button>
 									</td>
 								</tr>
 							{{/foreach}}
diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php
index 9c456443e..7007929ca 100755
--- a/application/service/NavigationService.php
+++ b/application/service/NavigationService.php
@@ -127,7 +127,7 @@ class NavigationService
         {
             foreach($data as &$v)
             {
-                $v['item'] = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(['nav_type'=>$params['nav_type'], 'pid'=>$v['id']])->order('sort')->select());
+                $v['items'] = self::NavDataDealWith(Db::name('Navigation')->field($field)->where(['nav_type'=>$params['nav_type'], 'pid'=>$v['id']])->order('sort')->select());
             }
         }
         return $data;