node 星潮教室 二期

@@ -34,7 +34,7 @@ const renderData = {
     module: 'guang',
     module: 'guang',
     title: '新潮教室',
     title: '新潮教室',
     pageHeader: headerData
     pageHeader: headerData
-}
+};
 
 
 const curHeadTab = (num) => {
 const curHeadTab = (num) => {
     let i = 0;
     let i = 0;
@@ -95,7 +95,7 @@ exports.collocation = (req, res) => {
     res.render('star/collocation', _.assign(renderData, {
     res.render('star/collocation', _.assign(renderData, {
         headTab: headTab
         headTab: headTab
     }));
     }));
-}
+};
 
 
 /**
 /**
  * 星搭配文章请求
  * 星搭配文章请求
@@ -114,5 +114,5 @@ exports.collocationList = (req, res) => {
             collocationList: result
             collocationList: result
         }));
         }));
     });
     });
-    
-}
+
+};

@@ -40,14 +40,14 @@ const getResources = (page) => {
  */
  */
 exports.getIndexData = () => {
 exports.getIndexData = () => {
     return getResources('index');
     return getResources('index');
-}
+};
 
 
 /**
 /**
  * 星专题
  * 星专题
  */
  */
 exports.getSpecialData = () => {
 exports.getSpecialData = () => {
     return getResources('special');
     return getResources('special');
-}
+};
 
 
 /**
 /**
  * 星搭配
  * 星搭配
@@ -59,12 +59,12 @@ exports.getCollocationListData = (params, uid) => {
         uid: uid
         uid: uid
     }, params))).then((result) => {
     }, params))).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
-            return res;
+            return result;
         } else {
         } else {
             logger.error('获取星搭配文章列表返回 code 不是 200');
             logger.error('获取星搭配文章列表返回 code 不是 200');
             return [];
             return [];
         }
         }
     });
     });
-}
+};
 
 
-// guang/api/v5/article/getStarClassroomArticleList
+// guang/api/v5/article/getStarClassroomArticleList

@@ -8,16 +8,16 @@ var $ = require('yoho-jquery'),
     tip = require('../plugin/tip'),
     tip = require('../plugin/tip'),
     loading = require('../plugin/loading'),
     loading = require('../plugin/loading'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),
-    ellipsis = require('yoho-mlellipsis'),
-    stopLoading = false;
+    ellipsis = require('yoho-mlellipsis');
 
 
-var page = 1;
+var stopLoading = false,
+    page = 1;
 
 
 ellipsis.init();
 ellipsis.init();
 
 
 $('body').addClass('star-class-body');
 $('body').addClass('star-class-body');
 
 
-function massageAJAX(page) {
+function massageAJAX(pageData) {
     var $this, $title, $cont;
     var $this, $title, $cont;
 
 
     loading.showLoadingMask();
     loading.showLoadingMask();
@@ -25,7 +25,7 @@ function massageAJAX(page) {
         type: 'GET',
         type: 'GET',
         url: '/guang/star/collocation/list',
         url: '/guang/star/collocation/list',
         data: {
         data: {
-            page: page
+            page: pageData
         },
         },
         dataType: 'html',
         dataType: 'html',
         success: function(data) {
         success: function(data) {

@@ -84,7 +84,7 @@
         }
         }
 
 
         .collected {
         .collected {
-            color: #D62927;
+            color: #d62927;
         }
         }
 
 
         .forward {
         .forward {
@@ -104,6 +104,6 @@
 .star-class-body {
 .star-class-body {
     background: #333;
     background: #333;
     width: 100%;
     width: 100%;
-    font: 12px/1.5 Arial,'黑体';
+    font: 12px/1.5 Arial, '黑体';
     float: left;
     float: left;
-}
+}

@@ -32,5 +32,3 @@
         }
         }
     }
     }
 }
 }
-
-