Authored by 王水玲

Merge branch 'hotfix/single' of git.yoho.cn:fe/yohobuywap-node into hotfix/single

@@ -10,12 +10,17 @@ const logger = global.yoho.logger; @@ -10,12 +10,17 @@ const logger = global.yoho.logger;
10 const service = global.yoho.ServiceAPI; 10 const service = global.yoho.ServiceAPI;
11 11
12 const shopList = (uid, tabName, channelId) => { 12 const shopList = (uid, tabName, channelId) => {
13 - return api.get('', { 13 + let params = {
14 method: 'app.shops.promote', 14 method: 'app.shops.promote',
15 uid: uid, 15 uid: uid,
16 - tab_name: tabName,  
17 - channel_id: channelId  
18 - }, { 16 + tab_name: tabName
  17 + };
  18 +
  19 + if (channelId) {
  20 + params.channel_id = channelId;
  21 + }
  22 +
  23 + return api.get('', params, {
19 code: 200 24 code: 200
20 }).then((result) => { 25 }).then((result) => {
21 if (result && result.code === 200) { 26 if (result && result.code === 200) {
@@ -40,10 +45,14 @@ const shopList = (uid, tabName, channelId) => { @@ -40,10 +45,14 @@ const shopList = (uid, tabName, channelId) => {
40 }; 45 };
41 46
42 const shopNav = (channelId) => { 47 const shopNav = (channelId) => {
43 - return api.get('', {  
44 - method: 'app.shops.promoteTabNameList',  
45 - channel_id: channelId  
46 - }, { 48 + let params = {
  49 + method: 'app.shops.promoteTabNameList'
  50 + };
  51 +
  52 + if (channelId) {
  53 + params.channel_id = channelId;
  54 + }
  55 + return api.get('', params, {
47 cache: true, 56 cache: true,
48 code: 200 57 code: 200
49 }).then((result) => { 58 }).then((result) => {
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
124 124
125 .content { 125 .content {
126 width: 750px; 126 width: 750px;
127 - height: 330px; 127 + height: 329px;
128 } 128 }
129 } 129 }
130 } 130 }