fe / yohobuywap-node · Commits

Go to a project

Authored by 郝肖肖
Commit 30c5187b28d2a5e7e20a887a2e9c6762434dd21a 1 parent e303f953

订单详情物流按钮不显示修复

Inline Side-by-side
Showing 3 changed files with 17 additions and 379 deletions
... ... @@ -26,14 +26,18 @@ const closeReasons = () => {
* 获取快递有关信息
* @private
*/
const _assignExpressInfo = (showLogistics, order, result) => {
if (showLogistics && order.express_company.caption && order.express_number) {
Object.assign(result, {
logisticsUrl: helpers.urlFormat('/home/logistic', {order_code: order.order_code}),
logisticsCompany: order.express_company.caption,
logisticsNum: order.express_number
});
const _assignExpressInfo = (showLogistics, order) => {
let data = {};
if (showLogistics && order.expressCompany.caption && order.expressNumber) {
data = {
logisticsUrl: helpers.urlFormat('/home/logistic', {order_code: order.orderCode}),
logisticsCompany: order.expressCompany.caption,
logisticsNum: order.expressNumber
};
}
return data;
};
/**
... ... @@ -84,7 +88,7 @@ const _getOrderStatus = (order, showLogistics) => {
qrcode: helpers.urlFormat(`/home/QRcode/${order.order_code}`)
});
} else {
_assignExpressInfo(showLogistics, order, result);
Object.assign(result, _assignExpressInfo(showLogistics, order));
}
break;
case 6:
... ... @@ -100,7 +104,7 @@ const _getOrderStatus = (order, showLogistics) => {
qrcode: helpers.urlFormat(`/home/QRcode/${order.order_code}`)
});
} else {
_assignExpressInfo(showLogistics, order, result);
Object.assign(result, _assignExpressInfo(showLogistics, order));
}
break;
default:
... ... @@ -109,7 +113,7 @@ const _getOrderStatus = (order, showLogistics) => {
} else {
/* 订单为货到付款订单时，计算订单状态。(货到付款没有待付款状态) */
switch (parseInt(order.status, 10)) {
switch (order.status) {
case 0:
/* 备货中 */
... ... @@ -133,7 +137,7 @@ const _getOrderStatus = (order, showLogistics) => {
Object.assign(result, {
unreceived: true
});
_assignExpressInfo(showLogistics, order, result);
Object.assign(result, _assignExpressInfo(showLogistics, order));
break;
case 6:
... ... @@ -141,7 +145,7 @@ const _getOrderStatus = (order, showLogistics) => {
Object.assign(result, {
completed: true
});
_assignExpressInfo(showLogistics, order, result);
Object.assign(result, _assignExpressInfo(showLogistics, order));
break;
default:
break;
... ... @@ -164,10 +168,9 @@ const orderDetailData = (uid, orderCode) => {
let orderDetail = camelCase(result.data);
let goods = [];
let status = _getOrderStatus(orderDetail);
let status = _getOrderStatus(orderDetail, true);
orderDetail = _.assign(orderDetail, status);
orderDetail.useLimitCode = orderDetail.useLimitCode === 'Y';
if (orderDetail.virtualType && orderDetail.virtualType === 3) {
orderDetail = _.assign(orderDetail, {
... ... @@ -251,13 +254,6 @@ const orderDetailData = (uid, orderCode) => {
});
}
// 定金预售
if (orderDetail.attribute * 1 === 9) {
orderDetail = _.assign(orderDetail, {
isDepositAdvance: true
});
}
// 判断是否有关联订单
if (orderDetail.relateOrderCode === 'Y') {
orderDetail = _.assign(orderDetail, {
... ...
@charset "utf-8";
/* base */
@import "me/index";
@import "layout/reset";
@import "layout/common";
@import "layout/loading";
@import "layout/swiper";
@import "layout/header";
@import "layout/footer";
@import "layout/utils";
/* component */
@import "layout/modal";
/* module */
/* page */
@import "layout/form";
@import "common/index";
@import "channel/index";
@import "product/index";
@import "activity/index";
@import "activity/invite";
@import "passport/index";
@import "guang/index";
@import "cart/index";
@import "home/index";
@import "me/index";
.yoho-suggest-page {
width: 100%;
height: auto;
/* 意见反馈头部 */
.suggest-header {
text-align: center;
color: #fff;
font-size: 26px;
line-height: 46px;
overflow: hidden;
padding-bottom: 20px;
background-image: linear-gradient(#383838, #505050);
&:before {
content: "";
display: block;
background: url("/me/suggest/suggest-logo.png");
width: 104px;
height: 35px;
margin: 10px auto 15px;
}
}
/* 意见反馈主体 */
.suggest-content {
border-top: 1px solid #e0e0e0;
}
.suggest-item {
width: 100%;
color: #444;
border-top: 1px solid #e0e0e0;
border-bottom: 30px solid #f0f0f0;
overflow: hidden;
.suggest-item-img {
width: 100%;
overflow: hidden;
> img {
margin: 0 auto;
display: block;
max-width: 100%;
}
}
> h2 {
font-size: 38px;
margin: 30px 0 31px;
padding: 0 35px;
}
> p {
font-size: 26px;
line-height: 48px;
padding: 0 35px;
}
}
.suggest-type {
margin-top: 29px - 11px;
height: 88px;
line-height: 88px;
border-top: 1px solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
color: #b0b0b0;
font-size: 26px;
display: none;
text-align: center;
> .active {
color: #444;
}
&.show {
display: block;
}
}
.suggest-active {
> div {
width: 50%;
height: 100%;
float: left;
text-align: left;
padding-left: 128px;
box-sizing: border-box;
}
> div:nth-last-of-type(1) {
padding-left: 0;
padding-right: 128px;
text-align: right;
float: right;
> span {
display: inline-block;
height: 100%;
overflow: hidden;
&:nth-of-type(1) {
transform: rotate(180deg);
}
}
}
}
.suggest-bad {
> div {
> span {
display: inline-block;
height: 100%;
overflow: hidden;
&:nth-of-type(1) {
transform: rotate(180deg);
}
}
}
}
/* 发表意见 */
.create-new-suggest {
display: block;
width: 100%;
height: 150px;
line-height: 88px;
text-align: center;
font-size: 30px;
border-top: 30px solid #f0f0f0;
border-bottom: 30px solid #f0f0f0;
position: relative;
.list-item {
padding: 0 35px;
}
.new-right {
float: right;
margin-left: 40px;
color: #e0e0e0;
}
a {
color: #444;
display: inline-block;
}
}
}
/* 提交页面 */
.yoho-suggest-sub-page {
width: 100%;
background: #f0f0f0;
.suggest-sub-form {
background: #fff;
width: 100%;
#suggest-textarea {
box-sizing: border-box;
width: 100%;
max-width: 100%;
min-width: 100%;
height: 255px;
max-height: 255px;
min-height: 255px;
padding: 30px;
font-size: 26px;
line-height: 48px;
color: #000;
display: block;
background: #fff;
border: none;
outline: none;
resize: none;
}
}
.img-form {
padding: 0 30px;
padding-top: 40px;
overflow: hidden;
.upload-img-list {
float: left;
> li {
display: block;
width: 130px;
height: 130px;
float: left;
margin-right: 30px;
background: resolve("common/loading.gif") center center no-repeat;
background-size: 50%;
position: relative;
> img {
display: block;
width: 100%;
height: 100%;
overflow: hidden;
}
> span {
display: block;
background: url("/me/suggest/sub_del.png");
width: 42px;
height: 42px;
position: absolute;
top: -21px;
right: -21px;
}
}
}
.img-add {
display: block;
width: 130px;
height: 130px;
border: 1px dashed #e0e0e0;
position: relative;
text-indent: -1000px;
float: left;
&:after {
content: "";
display: block;
background: url("/me/suggest/suggest-add.png");
width: 72px;
height: 72px;
position: absolute;
top: 50%;
left: 50%;
margin-top: -36px;
margin-left: -36px;
}
input[type="file"] {
position: absolute;
opacity: 0.2;
border: none;
outline: none;
display: block;
width: 130px;
height: 130px;
top: 0;
left: 0;
}
}
}
}
/* dialog */
.dialog-wrapper {
background: hsla(0, 0%, 0%, 0.5);
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
display: none;
.dialog-box {
width: 540px;
border-radius: 20px;
background: hsla(100, 100%, 100%, 0.8);
position: absolute;
left: 50%;
margin-left: -270px;
font-size: 30px;
text-align: center;
color: #000;
}
.dialog-content {
padding: 60px 30px;
}
.dialog-header {
padding: 50px 0 40px;
font-size: 34px;
text-align: center;
font-weight: bold;
}
.dialog-footer {
height: 88px;
line-height: 88px;
> span {
display: block;
width: 50%;
height: 100%;
float: left;
box-sizing: border-box;
&:nth-last-of-type(1) {
border-left: 1px solid #ccc;
border-radius: 0 0 10px 10px;
color: #e01;
}
}
> span:active {
background-color: #ccc;
}
}
/*边框在物理机上1px变粗*/
.dialog-footer::before {
content: "";
position: absolute;
left: 0;
width: 200%;
height: 0;
border-top: 1px solid #cccccc;
transform-origin: left top;
transform: scale3d(0.5,0.5,0.5);
-webkit-transform: scale3d(0.5,0.5,0.5); /* Chrome, Safari, Opera */
-ms-transform: scale3d(0.5,0.5,0.5); /* IE 9 */
}
}