Authored by biao

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

... ... @@ -26,7 +26,13 @@ const getMeThumb = () => {
cache: true,
code: 200
}).then(result => {
return result.data.list[0].data[0].src;
let thumb = {
banner: result.data.list[0].data[0].src,
url: result.data.list[0].data[0].url
};
return thumb;
});
};
... ...
... ... @@ -643,7 +643,7 @@ const _setExchangeDetailData = (data) => {
list.reminder = true;
list.inDoor = true;
list.auditSuccess = true;
list.view = `//www.yohoblk.com/me/order/detail?code=${data.orderCode}`;
list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
}
break;
... ... @@ -651,7 +651,7 @@ const _setExchangeDetailData = (data) => {
if (data.deliveryTpyeName === '寄回换货') {
list.takeGoods = true;
list.auditSuccess = true;
list.view = `//www.yohoblk.com/me/order/detail?code=${data.orderCode}`;
list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
} else {
list.takeGoods = true;
}
... ... @@ -661,14 +661,14 @@ const _setExchangeDetailData = (data) => {
send: true,
doubt: true,
auditSuccess: true,
view: `//www.yohoblk.com/me/order/detail?code=${data.orderCode}`
view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
});
break;
case 40:
Object.assign(list, {
finish: true,
auditSuccess: true,
view: `//www.yohoblk.com/me/order/detail?code=${data.orderCode}`
view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
});
break;
case 91:
... ...
... ... @@ -14,9 +14,11 @@
</li>
{{/each}}
</ul>
{{#if banner}}
<img class="banner-img" data-original="{{image banner 150 120}}">
{{/if}}
{{#banner}}
<a href="{{url}}">
<img class="banner-img" data-original="{{image banner 150 120}}">
</a>
{{/banner}}
</div>
{{!-- 右侧页面内容 --}}
... ...
... ... @@ -157,7 +157,6 @@
<div class="evidence">
{{# evidenceImages}}
<img src="{{image . 70 90}}">
<img src="{{image . 70 90}}">
{{/ evidenceImages}}
</div>
</div>
... ...
... ... @@ -76,6 +76,7 @@
.iconfont {
font-size: 12px;
margin-right: 5px;
color: #219dd6;
}
}
}
... ... @@ -203,7 +204,7 @@
margin-bottom: 8px;
display: -webkit-box;
overflow: hidden;
-webkit-line-clamp: 2;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
}
... ...