fe / yoho-blk · Commits

Go to a project

Authored by xuqi
Commit e1b51aac0bc09966c151c941dcd8013db2837444 1 parent ab25083a

multi package

Inline Side-by-side
Showing 10 changed files with 104 additions and 7 deletions
... ... @@ -43,6 +43,30 @@
<span class="iconfont">&#xe61e;</span>
</a>
</p>
{{#with shopping_cart_data}}
{{#if is_multi_package}}
<div class="multi-package-row">
温馨提示：您购买的商品<em class="blue">分属不同仓库</em>，需要调拨，将被拆分成多个包裹送达
<span class="iconfont show-package">&#xe643;</span>
<div class="package-list hide">
<div class="package-up-icon"></div>
{{#each package_list}}
<div class="package-item">
<p class="package-title bold">包裹{{math @index '+' 1}}:{{#if @first}}总仓发货{{^}}异地调拨{{/if}}</p>
<ul class="package-goods clearfix">
{{#each goods_list}}
<li class="left">
<img class="lazy package-goods-img" data-original="{{image goods_images 100 134}}">
</li>
{{/each}}
</ul>
<p class="package-shipping">运费：¥{{shopping_cost}}元（原价{{shopping_orig_cost}}元，优惠{{shopping_cut_cost}}元）</p>
</div>
{{/each}}
</div>
</div>
{{/if}}
{{/with}}
<div class="content">
<p class="order-table-head clearfix">
<span class="info">商品信息</span>
... ... @@ -99,7 +123,7 @@
个
您当前共有有货币<em class="blue">{{yoho_coin}}</em>个
<span id="coin-tip" class="coin-tip block blue vhide">抵扣￥<em class="balance-coin"></em></span>
<span id="coin-tip" class="coin-tip block blue vhide">抵扣¥<em class="balance-coin"></em></span>
<span id="coin-sure" class="btn disable">确定</span>
</div>
<div class="used-coin hide">
... ... @@ -154,7 +178,7 @@
</li>
<li>
<span class="balance-title">运费：</span>
<span class="balance-cost">¥10.00</span>
<span class="balance-cost">¥{{shipping_cost}}</span>
</li>
<li class="need-pay">
<span class="balance-title">应付金额（不含运费）：</span>
... ...
... ... @@ -59,7 +59,7 @@
"uuid": "^2.0.2",
"winston": "^2.2.0",
"winston-daily-rotate-file": "^1.1.4",
"yoho-node-lib": "0.0.17"
"yoho-node-lib": "0.0.18"
},
"devDependencies": {
"autoprefixer": "^6.3.6",
... ...
No preview for this file type
... ... @@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by FontForge 20120731 at Wed Jul 13 13:54:32 2016
Created by FontForge 20120731 at Thu Jul 14 10:06:11 2016
By admin
</metadata>
<defs>
... ... @@ -19,7 +19,7 @@ Created by FontForge 20120731 at Wed Jul 13 13:54:32 2016
bbox="0 -224 1303 896.303"
underline-thickness="50"
underline-position="-100"
unicode-range="U+0078-E642"
unicode-range="U+0078-E643"
/>
<missing-glyph horiz-adv-x="374"
d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
... ... @@ -230,5 +230,8 @@ d="M1068 -101l33 -111l-119 67q-86 -22 -129 -22q-101 0 -185.5 43t-133 117.5t-48.5
t15.5 31t-15.5 31t-38.5 13.5zM971 300q-16 0 -29.5 -14t-13.5 -30.5t13.5 -30.5t29.5 -14q24 0 39 13.5t15 31t-15 31t-39 13.5zM459 150q0 -46 13 -93q-22 -2 -40 -2q-16 0 -30.5 1t-32 4t-27 4.5t-32 6.5t-30.5 6l-150 -78l43 134q-173 125 -173 301q0 104 58 191
t157.5 137t216.5 50q159 0 283 -89t152 -223q-23 2 -42 2q-100 0 -184.5 -47t-133 -128t-48.5 -177zM291 623q-25 0 -45 -16t-20 -40t20 -39.5t45 -15.5t39.5 15t14.5 40t-14.5 40.5t-39.5 15.5zM593 623q-25 0 -44.5 -16t-19.5 -40t19.5 -39.5t44.5 -15.5t39.5 15t14.5 40
t-14.5 40.5t-39.5 15.5z" />
<glyph glyph-name="uniE643" unicode="&#xe643;"
d="M512 896q-139 0 -257 -68.5t-186.5 -186.5t-68.5 -257t68.5 -257t186.5 -186.5t257 -68.5t257 68.5t186.5 186.5t68.5 257t-68.5 257t-186.5 186.5t-257 68.5zM563 26h-102v102h102v-102zM669 422l-46 -47q-32 -32 -46 -62t-14 -83h-102v26q0 84 60 145l63 64
q30 30 30 73q0 42 -30 72t-72 30t-72 -30t-30 -72h-103q0 84 60 144t145 60t145 -60t60 -144q0 -68 -48 -116z" />
</font>
</defs></svg>
... ...
No preview for this file type
No preview for this file type

551 Bytes | W: 0px | H: 0px

693 Bytes | W: 0px | H: 0px

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -35,6 +35,11 @@ require('./order/invoice'); // 发票
lazyLoad($('img.lazy'));
// JIT拆单
$('.show-package').click(function() {
$('.package-list').toggleClass('hide');
});
// 有货币、备注切换显示
$('.coin-ctrl, .remark-ctrl').click(function() {
var $this = $(this),
... ...
... ... @@ -214,7 +214,7 @@
.title {
padding: 0 15px;
border-bottom: 1px solid #ccc;
border-bottom: 1px solid #eee;
}
.block {
... ... @@ -259,6 +259,71 @@
}
}
.multi-package-row {
position: relative;
height: 40px;
font-size: 14px;
line-height: 40px;
border-bottom: 1px solid #eee;
text-align: center;
background: #f4fbff;
.show-package {
font-size: 16px;
cursor: pointer;
}
.package-up-icon {
position: absolute;
width: 10px;
height: 7px;
background: url(/shopping/package-up.png);
top: -7px;
left: 282px;
+ .package-item .package-title {
border-top: none;
}
}
.package-list {
position: absolute;
background: #fff;
border: 2px solid #bbb;
width: 586px;
right: 36px;
padding: 0 50px;
}
.package-title,
.package-shipping {
text-align: left;
margin-left: 10px;
}
.package-title {
border-top: 1px solid #eee;
line-height: 55px;
}
.package-shipping {
color: #595959;
margin-top: 20px;
margin-bottom: 30px;
}
.package-goods li {
width: 120px;
}
.package-goods-img {
display: block;
width: 100px;
height: 134px;
margin: 0 auto;
}
}
.order-table-head {
height: 50px;
line-height: 50px;
... ... @@ -276,7 +341,7 @@
}
.order-goods {
border-top: 1px solid #ccc;
border-top: 1px solid #eee;
padding: 20px 0;
margin: 0 15px;
text-align: center;
... ...