From b3ded08852b7679ae069df9bf6d0d82808ff1b3d Mon Sep 17 00:00:00 2001 From: myzhoulang <604389771@qq.com> Date: Thu, 20 Apr 2017 18:52:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E7=AB=99=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.js | 64 +-- src/directive/directive.js | 4 +- src/entry.js | 5 +- src/{directive => layout}/footer.directive.js | 0 src/{directive => layout}/footer.html | 0 src/{directive => layout}/header.directive.js | 9 +- src/{directive => layout}/header.html | 6 +- src/{router => page}/about/about.js | 2 +- src/{controller => page/about}/aboutCtrl.js | 0 src/{router => page}/accordion/accordion.js | 2 +- .../accordion}/accordionCtrl.js | 0 src/{router => page}/alert/alert.js | 2 +- src/{controller => page/alert}/alertCtrl.js | 0 src/{router => page}/anchor/anchor.js | 2 +- src/{controller => page/anchor}/anchorCtrl.js | 0 src/{router => page}/chart/chart.js | 2 +- src/{controller => page/chart}/chartCtrl.js | 2 +- src/{router => page}/crumb/crumb.js | 2 +- src/{controller => page/crumb}/crumbCtrl.js | 0 src/{router => page}/dialog/dialog.js | 4 +- src/{controller => page/dialog}/dialogCtrl.js | 2 +- src/{router => page}/error/404.js | 0 src/{router => page}/help/help.js | 2 +- src/{controller => page/help}/helpCtrl.js | 0 src/{router => page}/home/home.js | 2 +- src/{controller => page/home}/homeCtrl.js | 0 src/page/home/index.html | 2 +- src/{router => page}/home/index.js | 2 +- src/{router => page}/imgError/imgError.js | 2 +- .../imgError}/imgErrorCtrl.js | 0 src/page/layzimg/index.html | 35 -- src/page/lazyimg/index.html | 41 +- .../layzimg.js => page/lazyimg/lazyimg.js} | 10 +- .../lazyimg/lazyimgCtrl.js} | 4 +- src/{component => page}/login/login.html | 0 src/{controller => page/login}/loginCtrl.js | 2 +- src/{router => page}/news/news.detail.js | 0 src/{router => page}/news/news.js | 2 +- src/{router => page}/news/news.list.js | 0 src/{router => page}/news/news.save.js | 0 src/{controller => page/news}/newsCtrl.js | 0 src/{router => page}/pagintion/pagintion.js | 2 +- .../pagintion}/pagintionCtrl.js | 0 src/page/rate/index.html | 2 + src/{router => page}/rate/rate.js | 2 +- src/{controller => page/rate}/rateCtrl.js | 4 +- src/{router => page}/scroll/scroll.js | 0 src/{router => page}/search/search.js | 2 +- src/{controller => page/search}/searchCtrl.js | 0 src/{router => page}/switch/switch.js | 2 +- src/{controller => page/switch}/switchCtrl.js | 0 src/{router => page}/tab/tab.js | 2 +- src/{controller => page/tab}/tabCtrl.js | 4 +- src/{router => page}/tooltip/tooltip.js | 2 +- .../tooltip}/tooltipCtrl.js | 0 src/{router => page}/ueditor/ueditor.js | 2 + src/service/anchorSmoothScroll.js | 82 --- src/service/dialogs.js | 237 -------- src/service/dialogs1.js | 269 --------- src/service/service.js | 515 +++++++++--------- 60 files changed, 357 insertions(+), 982 deletions(-) rename src/{directive => layout}/footer.directive.js (100%) rename src/{directive => layout}/footer.html (100%) rename src/{directive => layout}/header.directive.js (82%) rename src/{directive => layout}/header.html (81%) rename src/{router => page}/about/about.js (88%) rename src/{controller => page/about}/aboutCtrl.js (100%) rename src/{router => page}/accordion/accordion.js (86%) rename src/{controller => page/accordion}/accordionCtrl.js (100%) rename src/{router => page}/alert/alert.js (88%) rename src/{controller => page/alert}/alertCtrl.js (100%) rename src/{router => page}/anchor/anchor.js (87%) rename src/{controller => page/anchor}/anchorCtrl.js (100%) rename src/{router => page}/chart/chart.js (86%) rename src/{controller => page/chart}/chartCtrl.js (99%) rename src/{router => page}/crumb/crumb.js (88%) rename src/{controller => page/crumb}/crumbCtrl.js (100%) rename src/{router => page}/dialog/dialog.js (79%) rename src/{controller => page/dialog}/dialogCtrl.js (94%) rename src/{router => page}/error/404.js (100%) rename src/{router => page}/help/help.js (86%) rename src/{controller => page/help}/helpCtrl.js (100%) rename src/{router => page}/home/home.js (87%) rename src/{controller => page/home}/homeCtrl.js (100%) rename src/{router => page}/home/index.js (89%) rename src/{router => page}/imgError/imgError.js (86%) rename src/{controller => page/imgError}/imgErrorCtrl.js (100%) delete mode 100644 src/page/layzimg/index.html rename src/{router/layzimg/layzimg.js => page/lazyimg/lazyimg.js} (59%) rename src/{controller/layzimgCtrl.js => page/lazyimg/lazyimgCtrl.js} (89%) rename src/{component => page}/login/login.html (100%) rename src/{controller => page/login}/loginCtrl.js (97%) rename src/{router => page}/news/news.detail.js (100%) rename src/{router => page}/news/news.js (88%) rename src/{router => page}/news/news.list.js (100%) rename src/{router => page}/news/news.save.js (100%) rename src/{controller => page/news}/newsCtrl.js (100%) rename src/{router => page}/pagintion/pagintion.js (86%) rename src/{controller => page/pagintion}/pagintionCtrl.js (100%) rename src/{router => page}/rate/rate.js (86%) rename src/{controller => page/rate}/rateCtrl.js (88%) rename src/{router => page}/scroll/scroll.js (100%) rename src/{router => page}/search/search.js (90%) rename src/{controller => page/search}/searchCtrl.js (100%) rename src/{router => page}/switch/switch.js (86%) rename src/{controller => page/switch}/switchCtrl.js (100%) rename src/{router => page}/tab/tab.js (88%) rename src/{controller => page/tab}/tabCtrl.js (82%) rename src/{router => page}/tooltip/tooltip.js (88%) rename src/{controller => page/tooltip}/tooltipCtrl.js (100%) rename src/{router => page}/ueditor/ueditor.js (99%) delete mode 100644 src/service/anchorSmoothScroll.js delete mode 100644 src/service/dialogs.js delete mode 100644 src/service/dialogs1.js diff --git a/src/app.js b/src/app.js index 4d3d5bc..951ab3d 100644 --- a/src/app.js +++ b/src/app.js @@ -5,38 +5,38 @@ var app = angular.module('app', ['ng.element', 'ui.router', 'ngResource', 'ngAni // 路由配置 var router = [ - ["notFound", require("./router/error/404.js")], + ["notFound", require("./page/error/404.js")], - ["about", require("./router/about/about.js")], + ["about", require("./page/about/about.js")], - ["help", require("./router/help/help.js")], + ["help", require("./page/help/help.js")], // ["home.index", require("./router/home/home")], - ["home", require("./router/home/index.js")], - ["home.chart", require("./router/chart/chart.js")], - - ["home.ueditor", require("./router/ueditor/ueditor.js")], - ["home.news", require("./router/news/news.js")], - ["home.news.list", require("./router/news/news.list.js")], - ["home.news.detail", require("./router/news/news.detail.js")], - ["home.news.save", require("./router/news/news.save.js")], - ["home.scroll", require("./router/scroll/scroll.js")], - ["home.search", require("./router/search/search.js")], - - ["home.tab", require("./router/tab/tab.js")], - ["home.pagintion", require("./router/pagintion/pagintion.js")], - ["home.accordion", require("./router/accordion/accordion.js")], - ["home.dialog", require("./router/dialog/dialog.js")], - ["home.layzimg", require("./router/layzimg/layzimg.js")], - ["home.imgerror", require("./router/imgError/imgError.js")], - - ["home.switch", require("./router/switch/switch.js")], - ["home.rate", require("./router/rate/rate.js")], - ["home.alert", require("./router/alert/alert.js")], - ["home.crumb", require("./router/crumb/crumb.js")], - ["home.anchor", require("./router/anchor/anchor.js")], - ["home.tooltip", require("./router/tooltip/tooltip.js")] + ["home", require("./page/home/index.js")], + ["home.chart", require("./page/chart/chart.js")], + + ["home.ueditor", require("./page/ueditor/ueditor.js")], + ["home.news", require("./page/news/news.js")], + ["home.news.list", require("./page/news/news.list.js")], + ["home.news.detail", require("./page/news/news.detail.js")], + ["home.news.save", require("./page/news/news.save.js")], + ["home.scroll", require("./page/scroll/scroll.js")], + ["home.search", require("./page/search/search.js")], + + ["home.tab", require("./page/tab/tab.js")], + ["home.pagintion", require("./page/pagintion/pagintion.js")], + ["home.accordion", require("./page/accordion/accordion.js")], + ["home.dialog", require("./page/dialog/dialog.js")], + ["home.lazyimg", require("./page/lazyimg/lazyimg.js")], + ["home.imgerror", require("./page/imgError/imgError.js")], + + ["home.switch", require("./page/switch/switch.js")], + ["home.rate", require("./page/rate/rate.js")], + ["home.alert", require("./page/alert/alert.js")], + ["home.crumb", require("./page/crumb/crumb.js")], + ["home.anchor", require("./page/anchor/anchor.js")], + ["home.tooltip", require("./page/tooltip/tooltip.js")] ]; // 鏈接mongo配置 @@ -66,7 +66,7 @@ app.config(function ($controllerProvider, $httpProvider, $locationProvider, $url // 优化路由地址，开启SEO $locationProvider.html5Mode(true).hashPrefix('!'); $urlRouterProvider.when('/', '/chart'); - // $urlRouterProvider.otherwise('/404'); + $urlRouterProvider.otherwise('/404'); // 配置路由 router.forEach(function (item) { @@ -75,8 +75,9 @@ app.config(function ($controllerProvider, $httpProvider, $locationProvider, $url }); -app.run(function ($rootScope, $log, requestService, Login, Api, Auth) { +app.run(function ($rootScope, $log, $state, requestService, Login, Api, Auth) { $rootScope.show = false; + $rootScope.$state = $state; // 路由切换成功 // , toParams, formState, formParams, options $rootScope.$on('$stateChangeSuccess', function (event, toState) { @@ -121,11 +122,6 @@ app.run(function ($rootScope, $log, requestService, Login, Api, Auth) { $rootScope.isShowFooter = true; } }); - - // 回到顶部 - $rootScope.scrollFinsh = function () { - alert('xxxx已经回到顶部了！！！'); - }; }); module.exports = app; diff --git a/src/directive/directive.js b/src/directive/directive.js index c3faef0..8e52808 100644 --- a/src/directive/directive.js +++ b/src/directive/directive.js @@ -1,5 +1,5 @@ -require('./header.directive'); -require('./footer.directive'); +require('./../layout/header.directive.js'); +require('./../layout/footer.directive.js'); require('./toggle.directive'); require('./search.directive'); require('./document.click.directive'); diff --git a/src/entry.js b/src/entry.js index 962dc7e..128db32 100644 --- a/src/entry.js +++ b/src/entry.js @@ -13,7 +13,8 @@ require('css/style.scss') require('./directive/directive.js'); require('./filter/filter.js'); +require("./layout/header.directive.js"); +require("./layout/footer.directive.js"); + require('./service/service.js'); -require('./service/anchorSmoothScroll.js'); require('./service/api.js'); -// require('./service/dialogs.js'); \ No newline at end of file diff --git a/src/directive/footer.directive.js b/src/layout/footer.directive.js similarity index 100% rename from src/directive/footer.directive.js rename to src/layout/footer.directive.js diff --git a/src/directive/footer.html b/src/layout/footer.html similarity index 100% rename from src/directive/footer.html rename to src/layout/footer.html diff --git a/src/directive/header.directive.js b/src/layout/header.directive.js similarity index 82% rename from src/directive/header.directive.js rename to src/layout/header.directive.js index 69565e7..db9ceea 100644 --- a/src/directive/header.directive.js +++ b/src/layout/header.directive.js @@ -1,16 +1,19 @@ var app = require('app'); var tmpHeader = require('./header.html'); -var loginV2Tmp = require('component/login/login.html'); -require('controller/loginCtrl.js'); +var loginV2Tmp = require('page/login/login.html'); +require('page/login/loginCtrl.js'); app.directive('jmHeader', function (dialogs) { return { restrict: 'AE', templateUrl: tmpHeader, replace: true, - controller: function ($scope, User) { + controller: function ($scope, $state, User) { $scope.user = User.user; + + $scope.state = $state; + // 弹出登录框 $scope.modalV2 = function ($event) { $event.preventDefault(); diff --git a/src/directive/header.html b/src/layout/header.html similarity index 81% rename from src/directive/header.html rename to src/layout/header.html index 4d87f20..78f9f2e 100644 --- a/src/directive/header.html +++ b/src/layout/header.html @@ -1,6 +1,6 @@