From 491c6d0877ea188fb881f835cc3f7909f0781772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 31 Aug 2022 21:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E7=81=AB=E7=8B=90=E7=AD=89?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/view/api/test/oauth.html |  2 +-
 app/wechat/view/api/view/music.html |  2 +-
 app/wechat/view/api/view/voice.html |  2 +-
 app/wechat/view/news/index.html     |  6 ++---
 public/static/admin.js              | 37 +++++++++++++++++++++--------
 5 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/app/wechat/view/api/test/oauth.html b/app/wechat/view/api/test/oauth.html
index 880fb53cb..44e743bae 100644
--- a/app/wechat/view/api/test/oauth.html
+++ b/app/wechat/view/api/test/oauth.html
@@ -17,7 +17,7 @@
     <div style="padding-top:0.4rem">
         <p style="font-size:0.6rem;margin-bottom:0.8rem">通过网页授权获取用户资料失败，请检查权限再试！</p>
         <p style="font-size:0.6rem;margin-bottom:0.8rem">
-            <a href="javascript:void(0);" onclick="location.reload()">重新获取（刷新）</a>
+            <a style="cursor:pointer" onclick="location.reload()">重新获取（刷新）</a>
         </p>
     </div>
 </fieldset>
diff --git a/app/wechat/view/api/view/music.html b/app/wechat/view/api/view/music.html
index 95e4d0a73..0e5f14de0 100644
--- a/app/wechat/view/api/view/music.html
+++ b/app/wechat/view/api/view/music.html
@@ -9,7 +9,7 @@
             <div class="content-title">{$title|default=''}</div>
             <div class="content-content">{$desc|default=''}</div>
         </div>
-        <a href="javascript:void(0)" id="AudioBtn" class="content-button icon icon-play"></a>
+        <a style="cursor:pointer" id="AudioBtn" class="content-button icon icon-play"></a>
     </div>
 </div>
 <audio style="display:none" id="AudioSrc">
diff --git a/app/wechat/view/api/view/voice.html b/app/wechat/view/api/view/voice.html
index 12b3a8038..762555146 100644
--- a/app/wechat/view/api/view/voice.html
+++ b/app/wechat/view/api/view/voice.html
@@ -6,7 +6,7 @@
     <div class="logo">A</div>
     <div class="content arrow">
         <a class="icon icon-volume left-text"></a>
-        <a href="javascript:void(0)" id="AudioBtn" class="icon icon-pause"></a>
+        <a style="cursor:pointer" id="AudioBtn" class="icon icon-pause"></a>
         <audio id="AudioSrc">
             <source src="{$url|default=''}">
         </audio>
diff --git a/app/wechat/view/news/index.html b/app/wechat/view/news/index.html
index 009acd281..25612fb33 100644
--- a/app/wechat/view/news/index.html
+++ b/app/wechat/view/news/index.html
@@ -14,9 +14,9 @@
         {foreach $list as $vo}
         <div class="news-item">
             <div class='news-tools layui-hide'>
-                <a data-phone-view="{:url('wechat/api.view/news')}?id={$vo.id}" href='javascript:void(0)'>预览</a>
-                <a data-open='{:url("edit")}?id={$vo.id}' href='javascript:void(0)'>编辑</a>
-                <a data-news-del="{$vo.id}" href='javascript:void(0)'>删除</a>
+                <a data-phone-view="{:url('wechat/api.view/news')}?id={$vo.id}" style="cursor:pointer">预览</a>
+                <a data-open='{:url("edit")}?id={$vo.id}' style="cursor:pointer">编辑</a>
+                <a data-news-del="{$vo.id}" style="cursor:pointer">删除</a>
             </div>
             {foreach $vo.articles as $k => $v}
             {if $k < 1}
diff --git a/public/static/admin.js b/public/static/admin.js
index 741fe1e6a..ae245101f 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -242,11 +242,11 @@ $(function () {
             var url = ret.url || (typeof ret.data === 'string' ? ret.data : '');
             var msg = ret.msg || (typeof ret.info === 'string' ? ret.info : '');
             if (parseInt(ret.code) === 1 && time === 'false') {
-                return url ? location.href = url : $.form.reload();
+                return url ? $.form.goto(url) : $.form.reload();
             } else return (parseInt(ret.code) === 1) ? this.success(msg, time, function () {
-                $.msg.closeLastModal(url ? location.href = url : $.form.reload());
+                $.msg.closeLastModal(url ? $.form.goto(url) : $.form.reload());
             }) : this.error(msg, 3, function () {
-                url ? location.href = url : '';
+                $.form.goto(url);
             });
         };
     };
@@ -327,6 +327,15 @@ $(function () {
                 }
             });
         };
