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 @@ @@ -24,7 +24,7 @@
24 <div class="item-button"> 24 <div class="item-button">
25 {{#if over}} 25 {{#if over}}
26 <span class="old-price">还可以原价购买</span> 26 <span class="old-price">还可以原价购买</span>
27 - <a href='/product/seckill/show_{{{productSkn}}}{{#if @root.isApp}}?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":"{{productSkn}}"}}{{/if}}' class="btn btn-over">已抢光</a> 27 + <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>
28 {{else if wait}} 28 {{else if wait}}
29 {{#if @root.isApp}} 29 {{#if @root.isApp}}
30 {{#unless hideRemind}} 30 {{#unless hideRemind}}
@@ -41,5 +41,5 @@ @@ -41,5 +41,5 @@
41 </div> 41 </div>
42 </div> 42 </div>
43 43
44 - <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> 44 + <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>
45 </div> 45 </div>
@@ -23,6 +23,8 @@ function tranformPayment(data, orderInfo) { @@ -23,6 +23,8 @@ function tranformPayment(data, orderInfo) {
23 result.phoneNum = cookieAddress ? cookieAddress.mobile : addressData.mobile; 23 result.phoneNum = cookieAddress ? cookieAddress.mobile : addressData.mobile;
24 result.addressId = cookieAddress ? crypto.decrypt(null, cookieAddress.address_id) : addressData.address_id; 24 result.addressId = cookieAddress ? crypto.decrypt(null, cookieAddress.address_id) : addressData.address_id;
25 result.addressInfo = cookieAddress ? cookieAddress.address_info : [addressData.area, addressData.address].join(' '); 25 result.addressInfo = cookieAddress ? cookieAddress.address_info : [addressData.area, addressData.address].join(' ');
  26 +
  27 + result.addressId = crypto.encryption(null, result.addressId);
26 } 28 }
27 29
28 // delivery_way 配送信息 30 // delivery_way 配送信息