Merge branch 'feature/pc_session_type' into 'gray'

Feature/pc session type



See merge request !309

@@ -202,42 +202,59 @@ module.exports = class extends global.yoho.BaseModel {
             });
         });
 
-        // 不是每页显示个数的倍数，填充数据
-        if (items.length % showNum !== 0) {
-            fillNum = showNum - (items.length % showNum);
-            for (i = 0; i < fillNum; i++) {
-                items.push({
-                    href: 'javascript:;', // eslint-disable-line
-                    img: ''
-                });
+        if (items.length !== 17) {
+            // 不是每页显示个数的倍数，填充数据
+            if (items.length % showNum !== 0) {
+                fillNum = showNum - (items.length % showNum);
+                for (i = 0; i < fillNum; i++) {
+                    items.push({
+                        href: 'javascript:;', // eslint-disable-line
+                        img: ''
+                    });
+                }
             }
-        }
 
-        for (i = 0; i < items.length; i++) {
-            let item = items[i];
+            for (i = 0; i < items.length; i++) {
+                let item = items[i];
 
-            let brandLogo = {
-                pageNum: Math.floor(i / showNum),
-                href: item.href,
-                img: item.img
-            };
+                let brandLogo = {
+                    pageNum: Math.floor(i / showNum),
+                    href: item.href,
+                    img: item.img
+                };
 
-            if (i % showNum === 5 || i === 5) {
+                if (i % showNum === 5 || i === 5) {
 
-                // 插入切换按钮的位置
-                brandLogo.isSwitch = true;
-            } else if (i !== 0 && i % showNum === 0) {
+                    // 插入切换按钮的位置
+                    brandLogo.isSwitch = true;
+                } else if (i !== 0 && i % showNum === 0) {
 
-                // 插入more的位置，more占的是下一页第一个brand的位置，所以page是i/17
-                brandLogo.morePageNum = Math.floor(i / (showNum + 1));
-                brandLogo.isMore = true;
-                brandLogo.hasNext = true;
-            } else {
-                brandLogo.isBrand = true;
-            }
+                    // 插入more的位置，more占的是下一页第一个brand的位置，所以page是i/17
+                    brandLogo.morePageNum = Math.floor(i / (showNum + 1));
+                    brandLogo.isMore = true;
+                    brandLogo.hasNext = true;
+                } else {
+                    brandLogo.isBrand = true;
+                }
 
-            brandLogos.push(brandLogo);
+                brandLogos.push(brandLogo);
+            }
+        } else {
+            // 当男首只有 17 条数据时，把上一页下一页隐藏，于水
+            for (i = 0; i < items.length; i++) {
+                let item = items[i];
+
+                let brandLogo = {
+                    pageNum: Math.floor(i / showNum),
+                    href: item.href,
+                    img: item.img,
+                    isBrand: true
+                };
+
+                brandLogos.push(brandLogo);
+            }
         }
+
         brandLogos.push({
             morePageNum: Math.floor(i / (showNum + 1)),
             isMore: true
@@ -970,7 +987,7 @@ module.exports = class extends global.yoho.BaseModel {
     _formatResourceParams(channel, code) {
         return this.get({
             url: 'operations/api/v5/resource/get',
-            data: { content_code: code },
+            data: {content_code: code},
             param: config.apiCache,
             api: global.yoho.ServiceAPI
         }).then(data => {

@@ -110,7 +110,7 @@ module.exports = class extends global.yoho.BaseModel {
 
         if (Number(articleData.conver_image_type) === 2) {
             width = 360;
-            height = 240;
+            height = 224;
             isSquareImage = false;
         }
 

@@ -127,6 +127,8 @@ module.exports = class extends global.yoho.BaseModel {
             req.session.TOKEN_ = publicToken;
             req.session.LOGIN_UID_ = uid;
             req.session.USER_MOBILE = data.mobile;
+            req.session.SESSION_TYPE = config.app;
+            req.session.SESSION_KEY = sessionKey;
 
             res.cookie('_TOKEN', publicToken, {
                 domain: config.cookieDomain,

 {
   "name": "yohobuy-node",
-  "version": "6.6.3",
+  "version": "6.6.4",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -159,7 +159,7 @@
             img {
                 display: block;
                 width: 360px;
-                height: 240px;
+                height: 224px;
             }
 
             img.square {