fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit c439a1d0490606df8e339b302336ffeb76bbcbd6 2 parents f82b5666 25338565

Merge branch 'release/5.1' of http://git.yoho.cn/fe/yohobuywap-node into release/5.1

Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
... ... @@ -24,7 +24,7 @@
<div class="item-button">
{{#if over}}
<span class="old-price">还可以原价购买</span>
<a href='/product/seckill/show_{{{productSkn}}}{{#if @root.isApp}}?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"{{productSkn}}"}}{{/if}}' class="btn btn-over">已抢光</a>
<a href='/product/seckill/show_{{{productSkn}}}.html{{#if @root.isApp}}?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"{{productSkn}}"}}{{/if}}' class="btn btn-over">已抢光</a>
{{else if wait}}
{{#if @root.isApp}}
{{#unless hideRemind}}
... ... @@ -41,5 +41,5 @@
</div>
</div>
<a class="item-link" href='/product/seckill/show_{{{productSkn}}}{{#if @root.isApp}}?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"{{productSkn}}", "is_seckill": "Y"}}{{/if}}'></a>
<a class="item-link" href='/product/seckill/show_{{{productSkn}}}.html{{#if @root.isApp}}?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"{{productSkn}}", "is_seckill": "Y"}}{{/if}}'></a>
</div>
\ No newline at end of file
... ...
... ... @@ -23,6 +23,8 @@ function tranformPayment(data, orderInfo) {
result.phoneNum = cookieAddress ? cookieAddress.mobile : addressData.mobile;
result.addressId = cookieAddress ? crypto.decrypt(null, cookieAddress.address_id) : addressData.address_id;
result.addressInfo = cookieAddress ? cookieAddress.address_info : [addressData.area, addressData.address].join(' ');
result.addressId = crypto.encryption(null, result.addressId);
}
// delivery_way 配送信息
... ...