fe / yoho-blk · Commits

Go to a project

Authored by 姜枫
Commit 55e9cfeecc4ab336114af01a9a14a87998437a5d 2 parents 042e2436 f17f2be1

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

Inline Side-by-side
Showing 11 changed files with 54 additions and 45 deletions
... ... @@ -322,8 +322,8 @@ const _processContentData = (list) => {
if (related.relatedReco) {
_.forEach(related.relatedReco, function(data, key) {
_.forEach(result, function(list, index) {
if(data.id === list.productSkn) {
_.forEach(result, function(lis, index) {
if (data.id === lis.productSkn) {
data = _.assign(data, {
link: config.siteUrl + '/product/list/pro_' +
result[index].productId + '_' + data.productSkc + '/' +
... ... @@ -343,8 +343,8 @@ const _processContentData = (list) => {
if (related.relatedGroup) {
_.forEach(related.relatedGroup, function(data, key) {
_.forEach(result, function(list, index) {
if(data.id === list.productSkn) {
_.forEach(result, function(lis, index) {
if (data.id === lis.productSkn) {
data = _.assign(data, {
link: config.siteUrl + '/product/list/pro_' +
result[index].productId + '_' + data.productSkc + '/' +
... ...
... ... @@ -125,7 +125,7 @@
</li>
<li id="collect-btn" class="sort-collect{{# isCollected}} collected{{/ isCollected}}">
<a href="javascript:;">
<i class="iconfont">&#xe619;</i>
<i class="iconfont">&#xe627;</i>
<span>收藏</span>
</a>
</li>
... ...
... ... @@ -131,7 +131,8 @@ const statusMap = {
value: 3,
valueStr: '交易完成',
step: 4,
showEditor: true
showEditor: true,
btns: []
}
};
... ... @@ -537,6 +538,7 @@ const getOrderDetail = (uid, code) => {
if (detail.isCancel !== 'Y') {
detail.steps = _getStepByOrderStatus(st);
console.log(st);
statusMap[st].btns.forEach(function(btn) {
btns.push(btn);
});
... ...
... ... @@ -208,28 +208,30 @@ const setPathNav = (data, name, channel) => {
link: helpers.urlFormat(`/${link}`),
name: `${_.toUpper(channel)}首页`
}];
let sort = data.sort[0] || {};
let sort = _.get(data, 'sort[0]', {});
navs.push({
link: helpers.urlFormat('/list', {
msort: sort.sort_id,
gender: gender
}),
name: sort.sort_name,
pathTitle: sort.sort_name
});
// 二级分类
if (!_.isEmpty(sort.sub)) {
if (!_.isEmpty(sort)) {
navs.push({
link: helpers.urlFormat('/list', {
msort: sort.sort_id,
misort: sort.sub.sort_id,
gender: gender
}),
name: sort.sub[0].sort_name,
pathTitle: sort.sub[0].sort_name
name: sort.sort_name,
pathTitle: sort.sort_name
});
// 二级分类
if (!_.isEmpty(sort.sub)) {
navs.push({
link: helpers.urlFormat('/list', {
msort: sort.sort_id,
misort: sort.sub.sort_id,
gender: gender
}),
name: sort.sub[0].sort_name,
pathTitle: sort.sub[0].sort_name
});
}
}
navs.push({
... ...
... ... @@ -148,8 +148,10 @@ function validatePhoneNum() {
return validate().then(function() {
hideTip($phoneNumInput);
ep.emit('phone-num', true);
return true;
}).fail(function() {
ep.emit('phone-num', false);
return false;
});
}
... ... @@ -215,8 +217,10 @@ function validateImgCaptcha() {
return validate().then(function() {
ep.emit('captcha-img', true);
return true;
}).fail(function() {
ep.emit('captcha-img', false);
return false;
});
}
... ...
... ... @@ -2,6 +2,7 @@
height: 50px;
line-height: 50px;
font-size: 12px;
font-weight: 500;
.yoho-group-map {
padding-right: 2px;
... ... @@ -11,7 +12,7 @@
.iconfont {
font-size: 18px;
position: relative;
top: -1px;
top: -2px;
}
a {
... ... @@ -41,6 +42,7 @@
padding: 20px 0;
background: #fff;
position: absolute;
font-weight: normal;
z-index: 50;
top: 50px;
... ... @@ -72,6 +74,7 @@
.tag-bag {
padding-right: 6px;
margin-right: 8px;
font-weight: normal;
position: relative;
&:hover {
... ...
... ... @@ -19,6 +19,10 @@
cursor: pointer;
font-size: 20px;
}
.weixin {
height: 30px;
}
}
.weixin-share-box {
... ... @@ -51,7 +55,7 @@
z-index: 100;
height: 12px;
display: block;
background-image: resolve('layout/up.png');
background-image: resolve("layout/up.png");
top: 17px;
}
}
... ... @@ -81,5 +85,4 @@
color: #9f9f9f;
line-height: 20px;
}
}
... ...
... ... @@ -6,10 +6,6 @@
margin: 30px auto;
}
.font {
font-family: '黑体';
}
.detail-title {
font-size: 24px;
text-align: center;
... ... @@ -77,6 +73,7 @@
margin-right: 30px;
}
}
.article-main {
text-align: center;
margin: 0 auto;
... ... @@ -88,8 +85,6 @@
}
}
.article-pictwo {
max-width: 930px;
margin: 0 auto;
... ... @@ -99,7 +94,7 @@
img {
display: inline-block;
max-width: 460px;
margin-right: 2px;
margin-right: 2px;
}
}
... ... @@ -274,8 +269,10 @@
.user-handle {
float: right;
ul {
display: inline-block;
li {
float: left;
margin: 0 15px;
... ... @@ -330,6 +327,7 @@
i {
opacity: 1;
}
.cancel-collect {
display: inline;
}
... ... @@ -415,7 +413,6 @@
a {
float: right;
}
}
.comment-area {
... ... @@ -467,10 +464,6 @@
font-size: 14px;
background: #000;
cursor: pointer;
/* &:hover {
background: #000;
}*/
}
.disable {
... ... @@ -502,7 +495,7 @@
width: 12px;
height: 7px;
background: #fff;
background-image: resolve('layout/down.png');
background-image: resolve("layout/down.png");
position: absolute;
left: 15px;
}
... ... @@ -524,7 +517,6 @@
}
.comments-list {
li {
margin: 14px 0 0;
padding: 0 0 15px;
... ... @@ -550,6 +542,7 @@
font-weight: bold;
}
}
.comment-info {
.comment-content {
margin-top: 10px;
... ... @@ -566,7 +559,6 @@
clear: both;
}
}
}
}
... ...
... ... @@ -42,7 +42,7 @@
}
.msg-title:hover {
color: #666666;
color: #666;
}
.lazy {
... ...
... ... @@ -81,7 +81,7 @@
cursor: pointer;
&.disable {
background-color: $inactive-color;
background-color: $theme-color;
}
}
... ... @@ -146,7 +146,7 @@
line-height: @height;
&.disable {
background-color: $inactive-color;
background-color: $theme-color;
}
}
... ... @@ -166,7 +166,7 @@
margin: 0 calc(($item-width - @width) / 2);
&.disable {
background-color: $inactive-color;
background-color: $theme-color;
}
}
... ... @@ -195,7 +195,7 @@
cursor: pointer;
&.disable {
background-color: $inactive-color;
background-color: $theme-color;
}
}
}
... ...
... ... @@ -325,6 +325,10 @@
.material-detail {
display: table;
& + .material-wash {
border-top: 1px solid #eaeceb;
}
li {
display: table-row;
}
... ... @@ -364,7 +368,6 @@
.material-wash {
text-align: center;
border-top: 1px solid #eaeceb;
padding-top: 15px;
li {
... ...