diff --git a/public/favicon.ico b/public/favicon.ico index 3eedd4521..cd4b72f1e 100755 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/img/BG-A.png b/public/img/BG-A.png index fbb0b0007..59f8d45af 100755 Binary files a/public/img/BG-A.png and b/public/img/BG-A.png differ diff --git a/public/img/login-bg1.png b/public/img/login-bg1.png index ee172b0c1..359452c3b 100755 Binary files a/public/img/login-bg1.png and b/public/img/login-bg1.png differ diff --git a/public/img/logo.png b/public/img/logo.png index f90ec30f6..9fa7f8173 100755 Binary files a/public/img/logo.png and b/public/img/logo.png differ diff --git a/public/img/logo_hc.png b/public/img/logo_hc.png deleted file mode 100644 index f90ec30f6..000000000 Binary files a/public/img/logo_hc.png and /dev/null differ diff --git a/public/pages/frame/login/login.js b/public/pages/frame/login/login.js index 7d8e616b3..fe4e514ae 100755 --- a/public/pages/frame/login/login.js +++ b/public/pages/frame/login/login.js @@ -1,40 +1,40 @@ -(function (vc) { +(function(vc) { vc.extends({ data: { loginInfo: { logo: '', - username: '', - passwd: '', + username: 'wuxw', + passwd: 'admin', validateCode: '', errorInfo: '' } }, - _initMethod: function () { + _initMethod: function() { vc.component.clearCacheData(); vc.component._loadSysInfo(); }, - _initEvent: function () { - vc.component.$on('errorInfoEvent', function (_errorInfo) { + _initEvent: function() { + vc.component.$on('errorInfoEvent', function(_errorInfo) { vc.component.loginInfo.errorInfo = _errorInfo; console.log('errorInfoEvent 事件被监听', _errorInfo) }); - vc.component.$on('validate_code_component_param_change_event', function (params) { + vc.component.$on('validate_code_component_param_change_event', function(params) { for (var tmpAttr in params) { vc.component.loginInfo[tmpAttr] = params[tmpAttr]; } console.log('errorInfoEvent 事件被监听', params) }); - vc.on('login', 'doLogin', function () { + vc.on('login', 'doLogin', function() { vc.component.doLogin(); }) }, methods: { - clearCacheData: function () { + clearCacheData: function() { vc.clearCacheData(); }, - _loadSysInfo: function () { + _loadSysInfo: function() { var param = { params: { sys: 'HC' @@ -44,7 +44,7 @@ 'login', 'getSysInfo', param, - function (json, res) { + function(json, res) { //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); if (res.status != 200) { console.log("加载系统信息失败"); @@ -56,14 +56,14 @@ //保存到浏览器 vc.saveData("_sysInfo", JSON.parse(json)); }, - function (errInfo, error) { + function(errInfo, error) { console.log('请求失败处理'); vc.saveData("_sysInfo", { logo: 'HC' }); vc.copyObject(json, vc.component.loginInfo); vc.component.loginInfo.errorInfo = errInfo; }); }, - doLogin: function () { + doLogin: function() { if (!vc.notNull(vc.component.loginInfo.username)) { vc.toast('用户名不能为空'); return; @@ -79,11 +79,10 @@ vc.http.post( 'login', 'doLogin?version=2.0', - JSON.stringify(vc.component.loginInfo), - { + JSON.stringify(vc.component.loginInfo), { emulateJSON: true }, - function (json, res) { + function(json, res) { //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); let _data = JSON.parse(json); if (_data.hasOwnProperty('code') && _data.code != '0') { @@ -99,18 +98,18 @@ vc.toast(json); vc.component.loginInfo.errorInfo = json; }, - function (errInfo, error) { + function(errInfo, error) { console.log('请求失败处理'); vc.toast(errInfo); vc.component.loginInfo.errorInfo = errInfo; }); }, - _doRegister: function () { + _doRegister: function() { vc.jumpToPage('/user.html#/pages/frame/register'); } }, - _destroyedMethod: function () { + _destroyedMethod: function() { console.log("登录页面销毁调用"); } }); diff --git a/public/user.html b/public/user.html index 0bf35a488..408674365 100755 --- a/public/user.html +++ b/public/user.html @@ -4,9 +4,9 @@ - HC智慧物业管理系统 + HC小区管理系统 - + @@ -16,16 +16,16 @@