fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit f8fb0db2dd479cbbb9f36d6ff74fbe15a0b5d79e 2 parents 3683a4dc 1fdfc608

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

Inline Side-by-side
Showing 31 changed files with 759 additions and 99 deletions
... ... @@ -23,7 +23,7 @@ const index = (req, res, next) => {
// let gender = req.query.brand || 1;
editorialModel.getIndexData(type, pageNum, limit, appType).then((result) => {
// console.log(result.msg)
res.display('index', {
module: 'editorial',
page: 'index',
... ... @@ -177,8 +177,9 @@ const detail = (req, res, next) => {
let setCollect = (req, res, next) => {
let uid = req.user.uid;
let id = req.body.id;
let appType = 1;
editorialModel.setCollect(id, uid).then((result) => {
editorialModel.setCollect(id, uid, appType).then((result) => {
res.json(result);
}).catch(next);
};
... ... @@ -192,8 +193,9 @@ let setCollect = (req, res, next) => {
let cancelCollect = (req, res, next) => {
let uid = req.user.uid;
let id = req.body.id;
let appType = 1;
editorialModel.cancelCollect(id, uid).then((result) => {
editorialModel.cancelCollect(id, uid, appType).then((result) => {
res.json(result);
}).catch(next);
};
... ... @@ -205,10 +207,11 @@ let cancelCollect = (req, res, next) => {
* @param next
*/
let setPraise = (req, res, next) => {
let udid = req.user.uid;
let udid = req.user.udid;
let id = req.query.id;
let appType = 1;
editorialModel.setPraise(id, udid).then((result) => {
editorialModel.setPraise(id, udid, appType).then((result) => {
res.json(result);
}).catch(next);
};
... ... @@ -220,10 +223,11 @@ let setPraise = (req, res, next) => {
* @param next
*/
let cancelPraise = (req, res, next) => {
let udid = req.user.uid;
let udid = req.user.udid;
let id = req.query.id;
let appType = 1;
editorialModel.cancelPraise(id, udid).then((result) => {
editorialModel.cancelPraise(id, udid, appType).then((result) => {
res.json(result);
}).catch(next);
};
... ...
... ... @@ -12,8 +12,6 @@ const _ = require('lodash');
const Promise = require('bluebird');
const co = Promise.coroutine;
const config = global.yoho.config;
// const moment = require('moment');
const logger = global.yoho.logger;
// const helpers = global.yoho.helpers;
... ... @@ -55,6 +53,10 @@ const _processListData = (list) => {
tabs: []
};
listData = _.assign(listData, {
total: list.total
});
_.forEach(list.list.artList, (data, index) => {
if (index === 0) {
listData = _.assign(listData, {
... ... @@ -65,11 +67,7 @@ const _processListData = (list) => {
data.publishTime = data.publishTime.replace(/年|月/g, '/');
data.publishTime = data.publishTime.replace(/日/g, '');
if (data.isPraise === 'N') {
data.isPraise = false;
} else {
data.isPraise = true;
}
data.isPraise = data.isPraise === 'Y';
});
listData.tabs = list.list.artList;
... ... @@ -186,7 +184,7 @@ const _getAuthorData = (id) => {
};
/**
* 详情页文章头部基本信息内容数据处理
* 详情页推荐内容数据处理
* @param id
* @returns {*}
*/
... ... @@ -204,17 +202,8 @@ const _processHeadData = (list) => {
if (index === 0) {
if (data.isPraise === 'N') {
data.isPraise = false;
} else {
data.isPraise = true;
}
if (data.isFavor === 'N') {
data.isFavor = false;
} else {
data.isFavor = true;
}
data.isPraise = data.isPraise === 'Y';
data.isFavor = data.isFavor === 'Y';
newData.headData = {
title: data.intro,
... ... @@ -267,6 +256,34 @@ const _processHeadData = (list) => {
})();
};
// 推荐商品
// const _getRelatedData = (id) => {
// return api.get('', {
// query: id,
// method: 'app.search.li'
// }).then((result) => {
// let productList = {};
// if (result && result.code === 200) {
// // console.log(result);
// _.forEach(result.data. product_list, function(data) {
// // console.log(data)
// productList.name = data.product_name;
// productList.price = data.sales_price;
// productList.id = data.product_id;
// productList.cnAlphabet = data.cn_alphabet;
// });
// // console.log(productList)
// return productList;
// } else {
// logger.error('推荐商品 cood 不是 200');
// return {};
// }
// });
// };
/**
* 详情页文章内容数据处理
* @param id
... ... @@ -289,15 +306,53 @@ const _processContentData = (list) => {
shareImg: data.src
});
}
});
return false;
}
});
contentData.contents = list;
// console.log(list)
// let collocation = {};
// _.forEach(contentData.contents, function(value) {
// // console.log(value)
// if (value.goods) {
// console.log(value);
// _.forEach(value.goods.data, function(data) {
// _getRelatedData(51152761).then((result) => {
// data = _.assign(data, result);
// data = _.assign(data, {
// link: `${config.siteUrl}/product/pro_${result.id}_${data.productSkc}/${result.cnAlphabet}`
// });
// });
// });
// }
// if (value.goodsGroup) {
// _.forEach(value.goodsGroup.data, function(data) {
// // console.log(data)
// _.forEach(data.list, function(value) {
// // console.log(value)
// _getRelatedData(51152761).then((result) => {
// // console.log(result)
// value = _.assign(value, result);
// value = _.assign(value, {
// link: `${config.siteUrl}/product/pro_${result.id}_${value.productSkc}/${result.cnAlphabet}`
// });
// // console.log(value)
// });
// });
// });
// }
// });
return contentData;
};
... ... @@ -388,7 +443,6 @@ const _getRelateBrand = (id) => {
let domain = data.url;
domain = domain.substring(domain.indexOf('/') + 2, domain.indexOf('.'));
console.log(domain);
data.url = `${config.siteUrl}/product/shop/${domain}`;
});
return camelCase(result.data);
... ... @@ -405,7 +459,7 @@ const _getRelateBrand = (id) => {
* @param id
* @returns {*}
*/
const setCollect = (id, uid) => {
const setCollect = (id, uid, appType) => {
if (!uid) {
return Promise.resolve({
code: 400,
... ... @@ -414,7 +468,8 @@ const setCollect = (id, uid) => {
}
return serviceAPI.get('/guang/api/*/favorite/setFavorite', {
article_id: id,
uid: uid
uid: uid,
app_type: appType
});
};
... ... @@ -424,7 +479,7 @@ const setCollect = (id, uid) => {
* @param id
* @returns {*}
*/
const cancelCollect = (id, uid) => {
const cancelCollect = (id, uid, appType) => {
if (!uid) {
return Promise.resolve({
code: 400,
... ... @@ -433,7 +488,8 @@ const cancelCollect = (id, uid) => {
}
return serviceAPI.get('/guang/api/*/favorite/cancelFavorite', {
article_id: id,
uid: uid
uid: uid,
app_type: appType
});
};
... ... @@ -443,11 +499,12 @@ const cancelCollect = (id, uid) => {
* @param id
* @returns {*}
*/
const setPraise = (id, udid) => {
const setPraise = (id, udid, appType) => {
return serviceAPI.get('/guang/api/*/praise/setPraise', {
article_id: id,
udid: udid
udid: udid,
app_type: appType
});
};
... ... @@ -457,11 +514,12 @@ const setPraise = (id, udid) => {
* @param id
* @returns {*}
*/
const cancelPraise = (id, udid) => {
const cancelPraise = (id, udid, appType) => {
return serviceAPI.get('/guang/api/*/praise/cancel', {
article_id: id,
udid: udid
udid: udid,
app_type: appType
});
};
... ... @@ -486,6 +544,18 @@ const addComment = (id, uid, comment) => {
});
};
const shareData = () => {
return serviceAPI.get('/guang/api/*/share/guang', {}).then((result) => {
if (result && result.code === 200) {
console.log(34346);
return camelCase(result.data);
} else {
logger.error('Related brand return code is not 200');
return {};
}
});
};
/**
* 获取详情页相关数据
* @param id
... ... @@ -518,5 +588,6 @@ module.exports = {
cancelCollect,
setPraise,
cancelPraise,
addComment
addComment,
shareData
};
... ...
... ... @@ -42,36 +42,45 @@
</div>
{{/ text}}
{{!-- {{# goodsGroup}}
{{!-- {{# goods}}
<div class="related-reco">
<div class="article-title">
<div class="article-title">
<div class="title-line"></div>
<div class="text-center">
<div class="text">
<span>推荐搭配</span>
</div>
</div>
</div>
</div>
<div class="related-goods">
{{# list}}
{{> goods}}
{{/ list}}
{{# data}}
{{> related-goods}}
{{/ data}}
</div>
</div>
{{/ goodsGroup}}
{{/ goods}}
{{# relatedGoods}}
{{# goodsGroup}}
<div class="related-reco">
{{> article-related}}
<div class="article-title">
<div class="title-line"></div>
<div class="text-center">
<div class="text">
<span>推荐商品</span>
</div>
</div>
</div>
<div class="related-goods">
{{# goods}}
{{> goods}}
{{/ goods}}
{{# data}}
{{# list}}
{{> related-goods}}
{{/ list}}
{{/ data}}
</div>
</div>
{{/ relatedGoods}} --}}
{{/ goodsGroup}} --}}
{{/ content}}
{{#if brands}}
... ...
<div class="goods-info" data-skn="{{skn}}">
<a href="{{link}}" target="_blank">
<img class="thumb" src="{{image src 219 295}}">
</a>
<div class="desc">
<a class="name" href="{{link}}" target="_blank">{{name}}</a>
<p class="price">￥{{price}}</p>
</div>
</div>
\ No newline at end of file
... ...
/**
* 帮助中心
* @author: jiangmin
* @date: 2016/07/25
*/
'use strict';
const helpModel = require('../models/help');
/**
* 主界面
*/
const index = (req, res) => {
let id = req.query.id || "11";
helpModel.getHelpDetail("81", 1, 15, "").then(result=> {
let content = {content: result.helpdetail_list[0].content};
let data = Object.assign(content, helpModel.menuData());
let nav = [
{
link: global.yoho.config.sitUrl,
name: 'YOHO!BLK首页'
},
{
name: '帮助中心'
}
];
nav = nav.concat(getNav(id));
res.display('detail', {
module: 'help',
page: 'help',
content: Object.assign({nav}, data)
});
});
/* let data = Object.assign(getData(id), helpModel.menuData());
let nav = [
{
link: global.yoho.config.sitUrl,
name: 'YOHO!BLK首页'
},
{
name: '帮助中心'
}
];
nav = nav.concat(getNav(id));
res.display('detail', {
module: 'help',
page: 'help',
content: Object.assign({nav}, data)
});*/
};
/**
* 根据id获取文章数据
* @param id
* @returns {*}
*/
const getData = (id)=> {
let contentData = helpModel.contentData().content;
for (var i = 0; i < contentData.length; i++) {
if (contentData[i].id === id) {
return contentData[i]
}
}
};
/**
* 根据id获取当前所在位置，拼接面包屑
* @param id
*/
const getNav = (id)=> {
let menuData = helpModel.menuData().menuData;
for (let i = 0; i < menuData.length; i++) {
if (menuData[i].subsets) {
for (let j = 0; j < menuData[i].subsets.length; j++) {
if (menuData[i].subsets[j].id === id) {
return [
{
name: menuData[i].text
}, {
name: menuData[i].subsets[j].text
}
]
}
}
} else {
if (menuData[i].id === id) {
return [
{
name: menuData[i].text
}
]
}
}
}
};
module.exports = {
index
};
... ...
/**
* sub app me
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2016/07/04
*/
'use strict';
var express = require('express'),
path = require('path'),
hbs = require('express-handlebars');
var app = express();
// set view engin
var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
app.on('mount', function(parent) {
delete parent.locals.settings; // 不继承父 App 的设置
Object.assign(app.locals, parent.locals);
});
app.set('views', path.join(__dirname, 'views/action'));
app.engine('.hbs', hbs({
extname: '.hbs',
defaultLayout: 'layout',
layoutsDir: doraemon,
partialsDir: [path.join(__dirname, 'views/partial'), `${doraemon}/partial`],
helpers: global.yoho.helpers
}));
// router
app.use(require('./router'));
module.exports = app;
... ...
/**
* 帮助中心
* @author: jiangmin
* @date: 2016/07/27
*/
'use strict';
const api = global.yoho.API;
/**
* 分类数据
* @returns {{}}
*/
const menuData = ()=> {
return {
menuData: [
{
id: "1",
text: "购物指南"
},
{
id: "2",
text: "支付方式"
},
{
id: "3",
text: "配送方式",
subsets: [
{
id: "31",
parendId: "3",
text: "配送时间与范围"
},
{
id: "32",
parendId: "3",
text: "商品验收与签收"
}
]
},
{
id: "4",
text: "售后服务",
subsets: [
{
id: "41",
parendId: "4",
text: "投诉与建议"
},
{
id: "42",
parendId: "4",
text: "退换货流程"
},
{
id: "43",
parendId: "4",
text: "退换货政策"
}
]
}
]
};
};
/**
* 文章数据
* @returns {{content: *[]}}
*/
const contentData = ()=> {
return {
content: [
{
id: "11",
content: "<h1>你好</h1><p>测试11</p>"
},
{
id: "12",
content: "<h1>你好</h1><p>测试12</p>"
},
{
id: "13",
content: "<h1>你好</h1><p>测试13</p>"
}
]
}
};
/**
* 查看问题详情
* @param cateId
* @param page
* @param limit
* @param problem
*/
const getHelpDetail = (cateId, page, limit, problem)=> {
return api.get('', {
method: 'web.help.getHelpDetailList',
category_id: cateId,
page: page,
limit: limit,
problem: problem
}).then(result => result.data);
};
module.exports = {
menuData,
contentData,
getHelpDetail
};
... ...
/**
* router of sub app me
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2016/07/04
*/
'use strict';
const router = require('express').Router(); // eslint-disable-line
const cRoot = './controllers';
// 帮助中心
const help = require(`${cRoot}/help`);
// 帮助中心
router.get('/', help.index);
// router.get('/search', help.search);
module.exports = router;
... ...
<div class="help-page blk-page">
<div class="center-content clearfix">
{{# content}}
{{!-- 头部面包屑 --}}
{{> path-nav}}
{{!-- 左侧菜单导航 --}}
<div class="help-navigation left">
<p class="title bold">帮助中心</p>
{{>help/menu}}
</div>
{{!-- 右侧页面内容 --}}
<div class="help-main left">
{{>help-detail}}
</div>
{{/ content}}
</div>
</div>
... ...
<div class="help-page blk-page">
<div class="center-content clearfix">
{{# content}}
{{!-- 头部面包屑 --}}
{{> path-nav}}
<div class="help-index">
{{>help}}
</div>
{{/ content}}
</div>
</div>
... ...
<div>
{{{content}}}
</div>
... ...
<div class="search-part">
<h1 class="title">YOHO!BLK 帮助中心</h1>
</div>
<div class="splider">
<span class="draw"></span>
<span class="part-head">新手指南</span>
<span class="draw"></span>
</div>
<div class="guide">
<ul>
<li>
<a href="">
<div class="login-icon"></div>
<span>登录注册</span>
</a>
</li>
<li>
<a href="">
<div class="search-icon"></div>
<span>搜索商品</span>
</a>
</li>
<li>
<a href="">
<div class="order-icon"></div>
<span>选购下单</span>
</a>
</li>
<li>
<a href="">
<div class="pay-icon"></div>
<span>订单支付</span>
</a>
</li>
<li>
<a href="">
<div class="return-icon"></div>
<span>收货退货</span>
</a>
</li>
</ul>
</div>
<div class="splider">
<span class="draw"></span>
<span class="part-head">自助服务</span>
<span class="draw"></span>
</div>
<div class="self-help">
<ul>
<li>
<a href="">
<div class="order-icon"></div>
<span>订单查询</span>
</a>
</li>
<li>
<a href="">
<div class="refund-icon"></div>
<span>退换货</span>
</a>
</li>
<li>
<a href="">
<div class="online-icon"></div>
<span>在线客服</span>
</a>
</li>
<li>
<a href="">
<div class="me-icon"></div>
<span>个人信息</span>
</a>
</li>
<li>
<a href="">
<div class="self-icon"></div>
<span>账号安全</span>
</a>
</li>
<li>
<a href="">
<div class="address-icon"></div>
<span>地址管理</span>
</a>
</li>
</ul>
</div>
<div class="splider">
<span class="draw"></span>
<span class="part-head">常见问题</span>
<span class="draw"></span>
</div>
<div class="common-problem">
<div>
<ul>
<li></li>
</ul>
</div>
<div class="table-info">
<ul>
<li>
<div class="part-info">
<p class="head">会员中心</p>
<div class="part-body">
<p>账户管理</p>
<p>密码管理</p>
</div>
</div>
</li>
<li>
<div class="part-info">
<p class="head">购物指南</p>
<div class="part-body">
<p>尺码选择</p>
<p>发票</p>
<p>商品咨询</p>
</div>
</div>
</li>
<li>
<div class="part-info">
<p class="head">支付方式</p>
<div class="part-body">
<p>在线支付</p>
<p>货到付款</p>
</div>
</div>
</li>
</ul>
<ul>
<li>
<div class="part-info">
<p class="head">配送方式</p>
<div class="part-body">
<p>配送时间</p>
<p>配送方式</p>
<p>顺丰速运</p>
<p>商品签收验收</p>
</div>
</div>
</li>
<li>
<div class="part-info">
<p class="head">售后服务</p>
<div class="part-body">
<p>退换货政策</p>
<p>退换货流程</p>
<p>退款方式时效</p>
<p>投诉与建议</p>
</div>
</div>
</li>
<li>
<div class="part-info">
<p class="head">APP常见问题</p>
<div class="part-body">
<p>iPhone版</p>
<p>Android版</p>
<p>Wap版</p>
</div>
</div>
</li>
</ul>
</div>
</div>
... ...
<ul class="nav">
{{#each menuData}}
{{#if subsets}}
<li class="big-category cateId-{{id}}">
<div class="plus inline-block"></div>{{text}}</li>
{{#each subsets}}
<li class="smll-category cateId-{{id}} parentId-{{parendId}}">
<span class="mult"></span>
<a href="/help?id={{id}}">{{text}}</a>
</li>
{{/each}}
{{else}}
<li class="big-category cateId-{{id}}">
<span class="mult"></span>
<a href="/help?id={{id}}">{{text}}</a>
</li>
{{/if}}
{{/each}}
</ul>
... ...
... ... @@ -658,6 +658,7 @@ const getExchangeDetailData = (id, uid) => {
camelCase(data)
);
}
console.log(exchangeData)
return exchangeData;
});
... ...
... ... @@ -13,11 +13,11 @@
<tr class="table-body">
<input type="hidden" id="tr_{{address_id}}" value="{{address_id}}">
<input type="hidden" id="tr_{{area_code}}" value="{{area_code}}">
<td class="width-70">{{consignee}}</td>
<td class="width-195">{{area}}</td>
<td class="width-255">{{address}}</td>
<td class="width-120"><p>{{mobile}}</p><p>{{phone}}</p></td>
<td class="width-260">
<td class="width-name">{{consignee}}</td>
<td class="width-address">{{area}}</td>
<td class="width-fulladdress">{{address}}</td>
<td class="width-mobile"><p>{{mobile}}</p><p>{{phone}}</p></td>
<td class="width-opearte">
<div>
<span class="blue opreation update-address" data-id="{{address_id}}">修改</span>
<em class="op-sep">|</em>
... ...
... ... @@ -36,7 +36,7 @@
</p>
<p>
我们会在入库后的1-3个工作日内处理您的退款，如有疑问，请联系
<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409" class="online-service">
<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409" class="online-service" target="_blank">
<span class="iconfont blue">&#xe61c;</span>
<span class="blue">在线客服</span>
</a>
... ...
... ... @@ -19,7 +19,7 @@ module.exports = {
},
cookieDomain: 'yohobuy.com',
domains: {
api: 'http://devapi.yoho.cn:58078/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
api: 'http://testapi.yoho.cn:28078/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
service: 'http://devservice.yoho.cn:58077/', // testservice.yoho.cn:28077 devservice.yoho.cn:58077
// api: 'http://api.yoho.cn/',
// service: 'http://service.yoho.cn/',
... ...
... ... @@ -19,4 +19,5 @@ module.exports = app => {
app.use('/editorial', require('./apps/editorial')); // 资讯
app.use('/product', require('./apps/product'));
app.use('/brand', require('./apps/brand')); // 品牌
app.use('/help', require('./apps/help')); // 帮助中心
};
... ...
... ... @@ -53,7 +53,7 @@ const uploadImg = (req, res) => {
project: req.body.bucket
},
json: true
}, function(error, httpResponse, rebody) {
}, (error, httpResponse, rebody) => {
if (!error && httpResponse.statusCode === 200) {
imgs = rebody.data.imagesList || [];
datas = [];
... ...
<div class="error">
<div class="err-500-img"></div>
<div class="tips">
<span class="tip">哎呀，您访问的页面走丢了...</span>
<span class="tips-english">500 HTTP Version Not Supported</span>
<span class="">建议您：<a href="javascript:location.reload()">刷新该网页/ </a> 升级您的Web服务器软件</span>
<span class="tip">哎呀，程序出错了...</span>
<span class="tips-english">500-Server Internal Error</span>
<span>建议您：<a href="javascript:location.reload()">刷新该网页/ </a><a href="javascript:history.go(-1)">返回上一页/</a> <a href="">去首页看看</a></span>
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -6,7 +6,6 @@
var $ = require('yoho-jquery'),
dialog = require('../plugins/dialog');
// lazyLoad = require('yoho-jquery-lazyload'),
var $commentArea = $('#comment-area'),
articleId = $('.detail-body').data('id');
... ... @@ -32,12 +31,9 @@ $('#prise-btn').click(function() {
}
if ($this.hasClass('liked')) {
url = '/editorial/info/cancelPraise';
// 点赞
url = '/editorial/info/cancelPraise';
} else {
// 取消点赞
url = '/editorial/info/praise';
}
... ... @@ -180,7 +176,6 @@ $('#comment-info').keyup(function() {
$wordCountTip.html(showTxt);
});
// init
$('#comment-info').trigger('keyup');
if (tag === 0) {
... ...
... ... @@ -5,8 +5,6 @@
*/
var $ = require('yoho-jquery'),
// lazyLoad = require('yoho-jquery-lazyload'),
dialog = require('../plugins/dialog');
var _alert = dialog.Alert;
... ... @@ -14,21 +12,11 @@ var _alert = dialog.Alert;
require('../common/header');
require('../common/return-top');
// lazyLoad($('.content-msg img.lazy'));
$('.editorial-index-page').on('click', '.like-icon', function() {
var $this = $(this),
// prising = false,
msgId = $this.parents('.content-msg').data('id'),
url;
// if (prising === msgId) {
// return;
// }
// prising = msgId;
if ($this.hasClass('liked')) {
url = '/editorial/info/cancelPraise';
} else {
... ...
... ... @@ -39,16 +39,6 @@ $('.editorial-list-page').on('click', '.like-icon', function() {
} else {
new _alert(data.message).show();
}
// if (data.code === 200) {
// if (data.data * 1 === 0) {
// $this.next('b').addClass('num-0').children('.num').html('0'); // 隐藏数字显示
// } else {
// console.log(data.data)
// $this.next('b').removeClass('num-0').children('.num').html(data.data);
// }
// }
// prising = false;
});
}).on('mouseenter mouseleave', '.like-icon', function() {
$(this).closest('.like').toggleClass('hover');
... ...
/**
* [帮助中心]
* @author: jiangmin
* @date: 2016/07/25
*/
/**
* 目录切换
*/
$(document).on("click", ".big-category .plus", function () {
var $parent = $(this).parent();//当前一级分类
var className = $parent.attr("class").split(" ")[1];
var parentId = "parentId-" + className.split("-")[1];
var $child = $parent.parent().find("." + parentId);//当前子分类
if ($parent.hasClass("open")) {
$child.hide();
$parent.removeClass("open");
$(this).css("background-image", "url('../img/help/plus.png')");
} else {
$child.show();
$parent.addClass("open");
$(this).css("background-image", "url('../img/help/minus.png')");
}
});
... ...
... ... @@ -272,7 +272,7 @@ $('#brand-fav').click(function() {
}).then(function(data) {
if (data.code === 200) {
$this.toggleClass('coll');
} else if (data.code === 403) {
} else if (data.code === 400) {
location.href = data.data.refer;
}
});
... ...
.help-page {
padding-bottom: 30px;
background: #f5f5f5;
.help-navigation {
width: 150px;
margin-right: 10px;
background: #fff;
.title {
height: 60px;
line-height: 60px;
text-align: center;
background: #fff;
}
}
.help-main {
width: 990px;
padding: 35px 30px;
background-color: #fff;
}
}
@import "menu";
... ...
.nav {
li {
padding: 10px 30px;
width: 200px;
font-size: 14px;
}
.smll-category {
display: none;
}
}
.plus {
margin-right: 10px;
height: 14px;
width: 14px;
background-repeat: no-repeat;
background-image: resolve('help/plus.png');
background-size: 14px 14px;
}
.mult {
margin-right: 26px;
height: 14px;
width: 14px;
}
... ...
... ... @@ -13,3 +13,4 @@
@import "passport/index";
@import "editorial/index";
@import "brand/brand";
@import "help/index";
... ...
... ... @@ -119,20 +119,22 @@
padding: 8px 0 8px 10px;
}
.width-70 {
width: 70px;
.width-name {
width: 60px;
word-break: break-all;
}
.width-195 {
width: 195px;
.width-address {
width: 145px;
word-break: break-all;
}
.width-255 {
width: 255px;
.width-fulladdress {
width: 240px;
word-break: break-all;
}
.width-120 {
.width-mobile {
width: 120px;
p:first-child {
... ... @@ -140,7 +142,7 @@
}
}
.width-260 {
.width-opearte {
width: 260px;
}
... ...