fe / yohobuy-node · Commits

Go to a project

Authored by OF1706
Commit 99268c3f557ea7f466e951b41b2cb6617f30bf9f 2 parents 985605ed 40d5c037

Merge branch 'feature/detailCode' of http://git.yoho.cn/fe/yohobuy-node into feature/detailCode

Inline Side-by-side
Showing 6 changed files with 11 additions and 11 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>
... ...
... ... @@ -83,7 +83,7 @@ router.get('/message/pickCoupon', messageController.pickCoupon);
// 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"/>
-
... ...
... ... @@ -189,20 +189,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">
... ...