fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit 35318ca1967424701538620a7bd2cc2394de2ae6 2 parents cca4261a e98e757c

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

Inline Side-by-side
Showing 7 changed files with 37 additions and 12 deletions
... ... @@ -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" target="_blank"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
<p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
{{/if}}
{{#if reminder}}
... ... @@ -50,7 +50,7 @@
{{/if}}
{{#if doubt}}
<p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
<p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
{{/if}}
{{#if auditSuccess}}
... ... @@ -155,7 +155,9 @@
<span>问题描述：{{remark}}</span>
<div class="reason-img">照片凭证：
<div class="evidence">
<img src="{{evidenceImages}}">
{{# evidenceImages}}
<img src="{{image . 70 90}}">
{{/ evidenceImages}}
</div>
</div>
</div>
... ...
... ... @@ -54,7 +54,11 @@
</div>
</div>
<div class="bag-content">
购物袋空空的哦，去看看心仪的商品吧~
<p class="cn">您的购物袋暂无商品</p>
<p class="en">
Your shopping bags no goods ，<br>
welcome go to shopping !
</p>
</div>
</div>
</li>
... ...
... ... @@ -38,6 +38,13 @@ function handelProduct(data) {
}
function refreshBag() {
var time = Date.parse(new Date()),
oldTime = this.time;
if (oldTime && time - oldTime < 100) {
return;
}
this.time = time;
$.ajax({
type: 'GET',
url: '/shopping/cart/data',
... ... @@ -182,6 +189,7 @@ $searchKey.focus(function() {
$searchKey.val('search').css('color', '#aaa');
}
}).val('search').css('color', '#aaa');
// }
$clearInput.click(function() {
... ...
... ... @@ -73,7 +73,7 @@
&:hover {
color: #9a9a9a;
height: 50px;
cursor: default;
cursor: pointer;
}
&:hover > a {
... ... @@ -114,7 +114,7 @@
.down-app-box {
width: 230px;
color: #000;
color: #1b1b1b;
font-size: 14px;
padding: 20px 0;
margin-left: -86px;
... ... @@ -153,13 +153,21 @@
display: none;
.bag-content {
font-size: 14px;
line-height: 1.5;
padding: 280px 0 130px;
text-align: center;
color: #1b1b1b;
background: resolve('layout/bag-bg.png') no-repeat center center;
background: resolve('layout/empty-bag.png') no-repeat center center;
display: none;
}
.bag-content .cn {
font-size: 20px;
font-weight: bold;
margin-bottom: 10px;
}
.bag-goods {
background: #fff;
}
... ... @@ -356,7 +364,7 @@
}
.cur {
background: #000;
background: #1b1b1b;
}
a {
... ... @@ -410,8 +418,10 @@
}
dt > a {
color: #000;
text-decoration: underline;
color: #1b1b1b;
font-weight: bold;
display: inline-block;
border-bottom: 1px solid #1b1b1b;
}
.hot {
... ...
... ... @@ -67,6 +67,7 @@
.contact {
line-height: 50px;
height: 50px;
color: #219dd6;
span {
margin-left: 20px;
... ...
.favorite-editorials {
position: relative;
position: relative;
.num {
position: absolute;
top: -30px;
... ...