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 78 additions and 53 deletions
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 {{/unless}} 190 {{/unless}}
191 191
192 {{#unless ../notUseYohoCoin}} 192 {{#unless ../notUseYohoCoin}}
193 - <dt><span class="locker-switch"></span>使用YOHO币</dt> 193 + <dt><span class="locker-switch"></span>使用有货币</dt>
194 <dd id="yoho-coin-box" class="yoho-coin-box" data-coin="{{usedCoinNum}}" data-max={{canUseCoinNum}} data-total="{{total_yoho_coin_num}}"> 194 <dd id="yoho-coin-box" class="yoho-coin-box" data-coin="{{usedCoinNum}}" data-max={{canUseCoinNum}} data-total="{{total_yoho_coin_num}}">
195 <div class="outer-view"> 195 <div class="outer-view">
196 <p class="coin-err-tip">{{coinErrorTip}}</p> 196 <p class="coin-err-tip">{{coinErrorTip}}</p>
@@ -246,7 +246,7 @@ @@ -246,7 +246,7 @@
246 <li class="promotion-item"> 246 <li class="promotion-item">
247 {{#if @first}} 247 {{#if @first}}
248 <a class="gain-coin-tip" href="/help/detail?id=105&contId=233" target="_blank"></a> 248 <a class="gain-coin-tip" href="/help/detail?id=105&contId=233" target="_blank"></a>
249 - <span class="back-coin">共返YOHO币：{{../gain_yoho_coin}}个</span> 249 + <span class="back-coin">共返有货币：{{../gain_yoho_coin}}个</span>
250 <span class="total-num"><i>{{../selected_goods_count}}</i>件商品</span> 250 <span class="total-num"><i>{{../selected_goods_count}}</i>件商品</span>
251 {{/if}} 251 {{/if}}
252 <span class="promotion-name">{{promotion}}：</span> 252 <span class="promotion-name">{{promotion}}：</span>
@@ -198,7 +198,7 @@ @@ -198,7 +198,7 @@
198 <li class="promotion-item"> 198 <li class="promotion-item">
199 \{{#if @first}} 199 \{{#if @first}}
200 <a class="gain-coin-tip" href="/help/detail?id=105&contId=233" target="_blank"></a> 200 <a class="gain-coin-tip" href="/help/detail?id=105&contId=233" target="_blank"></a>
201 - <span class="back-coin">共返YOHO币：\{{../gain_yoho_coin}}个</span> 201 + <span class="back-coin">共返有货币：\{{../gain_yoho_coin}}个</span>
202 <span class="total-num"><i>\{{../selected_goods_count}}</i>件商品</span> 202 <span class="total-num"><i>\{{../selected_goods_count}}</i>件商品</span>
203 \{{/if}} 203 \{{/if}}
204 <span class="promotion-name">\{{promotion}}：</span> 204 <span class="promotion-name">\{{promotion}}：</span>
@@ -93,7 +93,7 @@ router.get('/returns/success', returnsController.index); @@ -93,7 +93,7 @@ router.get('/returns/success', returnsController.index);
93 93
94 // router.get('/index', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], IndexController.index); 94 // router.get('/index', [tabsMiddleware.getCommonHeader, tabsMiddleware.getHomeNav], IndexController.index);
95 95
96 -/* 我的YOHO币 */ 96 +/* 我的有货币 */
97 router.get('/currency', tabsMiddleware.getCommonHeader, currencyController.index); 97 router.get('/currency', tabsMiddleware.getCommonHeader, currencyController.index);
98 98
99 /* 我的红包 */ 99 /* 我的红包 */
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <div class="currencies block"> 6 <div class="currencies block">
7 <h2 class="title"></h2> 7 <h2 class="title"></h2>
8 8
9 - <h1 class="my-currency{{#if tip}} has-tip{{/if}}">目前可用YOHO币：<em>{{myCurrency}}</em>个</h1> 9 + <h1 class="my-currency{{#if tip}} has-tip{{/if}}">目前可用有货币：<em>{{myCurrency}}</em>个</h1>
10 10
11 {{# tip}} 11 {{# tip}}
12 <h1 class="currency-tip">{{date}}即将过期：<em>{{count}}</em>个</h1> 12 <h1 class="currency-tip">{{date}}即将过期：<em>{{count}}</em>个</h1>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <option{{#if selected}} selected{{/if}} value="{{url}}">{{name}}</option> 21 <option{{#if selected}} selected{{/if}} value="{{url}}">{{name}}</option>
22 {{/ options}} 22 {{/ options}}
23 </select> 23 </select>
24 - <a class="coin-helper" href="{{coinHelperUrl}}">[ 什么是YOHO币？]</a> 24 + <a class="coin-helper" href="{{coinHelperUrl}}">[ 什么是有货币？]</a>
25 </div> 25 </div>
26 </div> 26 </div>
27 27
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 {{#if success}} 11 {{#if success}}
12 <div class="gift-ok"> 12 <div class="gift-ok">
13 <h3 class="success">兑换成功!</h3> 13 <h3 class="success">兑换成功!</h3>
14 - <div class="currency-info">当前您的YOHO币数量：<em class="yoho-currency">{{yohoCoin}}</em><span class="gift-red">个</span></div> 14 + <div class="currency-info">当前您的有货币数量：<em class="yoho-currency">{{yohoCoin}}</em><span class="gift-red">个</span></div>
15 </div> 15 </div>
16 {{^}} 16 {{^}}
17 <div class="gift-fail"> 17 <div class="gift-fail">
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 {{^}} 21 {{^}}
22 <form id="giftCardForm" name="giftCardForm" method="post"> 22 <form id="giftCardForm" name="giftCardForm" method="post">
23 <ul class="gift-box"> 23 <ul class="gift-box">
24 - <li>请输入您获得的礼品卡上的12位兑换码获取YOHO币：</li> 24 + <li>请输入您获得的礼品卡上的12位兑换码获取有货币：</li>
25 <li class="giftCardCode"> 25 <li class="giftCardCode">
26 <input type="text" value="" name="giftCardCode1" class="gift-input" id="giftCardCode1" maxlength="4"/> 26 <input type="text" value="" name="giftCardCode1" class="gift-input" id="giftCardCode1" maxlength="4"/>
27 - 27 -
@@ -208,20 +208,20 @@ @@ -208,20 +208,20 @@
208 {{/ goods}} 208 {{/ goods}}
209 <tr> 209 <tr>
210 <td colspan="5"> 210 <td colspan="5">
211 - <p class="re-tips">订单金额：￥{{amount}} （￥{{cash}} 现金 - ￥{{yohoCoin}} YOHO币 - ￥{{coupon}} 优惠券）</p> 211 + <p class="re-tips">订单金额：￥{{amount}} （￥{{cash}} 现金 - ￥{{yohoCoin}} 有货币 - ￥{{coupon}} 优惠券）</p>
212 </td> 212 </td>
213 </tr> 213 </tr>
214 </table> 214 </table>
215 <h2>退款方式</h2> 215 <h2>退款方式</h2>
216 <div class="refund-detail"> 216 <div class="refund-detail">
217 - <p>我们将优先返还您在此次购物时使用的YOHO币到您的账户，请选择您实际支付金额的退款方式：</p> 217 + <p>我们将优先返还您在此次购物时使用的有货币到您的账户，请选择您实际支付金额的退款方式：</p>
218 <p> 218 <p>
219 {{# returnAmountMode}} 219 {{# returnAmountMode}}
220 <input type="radio" name="refund-type" value="{{id}}"{{#if default}} checked=""{{/if}}>{{name}} 220 <input type="radio" name="refund-type" value="{{id}}"{{#if default}} checked=""{{/if}}>{{name}}
221 {{/ returnAmountMode}} 221 {{/ returnAmountMode}}
222 </p> 222 </p>
223 <div id="refund-pay-info" class="refund-pay-info"> 223 <div id="refund-pay-info" class="refund-pay-info">
224 - <p class="type-yoho type-yoho-tips">实际支付金额将以YOHO币的形式打入您的账户中,YOHO币不限使用条件，可与现金等额使用</p> 224 + <p class="type-yoho type-yoho-tips">实际支付金额将以有货币的形式打入您的账户中,有货币不限使用条件，可与现金等额使用</p>
225 <p class="type-bank type-bank-tips">不支持信用卡退款!</p> 225 <p class="type-bank type-bank-tips">不支持信用卡退款!</p>
226 <p class="type-alipay type-alipay-tips">支付宝需经过实名认证!</p> 226 <p class="type-alipay type-alipay-tips">支付宝需经过实名认证!</p>
227 <table class="refund-pay-table"> 227 <table class="refund-pay-table">
@@ -41,12 +41,6 @@ @@ -41,12 +41,6 @@
41 41
42 <div class="share-row"> 42 <div class="share-row">
43 <span class="title pull-left">分享：</span> {{> common/share }} 43 <span class="title pull-left">分享：</span> {{> common/share }}
44 - <div class="qrcode-buy" skn="{{skn}}">  
45 - <i class="qrcode-icon"></i>扫一扫购买  
46 - <div class="qrcode-box">  
47 - <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>  
48 - </div>  
49 - </div>  
50 </div> 44 </div>
51 </div> 45 </div>
52 <div id="thumbs" class="pull-right thumbs"> 46 <div id="thumbs" class="pull-right thumbs">
@@ -175,6 +169,13 @@ @@ -175,6 +169,13 @@
175 <i class="iconfont">&#xe641;</i> {{#if isCollect}} <em>已收藏</em> {{^}} <em>收藏商品</em> {{/if}} 169 <i class="iconfont">&#xe641;</i> {{#if isCollect}} <em>已收藏</em> {{^}} <em>收藏商品</em> {{/if}}
176 </span> 170 </span>
177 171
  172 + <span id="code-buy" class="code-buy" skn="{{skn}}">
  173 + <i class="iconfont">&#xe703;</i>
  174 + <em>扫一扫购买</em>
  175 + <div class="code-box">
  176 + <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>
  177 + </div>
  178 + </span>
178 179
179 </div> 180 </div>
180 181
No preview for this file type
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > 2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
3 <svg xmlns="http://www.w3.org/2000/svg"> 3 <svg xmlns="http://www.w3.org/2000/svg">
4 <metadata> 4 <metadata>
5 -Created by FontForge 20120731 at Tue Mar 21 10:18:08 2017 5 +Created by FontForge 20120731 at Tue Mar 28 14:56:33 2017
6 By admin 6 By admin
7 </metadata> 7 </metadata>
8 <defs> 8 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Tue Mar 21 10:18:08 2017 @@ -19,7 +19,7 @@ Created by FontForge 20120731 at Tue Mar 21 10:18:08 2017
19 bbox="-6 -212 2176 996" 19 bbox="-6 -212 2176 996"
20 underline-thickness="0" 20 underline-thickness="0"
21 underline-position="0" 21 underline-position="0"
22 - unicode-range="U+0078-E702" 22 + unicode-range="U+0078-E704"
23 /> 23 />
24 <missing-glyph 24 <missing-glyph
25 /> 25 />
@@ -350,5 +350,13 @@ t201.5 -53.5t146 -146t53.5 -201.5t-53.5 -201t-146 -146t-201.5 -54z" /> @@ -350,5 +350,13 @@ t201.5 -53.5t146 -146t53.5 -201.5t-53.5 -201t-146 -146t-201.5 -54z" />
350 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 350 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
351 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 351 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
352 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" /> 352 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" />
  353 + <glyph glyph-name="qr_icon" unicode="&#xe703;"
  354 +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
  355 +v128h-64v-128zM576 64v-128h128v128h-128zM832 -64h128v128h-128v-128zM704 -128h128v64h-128v-64zM1024 -128v64h-64v-64h64z" />
  356 + <glyph glyph-name="wechat" unicode="&#xe704;" horiz-adv-x="1259"
  357 +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
  358 +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
  359 +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
  360 +q0 -17 -15.5 -30.5t-39.5 -14.5z" />
353 </font> 361 </font>
354 </defs></svg> 362 </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({ @@ -146,4 +146,9 @@ $qrcodeImg.qrcode({
146 $('.qrcode-hover-box').mouseenter(function() { 146 $('.qrcode-hover-box').mouseenter(function() {
147 window._hmt.push(['_trackEvent', '二维码', '普通店铺', 'shopId', $(this).attr('data-id')]); 147 window._hmt.push(['_trackEvent', '二维码', '普通店铺', 'shopId', $(this).attr('data-id')]);
148 }); 148 });
  149 +
  150 +$('#code-buy').mouseenter(function() {
  151 + window._hmt.push(['_trackEvent', '二维码', '商品', '', '']);
  152 +});
  153 +
149 require('./good-slide'); 154 require('./good-slide');
@@ -740,6 +740,7 @@ @@ -740,6 +740,7 @@
740 .buy-ticket { 740 .buy-ticket {
741 display: inline-block; 741 display: inline-block;
742 margin-right: 10px; 742 margin-right: 10px;
  743 + margin-bottom: 15px;
743 height: 46px; 744 height: 46px;
744 line-height: 46px; 745 line-height: 46px;
745 width: 180px; 746 width: 180px;
@@ -747,6 +748,7 @@ @@ -747,6 +748,7 @@
747 color: #fff; 748 color: #fff;
748 background: $theme-color; 749 background: $theme-color;
749 font-size: 16px; 750 font-size: 16px;
  751 + box-sizing: border-box;
750 cursor: pointer; 752 cursor: pointer;
751 753
752 &.hover { 754 &.hover {
@@ -762,7 +764,7 @@ @@ -762,7 +764,7 @@
762 .buy-now { 764 .buy-now {
763 display: inline-block; 765 display: inline-block;
764 margin-right: 10px; 766 margin-right: 10px;
765 - height: 44px; 767 + height: 46px;
766 line-height: 44px; 768 line-height: 44px;
767 width: 180px; 769 width: 180px;
768 text-align: center; 770 text-align: center;
@@ -771,6 +773,7 @@ @@ -771,6 +773,7 @@
771 cursor: pointer; 773 cursor: pointer;
772 border: 1px solid #222; 774 border: 1px solid #222;
773 background: white; 775 background: white;
  776 + box-sizing: border-box;
774 777
775 &.dis { 778 &.dis {
776 background: #ccc; 779 background: #ccc;
@@ -787,21 +790,25 @@ @@ -787,21 +790,25 @@
787 } 790 }
788 791
789 .collect-product, 792 .collect-product,
790 - .keep-shopping { 793 + .keep-shopping,
  794 + .code-buy {
791 display: inline-block; 795 display: inline-block;
792 - width: 120px;  
793 - height: 44px; 796 + width: 140px;
  797 + height: 46px;
794 text-align: center; 798 text-align: center;
795 - line-height: 44px; 799 + line-height: 42px;
  800 + margin-bottom: 15px;
796 background: #fff; 801 background: #fff;
797 color: #222; 802 color: #222;
798 border: 1px solid #ccc; 803 border: 1px solid #ccc;
  804 + box-sizing: border-box;
799 font-size: 16px; 805 font-size: 16px;
800 cursor: pointer; 806 cursor: pointer;
801 807
802 .iconfont { 808 .iconfont {
  809 + margin-right: 5px;
803 color: #ccc; 810 color: #ccc;
804 - font-size: 19px; 811 + font-size: 20px;
805 } 812 }
806 813
807 &.coled .iconfont { 814 &.coled .iconfont {
@@ -809,46 +816,28 @@ @@ -809,46 +816,28 @@
809 } 816 }
810 } 817 }
811 818
812 - .share-row {  
813 - margin-top: 20px;  
814 - height: 16px;  
815 -  
816 - .title {  
817 - line-height: 16px !important; 819 + .collect-product {
  820 + margin-right: 10px;
818 } 821 }
819 822
820 - .qrcode-buy {  
821 - color: #cf031a;  
822 - font-size: 14px;  
823 - float: right; 823 + .code-buy {
  824 + width: 150px;
824 position: relative; 825 position: relative;
825 - height: 35px;  
826 - width: 96px;  
827 826
828 - &:hover .qrcode-box { 827 + &:hover .code-box {
829 display: block; 828 display: block;
830 } 829 }
831 830
832 - .qrcode-icon {  
833 - background: url("/product/qrcode.png") no-repeat;  
834 - width: 16px;  
835 - height: 16px;  
836 - display: inline-block;  
837 - vertical-align: bottom;  
838 - margin-right: 10px;  
839 - }  
840 - }  
841 -  
842 - .qrcode-box { 831 + .code-box {
843 border: 1px solid #b0b0b0; 832 border: 1px solid #b0b0b0;
844 width: 150px; 833 width: 150px;
845 height: 150px; 834 height: 150px;
846 background: #f8f8f8; 835 background: #f8f8f8;
847 position: absolute; 836 position: absolute;
848 - top: 30px;  
849 - left: -56px;  
850 - display: none; 837 + top: 62px;
  838 + left: -1px;
851 box-sizing: border-box; 839 box-sizing: border-box;
  840 + display: none;
852 z-index: 9; 841 z-index: 9;
853 842
854 &:before { 843 &:before {
@@ -861,8 +850,21 @@ @@ -861,8 +850,21 @@
861 left: 67px; 850 left: 67px;
862 top: -8px; 851 top: -8px;
863 } 852 }
  853 + }
864 854
865 - .qrcode-img { 855 + .qrcode-box {
  856 + border: 1px solid #b0b0b0;
  857 + width: 150px;
  858 + height: 150px;
  859 + background: #f8f8f8;
  860 + position: absolute;
  861 + top: 30px;
  862 + left: -56px;
  863 + display: none;
  864 + box-sizing: border-box;
  865 + z-index: 9;
  866 +
  867 + .code-img {
866 width: 130px; 868 width: 130px;
867 height: 130px; 869 height: 130px;
868 margin: 2px auto; 870 margin: 2px auto;
@@ -870,6 +872,15 @@ @@ -870,6 +872,15 @@
870 } 872 }
871 } 873 }
872 874
  875 + .share-row {
  876 + margin-top: 20px;
  877 + height: 16px;
  878 +
  879 + .title {
  880 + line-height: 16px !important;
  881 + }
  882 + }
  883 +
873 .balance { 884 .balance {
874 display: none; 885 display: none;
875 886