+        /*! 兼容跳转与执行 */
+        this.goto = function (url) {
+            if (typeof url !== 'string' || url.length < 1) return;
+            if (url.toLocaleString().indexOf('javascript:') === 0) {
+                return eval(url.split('javascript:', 2)[1]);
+            } else {
+                return location.href = url;
+            }
+        };
         /*! 以 HASH 打开新网页 */
         this.href = function (url, elem) {
             this.isMenu = elem && elem.dataset.menuNode;
@@ -541,7 +550,7 @@ $(function () {
                     if (typeof ret === 'object' && ret.code > 0 && $('#' + taid).size() > 0) {
                         return $.msg.success(ret.info, 3, function () {
                             $.msg.closeLastModal();
-                            (typeof ret.data === 'string' && ret.data) ? location.href = ret.data : $.layTable.reload(taid);
+                            (typeof ret.data === 'string' && ret.data) ? $.form.goto(ret.data) : $.layTable.reload(taid);
                         }) && false;
                     }
                 } : undefined);
@@ -572,7 +581,9 @@ $(function () {
             var key, keys = this.name.match(rules.key), merge = this.value, name = this.name;
             while ((key = keys.pop()) !== undefined) {
                 name = name.replace(new RegExp("\\[" + key + "\\]$"), '');
-                if (key.match(rules.push)) merge = self.build([], self.pushCounter(name), merge); else if (key.match(rules.fixed)) merge = self.build([], key, merge); else if (key.match(rules.named)) merge = self.build({}, key, merge);
+                if (key.match(rules.push)) merge = self.build([], self.pushCounter(name), merge);
+                else if (key.match(rules.fixed)) merge = self.build([], key, merge);
+                else if (key.match(rules.named)) merge = self.build({}, key, merge);
             }
             data = $.extend(true, data, merge);
         });
@@ -863,14 +874,20 @@ $(function () {
                                 var lines = [];
                                 for (var idx in ret.data.history) {
                                     var line = ret.data.history[idx], percent = '[ ' + line.progress + '% ] ';
-                                    if (line.message.indexOf('javascript:') === -1) lines.push(line.message.indexOf('>>>') > -1 ? line.message : percent + line.message); else if (!that.SetCache(code, idx) && doScript !== false) that.SetCache(code, idx, 1), location.href = line.message;
+                                    if (line.message.indexOf('javascript:') === -1) {
+                                        lines.push(line.message.indexOf('>>>') > -1 ? line.message : percent + line.message);
+                                    } else if (!that.SetCache(code, idx) && doScript !== false) {
+                                        that.SetCache(code, idx, 1), $.form.goto(line.message);
+                                    }
                                 }
                                 if (ret.data.status > 0) {
                                     that.SetState(parseInt(ret.data.status), ret.data.message);
                                     that.$percent.attr('lay-percent', (parseFloat(ret.data.progress || '0.00').toFixed(2)) + '%'), layui.element.render();
                                     that.$coder.html('<p class="layui-elip">' + lines.join('</p><p class="layui-elip">') + '</p>').animate({scrollTop: that.$coder[0].scrollHeight + 'px'}, 200);
                                     return parseInt(ret.data.status) === 3 || parseInt(ret.data.status) === 4 || setTimeout(that.LoadProgress, Math.floor(Math.random() * 200)), false;
-                                } else return setTimeout(that.LoadProgress, Math.floor(Math.random() * 500) + 200), false;
+                                } else {
+                                    return setTimeout(that.LoadProgress, Math.floor(Math.random() * 500) + 200), false;
+                                }
                             }
                         }, false);
                     })();
@@ -887,7 +904,7 @@ $(function () {
         var url = $(this).attr('action').replace(/&?page=\d+/g, '');
         if ((this.method || 'get').toLowerCase() === 'get') {
             var split = url.indexOf('?') > -1 ? '&' : '?', stype = location.href.indexOf('spm=') > -1 ? '#' : '';
-            return location.href = stype + $.menu.parseUri(url + split + $(this).serialize().replace(/\+/g, ' '));
+            return $.form.goto(stype + $.menu.parseUri(url + split + $(this).serialize().replace(/\+/g, ' ')));
         }
         return $.form.load(url, this, 'post');
     });
@@ -957,14 +974,14 @@ $(function () {
     /*! 注册 data-href 事件行为 */
     onEvent('click', '[data-href]', function () {
         if (this.dataset.href && this.dataset.href.indexOf('#') !== 0) {
-            location.href = this.dataset.href;
+            $.form.goto(this.dataset.href);
         }
     });
 
     /*! 注册 data-open 事件行为 */
     onEvent('click', '[data-open]', function () {
         if (this.dataset.open.match(/^https?:/)) {
-            location.href = this.dataset.open;
+            $.form.goto(this.dataset.open);
         } else {
             $.form.href(this.dataset.open, this);
         }