星潮优化

@@ -24,6 +24,8 @@ const headTab = [
     }
     }
 ];
 ];
 
 
+let md5Str = '';
+
 const processPublicData = (req, title) => {
 const processPublicData = (req, title) => {
     let renderData = {
     let renderData = {
         module: 'guang',
         module: 'guang',
@@ -49,6 +51,7 @@ exports.index = (req, res, next) => {
     pageHeadTab[0].cur = true;
     pageHeadTab[0].cur = true;
 
 
     starModel.getIndexData().then((result) => {
     starModel.getIndexData().then((result) => {
+        md5Str = result.md5;
         res.render('star/index', _.assign({
         res.render('star/index', _.assign({
             page: 'star',
             page: 'star',
             isStarIndexPage: true,
             isStarIndexPage: true,
@@ -58,22 +61,28 @@ exports.index = (req, res, next) => {
                 data: result.ads
                 data: result.ads
             },
             },
             starAvatar: result.starAvatar ? result.starAvatar : '',
             starAvatar: result.starAvatar ? result.starAvatar : '',
-            articles: result.articles
+            articles: result.articles,
+            md5: result.md5
         }, processPublicData(req, '星潮教室')));
         }, processPublicData(req, '星潮教室')));
     }).catch(next);
     }).catch(next);
 };
 };
 
 
 exports.getIndexHtml = (req, res, next) => {
 exports.getIndexHtml = (req, res, next) => {
     starModel.getIndexData().then((result) => {
     starModel.getIndexData().then((result) => {
-        res.render('star/index-html', _.assign({
-            layout: false,
-            content: {
-                focus: true,
-                data: result.ads
-            },
-            starAvatar: result.starAvatar ? result.starAvatar : '',
-            articles: result.articles
-        }));
+        if (md5Str !== result.md5) {
+            res.render('star/index-html', _.assign({
+                layout: false,
+                content: {
+                    focus: true,
+                    data: result.ads
+                },
+                starAvatar: result.starAvatar ? result.starAvatar : '',
+                articles: result.articles
+            }));
+        } else {
+            res.json();
+        }
+
     }).catch(next);
     }).catch(next);
 };
 };
 
 

@@ -44,16 +44,19 @@ const _getResources = (page) => {
  * @param  {[array]} list
  * @param  {[array]} list
  * @return {[array]}
  * @return {[array]}
  */
  */
-const _processIndexData = (list) => {
+const _processIndexData = (dataList) => {
     const formatData = {
     const formatData = {
         ads: [],
         ads: [],
         starAvatar: [],
         starAvatar: [],
         articles: []
         articles: []
     };
     };
 
 
-    list = list || {};
+    let list = dataList.data || {};
+
     list = camelCase(list);
     list = camelCase(list);
 
 
+    formatData.md5 = dataList.md5;
+
     // 首页资源位数据处理
     // 首页资源位数据处理
     if (list.ads) {
     if (list.ads) {
         _.forEach(list.ads.data, (data) => {
         _.forEach(list.ads.data, (data) => {
@@ -155,7 +158,7 @@ const getIndexData = () => {
         client_type: 'iphone'
         client_type: 'iphone'
     })).then((result) => {
     })).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
-            return _processIndexData(result.data);
+            return _processIndexData(result);
         } else {
         } else {
             logger.error('星潮教室首页数据返回 code 不是 200');
             logger.error('星潮教室首页数据返回 code 不是 200');
             return {};
             return {};

@@ -102,11 +102,6 @@ function setIndexAction() {
         pullDown: function() {
         pullDown: function() {
             if (!stopLoading) {
             if (!stopLoading) {
                 stopLoading = true;
                 stopLoading = true;
-
-                if (avatarSwiperClone) {
-                    avatarSwiperClone.destroy(true, true);
-                    avatarSwiperClone = '';
-                }
                 getIndexHtml();
                 getIndexHtml();
             }
             }
         }
         }
@@ -264,14 +259,17 @@ getIndexHtml = function() {
         success: function(data) {
         success: function(data) {
             stopLoading = false;
             stopLoading = false;
 
 
-            if (!data) {
-                stopLoading = true;
-                tip.show('没有更多内容了');
-            }
+            if (data) {
+                if (avatarSwiperClone) {
+                    avatarSwiperClone.destroy(true, true);
+                    avatarSwiperClone = '';
+                }
+
+                $starMain.html(data);
 
 
-            $starMain.html(data);
+                initAction();
+            }
 
 
-            initAction();
             loading.hideLoadingMask();
             loading.hideLoadingMask();
         },
         },
         error: function() {
         error: function() {