@@ -31,7 +31,7 @@
@@ -52,7 +52,7 @@
diff --git a/public/assets/js/backend/auth/rule.js b/public/assets/js/backend/auth/rule.js
index bd1044e2..85c23e96 100755
--- a/public/assets/js/backend/auth/rule.js
+++ b/public/assets/js/backend/auth/rule.js
@@ -173,7 +173,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
var iconfunc = function () {
Layer.open({
type: 1,
- area: ['99%', '98%'], //宽高
+ area: ['80%', '80%'], //宽高
content: Template('chooseicontpl', {iconlist: iconlist})
});
};
@@ -185,8 +185,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
});
$(document).on('click', ".btn-search-icon", function () {
if (iconlist.length == 0) {
- $.get(Config.site.cdnurl + "/assets/libs/font-awesome/less/variables.less", function (ret) {
- var exp = /fa-var-(.*):/ig;
+ $.get(Config.site.cdnurl + "/assets/libs/font-awesome/css/font-awesome.css", function (ret) {
+ var exp = /fa-(.*):before/ig;
var result;
while ((result = exp.exec(ret)) != null) {
iconlist.push(result[1]);
diff --git a/public/assets/js/frontend.js b/public/assets/js/frontend.js
index 0bd60fd0..fbe23f31 100644
--- a/public/assets/js/frontend.js
+++ b/public/assets/js/frontend.js
@@ -1,34 +1,59 @@
define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
var Frontend = {
- api: Fast.api,
- init: function () {
- var si = {};
+ api: {
//发送验证码
+ sendcaptcha: function (btn, type, data, callback) {
+ $(btn).addClass("disabled", true).text("发送中...");
+ var si = {};
+ Frontend.api.ajax({url: $(btn).data("url"), data: data}, function (data, ret) {
+ clearInterval(si[type]);
+ var seconds = 60;
+ si[type] = setInterval(function () {
+ seconds--;
+ if (seconds <= 0) {
+ clearInterval(si);
+ $(btn).removeClass("disabled").text("发送验证码");
+ } else {
+ $(btn).addClass("disabled").text(seconds + "秒后可再次发送");
+ }
+ }, 1000);
+ if (typeof callback == 'function') {
+ callback.call(this, data, ret);
+ }
+ }, function () {
+ $(btn).removeClass("disabled").text('发送验证码');
+ });
+ },
+ //准备验证码
+ preparecaptcha: function (btn, type, data) {
+ require(['form'], function (Form) {
+ Layer.open({
+ title: '请完成验证',
+ type: 1,
+ content: Template("captchatpl", {}),
+ btnAlign: 'c',
+ success: function (layero, index) {
+ var form = $("form", layero);
+ form.data("validator-options", {
+ valid: function (ret) {
+ data.captcha = $("input[name=captcha]", form).val();
+ Frontend.api.sendcaptcha(btn, type, data, function (data, ret) {
+ Layer.close(index);
+ });
+ return true;
+ }
+ })
+ Form.api.bindevent(form);
+ }
+ });
+ });
+ }
+ },
+ init: function () {
+ //点击发送验证码
$(document).on("click", ".btn-captcha", function (e) {
var type = $(this).data("type") ? $(this).data("type") : 'mobile';
var btn = this;
- Frontend.api.sendcaptcha = function (btn, type, data, callback) {
- $(btn).addClass("disabled", true).text("发送中...");
-
- Frontend.api.ajax({url: $(btn).data("url"), data: data}, function (data, ret) {
- clearInterval(si[type]);
- var seconds = 60;
- si[type] = setInterval(function () {
- seconds--;
- if (seconds <= 0) {
- clearInterval(si);
- $(btn).removeClass("disabled").text("发送验证码");
- } else {
- $(btn).addClass("disabled").text(seconds + "秒后可再次发送");
- }
- }, 1000);
- if (typeof callback == 'function') {
- callback.call(this, data, ret);
- }
- }, function () {
- $(btn).removeClass("disabled").text('发送验证码');
- });
- };
if (['mobile', 'email'].indexOf(type) > -1) {
var element = $(this).data("input-id") ? $("#" + $(this).data("input-id")) : $("input[name='" + type + "']", $(this).closest("form"));
var text = type === 'email' ? '邮箱' : '手机号码';
@@ -47,9 +72,13 @@ define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
}
element.isValid(function (v) {
if (v) {
- var data = {event: $(btn).data("event")};
+ var data = {event: $(btn).data("event"), id: $(btn).data("id")};
data[type] = element.val();
- Frontend.api.sendcaptcha(btn, type, data);
+ if ($("#captchatpl").length === 0) {
+ Frontend.api.sendcaptcha(btn, type, data);
+ } else {
+ Frontend.api.preparecaptcha(btn, type, data);
+ }
} else {
Layer.msg("请确认已经输入了正确的" + text + "！");
}
@@ -57,7 +86,12 @@ define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
} else {
var data = {event: $(btn).data("event")};
Frontend.api.sendcaptcha(btn, type, data, function (data, ret) {
- Layer.open({title: false, area: ["400px", "430px"], content: "
![](" + data.image + ")
扫一扫关注公众号获取验证码
", type: 1});
+ Layer.open({
+ title: false,
+ area: [Math.min($(window).width(), 400) + "px", "430px"],
+ content: "
扫一扫关注公众号获取验证码
",
+ type: 1
+ });
});
}
return false;
diff --git a/public/assets/js/frontend/user.js b/public/assets/js/frontend/user.js
index 45b693a4..00cdd81f 100755
--- a/public/assets/js/frontend/user.js
+++ b/public/assets/js/frontend/user.js
@@ -4,7 +4,8 @@ define(['jquery', 'bootstrap', 'frontend', 'form', 'template'], function ($, und
$.each(errors, function (i, j) {
Layer.msg(j);
});
- }
+ },
+ ignore: ':hidden'
};
var Controller = {
login: function () {
@@ -26,7 +27,7 @@ define(['jquery', 'bootstrap', 'frontend', 'form', 'template'], function ($, und
Layer.open({
type: 1,
title: __('Reset password'),
- area: ["450px", "355px"],
+ area: [Math.min($(window).width(), 450) + "px", "355px"],
content: content,
success: function (layero) {
var rule = $("#resetpwd-form input[name='captcha']").data("rule");
@@ -45,6 +46,18 @@ define(['jquery', 'bootstrap', 'frontend', 'form', 'template'], function ($, und
}
});
});
+
+ //切换账号手机验证码登录
+ $(document).on("click", ".btn-switchlogin", function () {
+ var form = $(this).closest("form");
+ var current = $(this).data("type");
+ var type = current == 'mobile' ? 'account' : 'mobile';
+ var text = $(this).data(current + "-text");
+ $(this).text(text).data("type", type);
+ $("[data-login]").addClass("hidden");
+ $("[data-login='"+type+"']").removeClass("hidden");
+ form.attr("action", $(this).data(type + "-action"));
+ });
},
register: function () {
//本地验证未通过时提示
@@ -85,7 +98,7 @@ define(['jquery', 'bootstrap', 'frontend', 'form', 'template'], function ($, und
Layer.open({
type: 1,
title: "修改",
- area: ["400px", "250px"],
+ area: [Math.min($(window).width(), 400) + "px", "250px"],
content: content,
success: function (layero) {
var form = $("form", layero);