fe / yohobuywap-node · Commits

Go to a project

Authored by zhangxiaoru
Commit 6b749f33fb36451c0c56d9332b6268bee3115a35 1 parent bb5eeb3c

camelCase

Inline Side-by-side
Showing 3 changed files with 13 additions and 15 deletions
... ... @@ -59,13 +59,13 @@ const getDetailData = (req, res, next) => {
}
plustarModel.getDetailData(id, uid, udid, gender, isApp, clientType).then((result) => {
result.brandIntro = htmlProcess.removeHtml(result.brandIntro);
result.brand_intro = htmlProcess.removeHtml(result.brand_intro);
res.render('plustar/detail', {
module: 'guang',
page: 'plustar-detail',
title: result.brandName,
title: result.brand_name,
pageHeader: headerModel.setNav({
navTitle: result.brandName
navTitle: result.brand_name
}),
ps: result
});
... ...
... ... @@ -3,7 +3,6 @@ const api = global.yoho.API;
const serviceAPI = global.yoho.ServiceAPI;
const _ = require('lodash');
const logger = global.yoho.logger;
const camelCase = global.yoho.camelCase;
const helpers = global.yoho.helpers;
const formaData = (data, gender) => {
... ... @@ -235,13 +234,12 @@ const getDetailData = (id, uid, udid, gender, isApp, clientType) => {
if (result && result.code === 200) {
let list = result.data || [];
list = camelCase(list);
let url;
let brandId = list.brandId;
let brandDomain = list.brandDomain;
let isDifferent = list.isDifferent;
let brandId = list.brand_id;
let brandDomain = list.brand_domain;
let isDifferent = list.is_different;
if (isApp) {
url = '?openby:yohobuy={"action":"go.brand","params":{"brand_id":"' + brandId + '","is_different":"' + isDifferent + '"}}';
... ...
<div class="ps-detail-page ps-page yoho-page">
{{# ps}}
<div id="brand-info" class="header brand-info ps-block" data-id="{{brandId}}">
<img class="banner lazy" data-original="{{image coverImg 640 309}}">
<img class="logo lazy" src="{{brandIco}}">
<div id="brand-info" class="header brand-info ps-block" data-id="{{brand_id}}">
<img class="banner lazy" data-original="{{image cover_img 640 309}}">
<img class="logo lazy" src="{{brand_ico}}">
<div class="header-content clearfix">
<p class="name-islike-container">
<span class="name">{{brandName}}</span>
<span class="name">{{brand_name}}</span>
<a id="brand-like" class="brand-islike iconfont {{# isLike}}like{{/ isLike}}" href="{{likeUrl}}">
&#xe605;
</a>
</p>
<div id="more-intro-click-range" class="clearfix">
<div id="intro" class="intro">
{{{brandIntro}}}
{{{brand_intro}}}
</div>
{{#if brandIntro}}
{{#if brand_intro}}
<span id="more-intro" class="more-intro">
<span id="intro-more-txt">more</span>
<i class="icon iconfont">&#xe609;</i>
... ...