fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit 317b3e13d56ea6597c4a2a5fc766bfec1c266bc2 2 parents 7aa02175 32502b45

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

Inline Side-by-side
Showing 5 changed files with 27 additions and 21 deletions
... ... @@ -143,7 +143,7 @@ const exchangeDeatail = (req, res) => {
navigation: mcHandler.getSideMenu('我的退/换货'),
banner: 'http://placehold.it/{width}x{height}',
returns: {
title: '换货详情',
title: '换货申请',
exchange: result.exchangeDetail
}
}
... ...
... ... @@ -630,7 +630,7 @@ const _setExchangeDetailData = (data) => {
}
break;
case 20:
case 20:
if (data.deliveryTpyeName === '寄回换货') {
Object.assign(list, {
... ... @@ -643,19 +643,22 @@ const _setExchangeDetailData = (data) => {
if (data.deliveryTpyeName === '寄回换货') {
list.takeGoods = true;
list.auditSuccess = true;
list.view = `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`;
}
break;
case 50:
Object.assign(list, {
send: true,
doubt: true,
auditSuccess: true
auditSuccess: true,
view: `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`
});
break;
case 40:
Object.assign(list, {
finish: true,
auditSuccess: true
auditSuccess: true,
view: `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`
});
break;
case 91:
... ... @@ -664,7 +667,7 @@ const _setExchangeDetailData = (data) => {
default:
break;
}
console.log(list);
return list;
};
... ...
... ... @@ -30,7 +30,7 @@
<div class="way">
{{#if takeGoods}}
<p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
<p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
{{/if}}
{{#if reminder}}
... ... @@ -50,12 +50,12 @@
{{/if}}
{{#if doubt}}
<p class="contact">如有疑问，请联系<span class="iconfont">&#xe61c;</span>在线客服</p>
<p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
{{/if}}
{{#if auditSuccess}}
<div class="order">
<span class="check">查看</span>
<a href="{{view}}" target="_blank"><span class="check">查看</span></a>
<span class="exchange-order">换货订单</span>
</div>
{{/if}}
... ... @@ -75,11 +75,12 @@
<div class="edit-content{{#if expressNumber}} hide{{/if}}"{{# expressList}} data-{{id}}="{{name}}"{{/ expressList}}>
<h4 class="third-title">填写物流</h4>
<p>请您在<span class="blue">七天内</span>将商品寄回并填写物流，逾期将自动取消申请</p>
<p>请您在<span class="blue">7天内</span>将商品寄回并填写物流，逾期将自动取消申请</p>
<dl class="express-wrap">
<dd>
物流公司：
<select class="express-company">
<option value="0">选择快递公司</option>
{{# expressList}}
<option value="{{id}}">{{name}}</option>
{{/ expressList}}
... ... @@ -87,7 +88,7 @@
</dd>
<dd>
快递单号：
<input type="text" class="express-code" value="{{number}}">
<input type="text" class="express-code" placeholder="填写快递单号" value="{{number}}">
</dd>
<dd>
<span class="submit-express btn">提交</span>
... ... @@ -147,10 +148,10 @@
<p>×{{num}}</p>
</div>
</div>
<div class="common-column special-border">
<div class="common special-border">
<p class="reason">{{reasonName}}</p>
</div>
<div class="common-column special-border operation">
<div class="common special-border operation">
<p class="subtext">color: {{newColorName}}<br>size: {{newSizeName}}</p>
</div>
</div>
... ...
... ... @@ -3,7 +3,7 @@
const _ = require('lodash');
const cookie = global.yoho.cookie;
const cache = global.yoho.cache;
const loginService = require('../../apps/passport/models/login-service');
const LoginService = require('../../apps/passport/models/login-service');
/**
* 已登录用户的信息，包括记住我功能。
... ... @@ -41,13 +41,13 @@ module.exports = () => {
let password = data.password;
let area = data.area;
return loginService.signin(area, account, password);
return LoginService.signin(area, account, password);
}).then(result => {
if (result.code !== 200) {
return Promise.reject(new Error(result.message));
}
return loginService.syncUserSession(result.data.uid, req, res);
return LoginService.syncUserSession(result.data.uid, req, res);
}).then(()=> {
return res.redirect(req.getUrl());
}).catch(next);
... ...
... ... @@ -160,13 +160,13 @@
}
.info {
width: 507px;
width: 380px;
text-align: left;
}
.st,
.op {
width: 200px;
width: 260px;
}
}
}
... ... @@ -175,14 +175,16 @@
display: table;
font-size: 14px;
border: 1px solid #f1f1f1;
width: 100%;
}
.goods-info {
width: 516px;
width: 400px;
display: inline-block;
box-sizing: border-box;
border-top: none;
font-weight: normal;
margin: 0;
img {
width: 70px;
... ... @@ -193,7 +195,7 @@
}
.info {
width: 400px;
width: 290px;
padding: 30px 8px 0 0;
float: right;
box-sizing: border-box;
... ... @@ -207,8 +209,8 @@
}
}
.common-column {
width: 208px;
.common {
width: 270px;
display: table-cell;
text-align: center;
vertical-align: top;
... ...