fe / yohobuywap-node · Commits

Go to a project

Authored by 王水玲
Commit b9f3c1234f6b76a66fca8c0ea420fa0028615bc5 1 parent 220aff2f

camelCase

Inline Side-by-side
Showing 12 changed files with 50 additions and 53 deletions
... ... @@ -8,7 +8,6 @@ const utils = '../../../utils';
const contentCodeConfig = require('../../../config/content-code');
const _ = require('lodash');
const api = global.yoho.ServiceAPI;
const camelCase = global.yoho.camelCase;
const logger = global.yoho.logger;
const resourcesProcess = require(`${utils}/resources-process`);
... ... @@ -87,13 +86,12 @@ const _processSideBar = (list, choosed) => {
let offset = 0; // 分割数组用到的游标
list = list || [];
list = camelCase(list);
_.forEach(list, (item, i) => {
if (item.sub) {
item.sub.unshift({
sortName: item.sortName,
sortNameEn: item.sortNameEn,
sort_name: item.sort_name,
sort_name_en: item.sort_name_en,
back: true,
isSelect: false,
bgColor: _getSidebarColor(choosed)
... ... @@ -101,7 +99,7 @@ const _processSideBar = (list, choosed) => {
}
// 如果有分隔符，分割数组
if (item.separativeSign === 'Y') {
if (item.separative_sign === 'Y') {
formatData.push(list.slice(offset, i));
offset = i;
}
... ... @@ -130,6 +128,8 @@ const _getChannelResource = (params) => {
params.new_device = true; // eslint-disable-line
}
params.new_device = true;
return api.get('operations/api/v5/resource/home', params, {
cache: true
}).then(result => {
... ... @@ -180,16 +180,16 @@ const _getChannelList = () => {
list.channelList = [];
list.yohood = {};
result.data.list = camelCase(result.data.list || []);
result.data.list = result.data.list || [];
_.forEach(result.data.list, function(item) {
const channel = channelList[item.yhChannel - 1];
const channel = channelList[item.yh_channel - 1];
if (channel) {
list.channelList.push(channel);
}
if (_.toNumber(item.yhChannel) === 5) {
if (_.toNumber(item.yh_channel) === 5) {
list.yohood.showYohood = true;
list.yohood.yohoodHref = 'http://www.yohood.cn';
}
... ...
... ... @@ -2,20 +2,20 @@
{{#sideNav}}
<ul {{#if @first}}class="first"{{/if}}>
{{#this}}
<li class="{{lowerCase sortNameEn}}">
{{#if sortUrl}}
<a href="{{sortUrl}}" style="{{#if sortNameColor}}color:{{sortNameColor}};{{/if}}">
<li class="{{lowerCase sort_name_en}}">
{{#if sort_url}}
<a href="{{sort_url}}" style="{{#if sortNameColor}}color:{{sortNameColor}};{{/if}}">
{{else}}
<a href="javascript:;" style="{{#if sortNameColor}}color:{{sortNameColor}};{{/if}}">
{{/if}}
{{# sortIco}}
{{# sort_ico}}
<span class="nav-img" style="background-image: url({{image . 60 60}})"></span>
{{/ sortIco}}
{{^ sortIco}}
{{/ sort_ico}}
{{^ sort_ico}}
<i class="nav-icon"></i>
{{/ sortIco}}
<em>{{sortName}}</em>
<span class="title">{{sortNameEn}}</span>
{{/ sort_ico}}
<em>{{sort_name}}</em>
<span class="title">{{sort_name_en}}</span>
{{# sub}}
<span class="enter-subnav iconfont">&#xe614;</span>
{{/ sub}}
... ... @@ -24,16 +24,16 @@
<ul class="sub-nav">
{{# sub}}
<li class="{{# isSelect}}current{{/ isSelect}}" style="background-color:{{bgColor}};">
{{#if sortUrl}}
<a href="{{sortUrl}}" style="{{#if sortNameColor}}color:{{sortNameColor}};{{/if}}">
{{#if sort_url}}
<a href="{{sort_url}}" style="{{#if sortNameColor}}color:{{sortNameColor}};{{/if}}">
{{else}}
<a href="javascript:;" style="{{#if sortNameColor}}color:{{sortNameColor}};{{/if}}">
{{/if}}
{{# back}}
<i class="nav-back iconfont">&#xe610;</i>
{{/ back}}
<em>{{sortName}}</em>
<span class="title">{{sortNameEn}}</span>
<em>{{sort_name}}</em>
<span class="title">{{sort_name_en}}</span>
</a>
</li>
{{/ sub}}
... ...
... ... @@ -87,7 +87,6 @@ const _processDiscount = (list) => {
let flag = true;
list = list || [];
list = camelCase(list);
// list为1条数据是表示详情页，flag 设为false,不需要拼接跳转链接
if (list.length === 1) {
... ... @@ -96,7 +95,7 @@ const _processDiscount = (list) => {
_.forEach(list, (data) => {
if (flag === true) {
Object.assign(data, processTime(data.leftTime));
Object.assign(data, processTime(data.left_time));
}
formatData.push(data);
... ...
{{# title}}
<div class="floor-header-more">
<h2>{{#if title}}{{title}}{{else}}{{name}}{{/if}}</h2>
{{#if moreUrl}}
<a class="more-btn iconfont" href="{{moreUrl}}">&#xe618;</a>
{{#if more_url}}
<a class="more-btn iconfont" href="{{more_url}}">&#xe618;</a>
{{/if}}
</div>
{{/ title}}
... ...
... ... @@ -22,4 +22,4 @@
<div class="pagination-inner">
</div>
</div>
</div>
\ No newline at end of file
</div>
... ...
{{#data}}
{{> common/floor-header-more}}
<div class="creative-life">
{{# bigImage}}
{{# big_image}}
<a class="banner" href="{{url}}">
<img class="lazy" data-original="{{image src 640 403}}">
</a>
{{/ bigImage}}
{{/ big_image}}
<ul class="classify-list clearfix">
{{# list}}
<li class="classify">
... ... @@ -19,4 +19,4 @@
{{/ list}}
</ul>
</div>
{{/data}}
\ No newline at end of file
{{/data}}
... ...
... ... @@ -6,7 +6,7 @@
{{#list}}
<li>
<a href="/product/sale/discount/detail?id={{id}}&channel={{@root.channel}}">
<img class="lazy" data-original="{{image coverUrl 640 250}}" />
<img class="lazy" data-original="{{image cover_url 640 250}}" />
<p class="discount-cont">
<span class="discount-title">{{title}}</span>
<span class="discount-time {{#if warnColor}}red-color{{/if}}">{{time}}</span>
... ...
{{#data}}
{{> common/floor-header-more}}
<div class="fresh-only">
{{# bannerImage}}
{{# banner_image}}
<div class="fresh-swiper">
<a href="{{url}}">
<img class="lazy" data-original="{{image src 640 200}}">
</a>
</div>
{{/ bannerImage}}
{{/ banner_image}}
<div class="fresh-list-swiper">
<ul class="clearfix swiper-wrapper">
{{# list}}
<li class="swiper-slide">
<li class="swiper-slide">
<div class="img-box">
<a href="{{url}}">
<img class="swiper-lazy" data-src="{{image defaultImages 235 314}}" alt="">
<img class="swiper-lazy" data-src="{{image default_images 235 314}}" alt="">
</a>
<div class="swiper-lazy-preloader"></div>
</div>
<div class="fresh-info">
<p class="fresh-name"><a href="{{url}}">{{productName}}</a></p>
<p class="fresh-name"><a href="{{url}}">{{product_name}}</a></p>
<p class="price">
<span class="cur-price">¥{{salesPrice}}</span>
{{# marketPrice}}
<span class="cur-price">¥{{sales_price}}</span>
{{# market_price}}
<span class="old-price">¥{{.}}</span>
{{/marketPrice}}
{{/market_price}}
</p>
<span class="fresh-icon">新人价</span>
</div>
</li>
{{/ list}}
</ul>
</div>
</div>
</div>
{{/data}}
\ No newline at end of file
{{/data}}
... ...
{{#data}}
{{> common/floor-header-more}}
<div class="goods-category">
{{# bigImage}}
{{# big_image}}
{{#if bigList}}
<div class="category-swiper">
<ul class="swiper-wrapper">
... ... @@ -25,7 +25,7 @@
</a>
</div>
{{/if}}
{{/ bigImage}}
{{/ big_image}}
{{#if list}}
<ul class="category-list clearfix">
{{# list}}
... ...
... ... @@ -14,7 +14,7 @@
<p class="title">{{title}}</p>
<p class="time">
<span class="iconfont time-icon">&#xe603;</span>
<span>{{publishTime}}</span>
<span>{{publish_time}}</span>
</p>
</div>
</a>
... ...
... ... @@ -12,9 +12,9 @@
<h3 class="recommend-title">推荐搭配</h3>
<div class="recommend-swiper">
<ul class="recommend-list swiper-wrapper clearfix">
{{# recommendCollocation}}
{{# recommend_collocation}}
<li class="recommend-item swiper-slide"><a href="{{url}}"><img class="img" src="{{image src 140 140}}" alt="" /></a></li>
{{/ recommendCollocation}}
{{/ recommend_collocation}}
</ul>
</div>
</div>
... ...
const _ = require('lodash');
const processTime = require('./time-process');
const camelCase = global.yoho.camelCase;
/**
* 处理楼层数据
... ... @@ -11,10 +10,9 @@ module.exports = (list) => {
const formatData = [];
list = list || [];
list = camelCase(list);
_.forEach(list, (floor) => {
floor[_.camelCase(floor.templateName)] = true;
floor[_.camelCase(floor.template_name)] = true;
// 特殊资源位处理
// PLUS
... ... @@ -26,9 +24,9 @@ module.exports = (list) => {
// 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装
if (floor.recommendContentOne && floor.data) {
if (floor.data.bigImage && floor.data.bigImage.length > 1) {
floor.data.bigImage = {
bigList: floor.data.bigImage
if (floor.data.big_image && floor.data.big_image.length > 1) {
floor.data.big_image = {
bigList: floor.data.big_image
};
}
}
... ... @@ -36,7 +34,7 @@ module.exports = (list) => {
// OUTLETS
if (floor.titleImage && floor.data) {
if (floor.data.image) {
floor.data.bigImage = {
floor.data.big_image = {
bigList: [floor.data.image]
};
}
... ... @@ -51,7 +49,7 @@ module.exports = (list) => {
// 折扣专场
if (floor.discountActivity && floor.data && floor.data.list.length) {
_.map(floor.data.list, (item) => {
Object.assign(item, processTime(item.leftTime));
Object.assign(item, processTime(item.left_time));
});
}
... ...