From 941e537d13016a4df4feedbfc6cdd61248aa876b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 21 Feb 2017 18:07:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0UI=E5=9F=BA=E7=A1=80=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/extra/view/admin.main.top.html |  2 +-
 public/static/admin/listen.js              | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/application/extra/view/admin.main.top.html b/application/extra/view/admin.main.top.html
index 7163a328d..80138c1d8 100644
--- a/application/extra/view/admin.main.top.html
+++ b/application/extra/view/admin.main.top.html
@@ -43,7 +43,7 @@
                                 </a>
                             </li>
                             <li class="topbar-info-btn">
-                                <a data-load="{:url('admin/login/out')}">
+                                <a data-load="{:url('admin/login/out')}" data-confirm='确定要退出登录吗？'>
                                     <span><i class="glyphicon glyphicon-log-out"></i> 退出登录</span>
                                 </a>
                             </li>
diff --git a/public/static/admin/listen.js b/public/static/admin/listen.js
index 8e7ad0932..11d90a811 100644
--- a/public/static/admin/listen.js
+++ b/public/static/admin/listen.js
@@ -2,7 +2,15 @@ define(['jquery', 'admin.plugs'], function () {
 
     /** 事件委派 */
     $('body').on('click', '[data-load]', function () {
-        $.form.load($(this).attr('data-load'), {}, 'GET', null, true, $(this).attr('data-tips'));
+        var url = $(this).attr('data-load');
+        var tips = $(this).attr('data-tips');
+        function _goLoad() {
+            $.form.load(url, {}, 'GET', null, true, tips);
+        }
+        if ($(this).attr('data-confirm')) {
+            return $.msg.confirm($(this).attr('data-confirm'), _goLoad);
+        }
+        return _goLoad.call(this);
     }).on('click', '[data-modal]', function () {
         return $.form.modal($(this).attr('data-modal'), 'open_type=modal');
     }).on('click', '[data-open]', function () {
@@ -13,8 +21,6 @@ define(['jquery', 'admin.plugs'], function () {
     }).on('submit', 'form[data-form-href]', function () {
         var split = this.action.indexOf('?') === -1 ? '?' : '&';
         window.location.href = '#' + parseUri(this.action + split + $(this).serialize());
-    }).on('click', '[data-back]', function () {
-        window.history.back();
     }).on('click', '[data-reload]', function () {
         $.form.reload();
     }).on('click', '[data-check-target]', function () {
@@ -43,8 +49,8 @@ define(['jquery', 'admin.plugs'], function () {
             window.location.href = href;
         }
     }).on('click', '[data-file]', function () {
-        var type = $(this).attr('data-type') || 'image'; //jpg,png
-        var field = $(this).attr('data-field') || type;
+        var type = $(this).attr('data-type') || 'jpg,png';
+        var field = $(this).attr('data-field') || 'file';
         var method = $(this).attr('data-one') ? 'one' : 'index';
         var title = $(this).attr('data-title') || '文件管理';
         var uptype = $(this).attr('data-uptype') || 'qiniu';
@@ -54,7 +60,7 @@ define(['jquery', 'admin.plugs'], function () {
         $.form.iframe($(this).attr('data-iframe'), $(this).attr('data-title') || '窗口');
     }).on('click', '[data-icon]', function () {
         var field = $(this).attr('data-field') || 'icon';
-        var url = window.ROOT_URL + '/index.php/plugs/icon.html?field=' + field;
+        var url = window.ROOT_URL + '/index.php/admin/plugs/icon.html?field=' + field;
         $.form.iframe(url, '图标选择');
     }).on('click', '[data-tips-image]', function () {
         var src = this.getAttribute('data-tips-image') || this.src, img = new Image();