fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit 69e3a6cc2fcf9063e5f937cfe6c48fb5837e0da1 2 parents 4eb3afb6 0f73e685

Merge branch 'feature/detailCode' into feature/format

Inline Side-by-side
Showing 14 changed files with 81 additions and 56 deletions
... ... @@ -190,7 +190,7 @@
{{/unless}}
{{#unless ../notUseYohoCoin}}
<dt><span class="locker-switch"></span>使用YOHO币</dt>
<dt><span class="locker-switch"></span>使用有货币</dt>
<dd id="yoho-coin-box" class="yoho-coin-box" data-coin="{{usedCoinNum}}" data-max={{canUseCoinNum}} data-total="{{total_yoho_coin_num}}">
<div class="outer-view">
<p class="coin-err-tip">{{coinErrorTip}}</p>
... ... @@ -246,7 +246,7 @@
<li class="promotion-item">
{{#if @first}}
<a class="gain-coin-tip" href="/help/detail?id=105&contId=233" target="_blank"></a>
<span class="back-coin">共返YOHO币：{{../gain_yoho_coin}}个</span>
<span class="back-coin">共返有货币：{{../gain_yoho_coin}}个</span>
<span class="total-num"><i>{{../selected_goods_count}}</i>件商品</span>
{{/if}}
<span class="promotion-name">{{promotion}}：</span>
... ...
... ... @@ -198,7 +198,7 @@
<li class="promotion-item">
\{{#if @first}}
<a class="gain-coin-tip" href="/help/detail?id=105&contId=233" target="_blank"></a>
<span class="back-coin">共返YOHO币：\{{../gain_yoho_coin}}个</span>
<span class="back-coin">共返有货币：\{{../gain_yoho_coin}}个</span>
<span class="total-num"><i>\{{../selected_goods_count}}</i>件商品</span>
\{{/if}}
<span class="promotion-name">\{{promotion}}：</span>
... ...
... ... @@ -93,7 +93,7 @@ router.get('/returns/success', returnsController.index);
// router.get('/index', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], IndexController.index);
/* 我的YOHO币 */
/* 我的有货币 */
router.get('/currency', tabsMiddleware.getCommonHeader, currencyController.index);
/* 我的红包 */
... ...
... ... @@ -6,7 +6,7 @@
<div class="currencies block">
<h2 class="title"></h2>
<h1 class="my-currency{{#if tip}} has-tip{{/if}}">目前可用YOHO币：<em>{{myCurrency}}</em>个</h1>
<h1 class="my-currency{{#if tip}} has-tip{{/if}}">目前可用有货币：<em>{{myCurrency}}</em>个</h1>
{{# tip}}
<h1 class="currency-tip">{{date}}即将过期：<em>{{count}}</em>个</h1>
... ... @@ -21,7 +21,7 @@
<option{{#if selected}} selected{{/if}} value="{{url}}">{{name}}</option>
{{/ options}}
</select>
<a class="coin-helper" href="{{coinHelperUrl}}">[ 什么是YOHO币？]</a>
<a class="coin-helper" href="{{coinHelperUrl}}">[ 什么是有货币？]</a>
</div>
</div>
... ...
... ... @@ -11,7 +11,7 @@
{{#if success}}
<div class="gift-ok">
<h3 class="success">兑换成功!</h3>
<div class="currency-info">当前您的YOHO币数量：<em class="yoho-currency">{{yohoCoin}}</em><span class="gift-red">个</span></div>
<div class="currency-info">当前您的有货币数量：<em class="yoho-currency">{{yohoCoin}}</em><span class="gift-red">个</span></div>
</div>
{{^}}
<div class="gift-fail">
... ... @@ -21,7 +21,7 @@
{{^}}
<form id="giftCardForm" name="giftCardForm" method="post">
<ul class="gift-box">
<li>请输入您获得的礼品卡上的12位兑换码获取YOHO币：</li>
<li>请输入您获得的礼品卡上的12位兑换码获取有货币：</li>
<li class="giftCardCode">
<input type="text" value="" name="giftCardCode1" class="gift-input" id="giftCardCode1" maxlength="4"/>
-
... ...
... ... @@ -208,20 +208,20 @@
{{/ goods}}
<tr>
<td colspan="5">
<p class="re-tips">订单金额：￥{{amount}} （￥{{cash}} 现金 - ￥{{yohoCoin}} YOHO币 - ￥{{coupon}} 优惠券）</p>
<p class="re-tips">订单金额：￥{{amount}} （￥{{cash}} 现金 - ￥{{yohoCoin}} 有货币 - ￥{{coupon}} 优惠券）</p>
</td>
</tr>
</table>
<h2>退款方式</h2>
<div class="refund-detail">
<p>我们将优先返还您在此次购物时使用的YOHO币到您的账户，请选择您实际支付金额的退款方式：</p>
<p>我们将优先返还您在此次购物时使用的有货币到您的账户，请选择您实际支付金额的退款方式：</p>
<p>
{{# returnAmountMode}}
<input type="radio" name="refund-type" value="{{id}}"{{#if default}} checked=""{{/if}}>{{name}}
{{/ returnAmountMode}}
</p>
<div id="refund-pay-info" class="refund-pay-info">
<p class="type-yoho type-yoho-tips">实际支付金额将以YOHO币的形式打入您的账户中,YOHO币不限使用条件，可与现金等额使用</p>
<p class="type-yoho type-yoho-tips">实际支付金额将以有货币的形式打入您的账户中,有货币不限使用条件，可与现金等额使用</p>
<p class="type-bank type-bank-tips">不支持信用卡退款!</p>
<p class="type-alipay type-alipay-tips">支付宝需经过实名认证!</p>
<table class="refund-pay-table">
... ...
... ... @@ -41,12 +41,6 @@
<div class="share-row">
<span class="title pull-left">分享：</span> {{> common/share }}
<div class="qrcode-buy" skn="{{skn}}">
<i class="qrcode-icon"></i>扫一扫购买
<div class="qrcode-box">
<div id="qrcode-img" class="qrcode-img" data-url='http://union.yoho.cn/union/app-downloads.html?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"{{skn}}"}}'></div>
</div>
</div>
</div>
</div>
<div id="thumbs" class="pull-right thumbs">
... ... @@ -175,6 +169,13 @@
<i class="iconfont">&#xe641;</i> {{#if isCollect}} <em>已收藏</em> {{^}} <em>收藏商品</em> {{/if}}
</span>
<span id="code-buy" class="code-buy" skn="{{skn}}">
<i class="iconfont">&#xe703;</i>
<em>扫一扫购买</em>
<div class="code-box">
<div id="qrcode-img" class="code-img" data-url='http://union.yoho.cn/union/app-downloads.html?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"{{skn}}"}}'></div>
</div>
</span>
</div>
... ...
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 Tue Mar 21 10:18:08 2017
Created by FontForge 20120731 at Tue Mar 28 14:56:33 2017
By admin
</metadata>
<defs>
... ... @@ -19,7 +19,7 @@ Created by FontForge 20120731 at Tue Mar 21 10:18:08 2017
bbox="-6 -212 2176 996"
underline-thickness="0"
underline-position="0"
unicode-range="U+0078-E702"
unicode-range="U+0078-E704"
/>
<missing-glyph
/>
... ... @@ -350,5 +350,13 @@ t201.5 -53.5t146 -146t53.5 -201.5t-53.5 -201t-146 -146t-201.5 -54z" />
d="M1000 391q0 98 -38.5 187t-103 153.5t-154.5 102.5t-189 38t-190 -38t-156.5 -102.5t-105 -154t-39.5 -186.5q0 -2 -0.5 -5.5t-0.5 -4.5v-246q0 -24 23.5 -37.5t55.5 -13.5h63q29 0 46.5 12.5t17.5 38.5v242q0 27 -18.5 50.5t-45.5 23.5h-74q-3 0 -7 -2.5t-5 -2.5
q13 107 74 194.5t157 137.5t207 50q112 0 208.5 -50.5t157.5 -138.5t73 -195q-20 7 -23 7h-74q-23 0 -45 -21t-22 -44v-251q0 -24 23.5 -37.5t55.5 -13.5h62q29 0 47 12.5t18 38.5v242q0 1 1.5 6.5t0.5 7.5zM91 405h74q9 0 13.5 -10t4.5 -18v-242q0 -6 -18 -6h-63
q-33 0 -33 6v251q0 3 8.5 11t13.5 8v0zM952 135q0 -6 -19 -6h-62q-33 0 -33 6v251q0 3 8.5 11t12.5 8h74q10 0 14.5 -10.5t4.5 -17.5v-242z" />
<glyph glyph-name="qr_icon" unicode="&#xe703;"
d="M0 448h448v448h-448v-448zM128 768h192v-192h-192v192zM576 896v-448h448v448h-448zM896 576h-192v192h192v-192zM0 -128h448v448h-448v-448zM128 192h192v-192h-192v192zM576 320v-128h128v128h-128zM960 320h-128v-128h128v128zM832 192h-128v-128h128v128zM960 64h64
v128h-64v-128zM576 64v-128h128v128h-128zM832 -64h128v128h-128v-128zM704 -128h128v64h-128v-64zM1024 -128v64h-64v-64h64z" />
<glyph glyph-name="wechat" unicode="&#xe704;" horiz-adv-x="1259"
d="M852 587q20 0 43 -3q-19 89 -84 160.5t-161.5 111.5t-204.5 40q-121 0 -223.5 -50.5t-162 -138t-59.5 -191.5q0 -177 179 -301l-44 -134l155 79q8 -2 31.5 -6.5t33 -6.5t28 -4.5t33.5 -3.5t31 -1q19 0 41 2q-13 45 -14 93q0 96 50 177t137 128.5t191 48.5zM612 707
q26 0 41 -15t15 -40.5t-15 -40.5t-40 -16q-27 0 -47 16t-20 40t20 40t46 16zM301 595q-27 0 -47.5 15.5t-20.5 39.5t20.5 40t46.5 16q25 0 40.5 -15t15.5 -40t-15 -40.5t-40 -15.5zM1260 240q0 87 -53 162t-140.5 118t-185.5 43q-105 0 -192 -44t-137 -118.5t-50 -162.5
t50.5 -162t138 -117t191.5 -43q45 0 134 23l122 -67l-33 111q71 54 113 120t42 137zM758 295q-16 0 -30 13.5t-14 30.5t13.5 31t30.5 14q24 0 40 -13.5t16 -30.5q0 -18 -15.5 -31.5t-40.5 -13.5zM1004 295q-17 0 -31 14t-14 31t14 31t30 14q24 0 40 -13.5t16 -31.5
q0 -17 -15.5 -30.5t-39.5 -14.5z" />
</font>
</defs></svg>
... ...
No preview for this file type
No preview for this file type

2.43 KB | W: | H:

1.96 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -146,4 +146,9 @@ $qrcodeImg.qrcode({
$('.qrcode-hover-box').mouseenter(function() {
window._hmt.push(['_trackEvent', '二维码', '普通店铺', 'shopId', $(this).attr('data-id')]);
});
$('#code-buy').mouseenter(function() {
window._hmt.push(['_trackEvent', '二维码', '商品', '', '']);
});
require('./good-slide');
... ...
... ... @@ -740,6 +740,7 @@
.buy-ticket {
display: inline-block;
margin-right: 10px;
margin-bottom: 15px;
height: 46px;
line-height: 46px;
width: 180px;
... ... @@ -747,6 +748,7 @@
color: #fff;
background: $theme-color;
font-size: 16px;
box-sizing: border-box;
cursor: pointer;
&.hover {
... ... @@ -762,7 +764,7 @@
.buy-now {
display: inline-block;
margin-right: 10px;
height: 44px;
height: 46px;
line-height: 44px;
width: 180px;
text-align: center;
... ... @@ -771,6 +773,7 @@
cursor: pointer;
border: 1px solid #222;
background: white;
box-sizing: border-box;
&.dis {
background: #ccc;
... ... @@ -787,21 +790,25 @@
}
.collect-product,
.keep-shopping {
.keep-shopping,
.code-buy {
display: inline-block;
width: 120px;
height: 44px;
width: 140px;
height: 46px;
text-align: center;
line-height: 44px;
line-height: 42px;
margin-bottom: 15px;
background: #fff;
color: #222;
border: 1px solid #ccc;
box-sizing: border-box;
font-size: 16px;
cursor: pointer;
.iconfont {
margin-right: 5px;
color: #ccc;
font-size: 19px;
font-size: 20px;
}
&.coled .iconfont {
... ... @@ -809,46 +816,28 @@
}
}
.share-row {
margin-top: 20px;
height: 16px;
.title {
line-height: 16px !important;
}
.qrcode-buy {
color: #cf031a;
font-size: 14px;
float: right;
position: relative;
height: 35px;
width: 96px;
.collect-product {
margin-right: 10px;
}
&:hover .qrcode-box {
display: block;
}
.code-buy {
width: 150px;
position: relative;
.qrcode-icon {
background: url("/product/qrcode.png") no-repeat;
width: 16px;
height: 16px;
display: inline-block;
vertical-align: bottom;
margin-right: 10px;
}
&:hover .code-box {
display: block;
}
.qrcode-box {
.code-box {
border: 1px solid #b0b0b0;
width: 150px;
height: 150px;
background: #f8f8f8;
position: absolute;
top: 30px;
left: -56px;
display: none;
top: 62px;
left: -1px;
box-sizing: border-box;
display: none;
z-index: 9;
&:before {
... ... @@ -861,8 +850,21 @@
left: 67px;
top: -8px;
}
}
.qrcode-img {
.qrcode-box {
border: 1px solid #b0b0b0;
width: 150px;
height: 150px;
background: #f8f8f8;
position: absolute;
top: 30px;
left: -56px;
display: none;
box-sizing: border-box;
z-index: 9;
.code-img {
width: 130px;
height: 130px;
margin: 2px auto;
... ... @@ -870,6 +872,15 @@
}
}
.share-row {
margin-top: 20px;
height: 16px;
.title {
line-height: 16px !important;
}
}
.balance {
display: none;
... ...