fix: 网站目录结构整合

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;

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');

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');

src/directive/header.directive.js → 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();

src/directive/header.html → src/layout/header.html

@@ -1,6 +1,6 @@
 <div id="header" class="container">
     <header class="row">
-        <div class="col-md-4 col-md-offset-2 logo">
+        <div class="col-md-6 col-md-offset-2 logo">
             <a ui-sref="home" class="fn-clear" style="display: inline-block; vertical-align: middle">
                 <div><img height="42" src="../asset/img/logo.png" alt="jumore 聚贸" title="jumore 聚贸" /></div>
             </a>
@@ -10,11 +10,11 @@
         </div>
 
 
-        <div class="col-md-16 nav-main">
+        <div class="col-md-14 nav-main">
             <div class="hidden-xs">
                 <ul class="nav nav-pills pull-right" role="tablist">
                     <li ui-sref-active="active"><a ui-sref="about">Home</a></li>
-                    <li ui-sref-active="active"><a ui-sref="home.chart">组件</a></li>
+                    <li ng-class="{active: state.includes('home')}"><a ui-sref="home.chart">组件</a></li>
                 </ul>
             </div>
 

src/router/about/about.js → src/page/about/about.js

@@ -12,7 +12,7 @@ module.exports = {
         loadCtrl: function ($q) {
             var defer = $q.defer();
             require.ensure([], function (require) {
-                defer.resolve(require('controller/aboutCtrl.js'));
+                defer.resolve(require('./aboutCtrl.js'));
             }, 'about');
             return defer.promise;
         }

src/router/accordion/accordion.js → src/page/accordion/accordion.js

@@ -11,7 +11,7 @@ module.exports = {
     loadCtrl: function ($q, $timeout) {
       var defer = $q.defer();
       require.ensure([], function (require) {
-        defer.resolve(require('controller/accordionCtrl.js'));
+        defer.resolve(require('./accordionCtrl.js'));
       }, 'accordion');
       return defer.promise;
     }

src/router/alert/alert.js → src/page/alert/alert.js

@@ -14,7 +14,7 @@ module.exports = {
     loadCtrl: function ($q) {
       var defer = $q.defer();
       require.ensure([], function (require) {
-        defer.resolve(require('controller/alertCtrl.js'));
+        defer.resolve(require('./alertCtrl.js'));
       }, 'alert');
       return defer.promise;
     }

src/router/anchor/anchor.js → src/page/anchor/anchor.js

@@ -11,7 +11,7 @@ module.exports = {
     loadCtrl: function ($q, $timeout) {
       var defer = $q.defer();
       require.ensure([], function (require) {
-        defer.resolve(require('controller/anchorCtrl.js'));
+        defer.resolve(require('./anchorCtrl.js'));
       }, 'anchor');
       return defer.promise;
     }

src/router/chart/chart.js → src/page/chart/chart.js

@@ -10,7 +10,7 @@ module.exports = {
         loadCtrl: function ($q, $timeout) {
             var defer = $q.defer();
             require.ensure([], function (require) {
-                defer.resolve(require('controller/chartCtrl.js'));
+                defer.resolve(require('./chartCtrl.js'));
             }, 'chart');
             return defer.promise;
         }

src/controller/chartCtrl.js → src/page/chart/chartCtrl.js

@@ -1,4 +1,4 @@
-var app = require('../app');
+var app = require('../../app');
 
 // 调用Api 服务
 app.registerController('ChartCtrl',

src/router/crumb/crumb.js → src/page/crumb/crumb.js

@@ -15,7 +15,7 @@ module.exports = {
     loadCtrl: function ($q) {
       var defer = $q.defer();
       require.ensure([], function (require) {
-        defer.resolve(require('controller/crumbCtrl.js'));
+        defer.resolve(require('./crumbCtrl.js'));
       }, 'crumb');
       return defer.promise;
     }

src/router/dialog/dialog.js → src/page/dialog/dialog.js

@@ -2,7 +2,7 @@
  * Created by Administrator on 2017/4/20 0020.
  */
 var templateUrl = require('page/dialog/index.html');
-var loginV2Tmp = require('component/login/login.html');
+var loginV2Tmp = require('page/login/login.html');
 module.exports = {
   title: 'dialog',
   url: '^/dialog',
@@ -14,7 +14,7 @@ module.exports = {
     loadCtrl: function ($q, $timeout) {
       var defer = $q.defer();
       require.ensure([], function (require) {
-        defer.resolve(require('controller/dialogCtrl.js'));
+        defer.resolve(require('./dialogCtrl.js'));
       }, 'dialog');
       return defer.promise;
     }

src/controller/dialogCtrl.js → src/page/dialog/dialogCtrl.js

@@ -4,7 +4,7 @@
  */
 
 var app = require('app');
-var loginV2Tmp = require('component/login/login.html');
+var loginV2Tmp = require('page/login/login.html');
 
 app.registerController('DialogCtrl', DialogCtrl);
 

src/router/help/help.js → src/page/help/help.js

@@ -10,7 +10,7 @@ module.exports = {
         loadCtrl: function ($q) {
             var defer = $q.defer();
             require.ensure([], function (require) {
-                defer.resolve(require('controller/helpCtrl.js'));
+                defer.resolve(require('./helpCtrl.js'));
             }, 'help');
             return defer.promise;
         }

src/router/home/home.js → src/page/home/home.js

@@ -14,7 +14,7 @@ module.exports = {
     loadCtrl: function ($q) {
       var defer = $q.defer();
       require.ensure([], function (require) {
-        defer.resolve(require('controller/homeCtrl.js'));
+        defer.resolve(require('./homeCtrl.js'));
       }, 'home');
       return defer.promise;
     }

src/page/home/index.html

@@ -8,7 +8,7 @@
       <li><a ui-sref="home.ueditor" ui-sref-active="active">Ueditor</a></li>
       <li><a ui-sref="home.tooltip" ui-sref-active="active">Tooltip</a></li>
       <li><a ui-sref="home.switch" ui-sref-active="active">Switch</a></li>
-      <li><a ui-sref="home.layzimg" ui-sref-active="active">LayzImg</a></li>
+      <li><a ui-sref="home.lazyimg" ui-sref-active="active">LazyImg</a></li>
       <li><a ui-sref="home.rate" ui-sref-active="active">Rate</a></li>
       <li><a ui-sref="home.alert" ui-sref-active="active">Alert</a></li>
       <li><a ui-sref="home.dialog" ui-sref-active="active">Dialog</a></li>

src/router/home/index.js → src/page/home/index.js

@@ -16,7 +16,7 @@ module.exports = {
     loadCtrl: function ($q) {
       var defer = $q.defer();
       require.ensure([], function (require) {
-        defer.resolve(require('controller/homeCtrl.js'));
+        defer.resolve(require('./homeCtrl.js'));
       }, 'home');
       return defer.promise;
     }

src/router/imgError/imgError.js → src/page/imgError/imgError.js

@@ -11,7 +11,7 @@ module.exports = {
     loadCtrl: function ($q) {
       var defer = $q.defer();
       require.ensure([], function (require) {
-        defer.resolve(require('controller/imgErrorCtrl.js'));
+        defer.resolve(require('./imgErrorCtrl.js'));
       }, 'imgError');
       return defer.promise;
     }

src/page/lazyimg/index.html

@@ -1,26 +1,35 @@
-<div class="panel">
-    <header class="panel-heading">
+<div class="col-md-24">
+  <h1>Layzimg <span class="small">懒加载图片</span></h1>
+
+
+  <div class="row">
+    <!--图片懒加载 -->
+    <div class="panel">
+      <header class="panel-heading">
         <h3>图片懒加载</h3>
-    </header>
+      </header>
 
-    <section class="panel-body">
+      <section class="panel-body">
         <div class="form-group row">
-            <div class="col-lg-6">
-                <select class="form-control" ng-model="searchText">
-                    <option value="1">filter 1</option>
-                    <option value="2">filter 2</option>
-                    <option value="3">none</option>
-                </select>
-            </div>
+          <div class="col-lg-6">
+            <select class="form-control" ng-model="vm.searchText">
+              <option value="1">filter 1</option>
+              <option value="2">filter 2</option>
+              <option value="3">none</option>
+            </select>
+          </div>
 
-            <span class="p-t-sm" ng-bind="filtered.length">0</span> item(s)
+          <span class="p-t-sm" ng-bind="filtered.length">0</span> item(s)
         </div>
 
 
         <ul class="list-unstyled">
-            <li class="demo-repeat-list--items" ng-repeat="image in filtered =(collection | filter:{'type': searchText})">
-                <span afkl-lazy-image="{{image.srcset}}" class="afkl-lazy-wrapper afkl-img-ratio-3-2"></span>
-            </li>
+          <li class="demo-repeat-list--items"
+              ng-repeat="image in filtered =(vm.collection | filter:{'type': vm.searchText})">
+            <span afkl-lazy-image="{{image.srcset}}" class="afkl-lazy-wrapper afkl-img-ratio-3-2"></span>
+          </li>
         </ul>
-    </section>
+      </section>
+    </div>
+  </div>
 </div>