Authored by 郭成尧

address-modified

@@ -292,13 +292,15 @@ class BuyNowController { @@ -292,13 +292,15 @@ class BuyNowController {
292 backUrl: moreUrl 292 backUrl: moreUrl
293 }); 293 });
294 294
295 - res.render('select-address', { 295 + res.render('buynow/select-address', {
296 module: 'cart', 296 module: 'cart',
297 page: 'buynow-select-address', 297 page: 'buynow-select-address',
298 pageHeader: headerData, 298 pageHeader: headerData,
299 pageFooter: true, 299 pageFooter: true,
300 moreUrl, 300 moreUrl,
301 address, 301 address,
  302 + product_sku: product_sku,
  303 + buy_number: buy_number,
302 localCss: true 304 localCss: true
303 }); 305 });
304 })().catch(next); 306 })().catch(next);
  1 +<div class="my-address-page select-address-page yoho-page">
  2 + <div class="page-wrap clearfix">
  3 + {{# address}}
  4 + <div class="address-item" data-address-id="{{address_id}}" data-is-support="{{is_support}}" data-href="{{../moreUrl}}">
  5 + <span class="name">{{consignee}}</span>
  6 + <span class="tel">{{mobile}}</span>
  7 + <p class="address-info">{{area}} {{address}}</p>
  8 + <div class="action iconfont">
  9 + <span class="edit" data-href="/home/addressAct?id={{address_id}}&refer=buynow&product_sku={{product_sku}}&buy_number={{buy_number}}">&#xe61e;</span>
  10 + <span class="del" data-id="{{address_id}}">&#xe621;</span>
  11 + </div>
  12 + </div>
  13 + {{/ address}}
  14 +
  15 + <a class="add-address" data-href="/home/addressAct?refer=buynow&product_sku={{product_sku}}&buy_number={{buy_number}}">
  16 + 添加新地址
  17 + </a>
  18 +
  19 + <div class="confim-mask hide">
  20 + <div class="confim-box">
  21 + <div class="content">
  22 + 您确定要删除地址?
  23 + </div>
  24 + <div class="action">
  25 + <span class="cancel">
  26 + 取消
  27 + </span>
  28 + <span class="confim">
  29 + 确认
  30 + </span>
  31 + </div>
  32 + </div>
  33 + </div>
  34 + </div>
  35 +</div>
@@ -129,7 +129,11 @@ $addressForm.on('submit', function() { @@ -129,7 +129,11 @@ $addressForm.on('submit', function() {
129 isSubmiting = false; 129 isSubmiting = false;
130 loading.hideLoadingMask(); 130 loading.hideLoadingMask();
131 } else if (window.queryString) { 131 } else if (window.queryString) {
132 - if (window.queryString.refer === 'shopping') { 132 + if (window.queryString.refer === 'buynow') {
  133 + window.location.href = '/cart/index/buynow/selectAddress?product_sku=' +
  134 + window.queryString.product_sku + '&buy_number=' +
  135 + window.queryString.buy_number;
  136 + } else if (window.queryString.refer === 'shopping') {
133 window.location.href = '/cart/index/new/selectAddress'; 137 window.location.href = '/cart/index/new/selectAddress';
134 } else if (window.queryString.refer === 'modify') { 138 } else if (window.queryString.refer === 'modify') {
135 window.location.href = '/home/addressModify'; 139 window.location.href = '/home/addressModify';