星潮教室

@@ -27,9 +27,9 @@ const headTab = [
     }
 ];
 
-const processPublicData = (req, title) => {
+const processPublicData = (req, title, navBtn) => {
     let channel = req.query.channel || req.cookies._Channel || 'boys';
-    let headerData = headerModel.setNavHeader(title, channel);
+    let headerData = headerModel.setNavHeader(title, channel, '', '', navBtn);
     let renderData = {
         module: 'guang',
         title: title,
@@ -154,7 +154,7 @@ exports.detail = (req, res) => {
     res.render('star/detail', _.assign({
         isStarDetailPage: true,
         page: 'detail-list'
-    }, processPublicData(req, req.query.tag)));
+    }, processPublicData(req, req.query.tag, false)));
 };
 
 /**

@@ -21,12 +21,13 @@ const contentCode = {
     special: '89cc20483ee2cbc8a716dcfe2b6c7603'
 };
 
-/**
+class Star {
+    /**
      * 获取资源位数据
      * @param  {[string]} page
      * @return {[array]}
      */
-const getResources = (page) => {
+    static getResources(page) {
         return serviceAPI.get('operations/api/v5/resource/get', sign.apiSign({
             content_code: contentCode[page]
         })).then((result) => {
@@ -37,15 +38,14 @@ const getResources = (page) => {
                 return [];
             }
         });
-};
-
+    }
 
-/**
+    /**
      * 星潮教室首页数据处理
      * @param  {[array]} list
      * @return {[array]}
      */
-const processIndexData = (list) => {
+    static processIndexData(list) {
         const formatData = {
             ads: [],
             starAvatar: [],
@@ -103,15 +103,15 @@ const processIndexData = (list) => {
         });
 
         return formatData;
-};
+    }
 
 
-/**
+    /**
      * 明星专题列表数据处理
      * @param  {[array]} list
      * @return {[array]}
      */
-const processDetailData = (list) => {
+    static processDetailData(list) {
         const formatData = [];
 
         list = list || [];
@@ -123,13 +123,13 @@ const processDetailData = (list) => {
         });
 
         return formatData;
-};
+    }
 
 
-/**
+    /**
      * 星搭配文章列表数据处理
      */
-const processCollocationData = (list) => {
+    static processCollocationData(list) {
         const formatData = [];
 
         list = list || [];
@@ -145,29 +145,29 @@ const processCollocationData = (list) => {
         });
 
         return formatData;
-};
+    }
 
-/**
+    /**
      * 星潮首页
      */
-exports.getIndexData = () => {
+    static getIndexData() {
         return api.get('', sign.apiSign({
             method: 'app.starClass.index',
             code: '8adc27fcf5676f356602889afcfd2a8e'
         })).then((result) => {
             if (result && result.code === 200) {
-            return processIndexData(result.data);
+                return Star.processIndexData(result.data);
             } else {
                 logger.error('星潮教室首页数据返回 code 不是 200');
                 return {};
             }
         });
-};
+    }
 
-/**
+    /**
      * 明星专题
      */
-exports.getDetailData = (params) => {
+    static getDetailData(params) {
         return api.get('', sign.apiSign({
             method: 'app.starClass.lastTagArticle',
             tag: params.tag,
@@ -178,42 +178,42 @@ exports.getDetailData = (params) => {
                 if (params.page > result.data.totalPage) {
                     return '';
                 } else {
-                return processDetailData(result.data.list);
+                    return Star.processDetailData(result.data.list);
                 }
             } else {
                 logger.error('明星专题文章数据返回 code 不是 200');
                 return [];
             }
         });
-};
+    }
 
 
-/**
+    /**
      * 星专题
      */
-exports.getSpecialData = () => {
-    return getResources('special');
-};
+    static getSpecialData() {
+        return Star.getResources('special');
+    }
 
-/**
+    /**
      * 星搭配
      */
-exports.getCollocationListData = (params, uid) => {
+    static getCollocationListData(params, uid) {
 
         return serviceAPI.get('guang/api/v5/article/getStarClassroomArticleList', sign.apiSign(Object.assign({
             limit: '20',
             uid: uid
         }, params))).then((result) => {
             if (result && result.code === 200) {
-            return processCollocationData(result.data.list.artList);
+                return Star.processCollocationData(result.data.list.artList);
             } else {
                 logger.error('获取星搭配文章列表返回 code 不是 200');
                 return [];
             }
         });
-};
+    }
 
-exports.setFavorite = (params, uid) => {
+    static setFavorite(params, uid) {
         if (!uid) {
             return Promise.resolve({
                 code: 401,
@@ -227,4 +227,7 @@ exports.setFavorite = (params, uid) => {
             article_id: params.articleId,
             uid: uid
         }));
-};
+    }
+}
+
+module.exports = Star;
\ No newline at end of file

@@ -11,14 +11,12 @@
             <div class="count-area">
                 <span class="time"><i class="iconfont time-ico">&#xe603;</i>{{publishTime}}</span>
                 <span class="see"><i class="iconfont see-ico">&#xe602;</i>{{viewsNum}}</span>
-                <span class="collection"><i class="iconfont collected-ico {{#isCollected}} collected {{/isCollected}}">&#xe605;</i></span>
-
-                {{#if isApp}}
+                {{#if ../isApp}}
                     {{#if share.url}}
                         <a href="{{share.url}}" class="iconfont forward">&#xe600;</a>
                     {{/if}}
                 {{/if}}
-
+                <span class="collection"><i class="iconfont collected-ico {{#isCollected}} collected {{/isCollected}}">&#xe605;</i></span>
             </div>
         </div>
     </li>

@@ -44,7 +44,7 @@ $(function() {
             location.reload();
         },
         pullUp: function() {
-            $headTab.slideUp();
+            // $headTab.slideUp();
         }
     });
 
@@ -63,6 +63,7 @@ $(function() {
     //         transfrom: 'scale(' + scale + ')'
     //     });
     // });
+
     starIScroll.iScroll.on('scrollEnd', function() {
         $window.trigger('scroll');
 

@@ -51,6 +51,8 @@
                 display: inline-block;
                 margin-right: 5px;
                 font-size: 24px;
+                position: relative;
+                top: -2px;
             }
         }
 
@@ -74,8 +76,7 @@
         }
 
         .collection {
-            position: absolute;
-            right: 122px;
+            float: right;
         }
 
         .collected-ico {
@@ -91,8 +92,7 @@
         .forward {
             width: 40px;
             height: 28px;
-            position: absolute;
-            right: 23px;
+            float: right;
             margin-left: 45px;
             font-size: 24px;
             color: #b0b0b0;