blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-05 05:52:43 +08:00
Code Issues Projects Releases Wiki Activity

兼容火狐等浏览器

Browse Source
This commit is contained in:
邹景立 2022-08-31 21:35:37 +08:00
parent cace57d794
commit 491c6d0877
5 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/wechat/view/api/test/oauth.html
View File

@ -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>

2
app/wechat/view/api/view/music.html
View File

@ -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">

2
app/wechat/view/api/view/voice.html
View File

@ -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>

6
app/wechat/view/news/index.html
View File

@ -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}

37
public/static/admin.js
View File

@ -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);
}