Authored by zhangxiaoru

camelCase

@@ -59,13 +59,13 @@ const getDetailData = (req, res, next) => { @@ -59,13 +59,13 @@ const getDetailData = (req, res, next) => {
59 } 59 }
60 60
61 plustarModel.getDetailData(id, uid, udid, gender, isApp, clientType).then((result) => { 61 plustarModel.getDetailData(id, uid, udid, gender, isApp, clientType).then((result) => {
62 - result.brandIntro = htmlProcess.removeHtml(result.brandIntro); 62 + result.brand_intro = htmlProcess.removeHtml(result.brand_intro);
63 res.render('plustar/detail', { 63 res.render('plustar/detail', {
64 module: 'guang', 64 module: 'guang',
65 page: 'plustar-detail', 65 page: 'plustar-detail',
66 - title: result.brandName, 66 + title: result.brand_name,
67 pageHeader: headerModel.setNav({ 67 pageHeader: headerModel.setNav({
68 - navTitle: result.brandName 68 + navTitle: result.brand_name
69 }), 69 }),
70 ps: result 70 ps: result
71 }); 71 });
@@ -3,7 +3,6 @@ const api = global.yoho.API; @@ -3,7 +3,6 @@ const api = global.yoho.API;
3 const serviceAPI = global.yoho.ServiceAPI; 3 const serviceAPI = global.yoho.ServiceAPI;
4 const _ = require('lodash'); 4 const _ = require('lodash');
5 const logger = global.yoho.logger; 5 const logger = global.yoho.logger;
6 -const camelCase = global.yoho.camelCase;  
7 const helpers = global.yoho.helpers; 6 const helpers = global.yoho.helpers;
8 7
9 const formaData = (data, gender) => { 8 const formaData = (data, gender) => {
@@ -235,13 +234,12 @@ const getDetailData = (id, uid, udid, gender, isApp, clientType) => { @@ -235,13 +234,12 @@ const getDetailData = (id, uid, udid, gender, isApp, clientType) => {
235 if (result && result.code === 200) { 234 if (result && result.code === 200) {
236 235
237 let list = result.data || []; 236 let list = result.data || [];
238 -  
239 - list = camelCase(list); 237 +
240 let url; 238 let url;
241 239
242 - let brandId = list.brandId;  
243 - let brandDomain = list.brandDomain;  
244 - let isDifferent = list.isDifferent; 240 + let brandId = list.brand_id;
  241 + let brandDomain = list.brand_domain;
  242 + let isDifferent = list.is_different;
245 243
246 if (isApp) { 244 if (isApp) {
247 url = '?openby:yohobuy={"action":"go.brand","params":{"brand_id":"' + brandId + '","is_different":"' + isDifferent + '"}}'; 245 url = '?openby:yohobuy={"action":"go.brand","params":{"brand_id":"' + brandId + '","is_different":"' + isDifferent + '"}}';
1 <div class="ps-detail-page ps-page yoho-page"> 1 <div class="ps-detail-page ps-page yoho-page">
2 {{# ps}} 2 {{# ps}}
3 - <div id="brand-info" class="header brand-info ps-block" data-id="{{brandId}}">  
4 - <img class="banner lazy" data-original="{{image coverImg 640 309}}">  
5 - <img class="logo lazy" src="{{brandIco}}"> 3 + <div id="brand-info" class="header brand-info ps-block" data-id="{{brand_id}}">
  4 + <img class="banner lazy" data-original="{{image cover_img 640 309}}">
  5 + <img class="logo lazy" src="{{brand_ico}}">
6 <div class="header-content clearfix"> 6 <div class="header-content clearfix">
7 <p class="name-islike-container"> 7 <p class="name-islike-container">
8 - <span class="name">{{brandName}}</span> 8 + <span class="name">{{brand_name}}</span>
9 <a id="brand-like" class="brand-islike iconfont {{# isLike}}like{{/ isLike}}" href="{{likeUrl}}"> 9 <a id="brand-like" class="brand-islike iconfont {{# isLike}}like{{/ isLike}}" href="{{likeUrl}}">
10 &#xe605; 10 &#xe605;
11 </a> 11 </a>
12 </p> 12 </p>
13 <div id="more-intro-click-range" class="clearfix"> 13 <div id="more-intro-click-range" class="clearfix">
14 <div id="intro" class="intro"> 14 <div id="intro" class="intro">
15 - {{{brandIntro}}} 15 + {{{brand_intro}}}
16 </div> 16 </div>
17 - {{#if brandIntro}} 17 + {{#if brand_intro}}
18 <span id="more-intro" class="more-intro"> 18 <span id="more-intro" class="more-intro">
19 <span id="intro-more-txt">more</span> 19 <span id="intro-more-txt">more</span>
20 <i class="icon iconfont">&#xe609;</i> 20 <i class="icon iconfont">&#xe609;</i>