diff --git a/service/Application/Home/Controller/UserAddressController.class.php b/service/Application/Home/Controller/UserAddressController.class.php index 3d0e939d7..b04f1f1cd 100755 --- a/service/Application/Home/Controller/UserAddressController.class.php +++ b/service/Application/Home/Controller/UserAddressController.class.php @@ -2,7 +2,6 @@ namespace Home\Controller; -use Service\BuyService; use Service\UserService; /** @@ -39,15 +38,9 @@ class UserAddressController extends CommonController */ public function Index() { - $cart_list = BuyService::CartList(['user'=>$this->user]); - $this->assign('cart_list', $cart_list['data']); + // 用户地址 + $this->assign('user_address_list', UserService::UserAddressList(['user'=>$this->user])['data']); - $base = [ - 'total_price' => empty($cart_list['data']) ? 0 : array_sum(array_column($cart_list['data'], 'total_price')), - 'total_stock' => empty($cart_list['data']) ? 0 : array_sum(array_column($cart_list['data'], 'stock')), - 'ids' => empty($cart_list['data']) ? '' : implode(',', array_column($cart_list['data'], 'id')), - ]; - $this->assign('base', $base); $this->display('Index'); } diff --git a/service/Application/Home/Lang/zh-cn.php b/service/Application/Home/Lang/zh-cn.php index b17d8ff0f..6004cffdc 100755 --- a/service/Application/Home/Lang/zh-cn.php +++ b/service/Application/Home/Lang/zh-cn.php @@ -57,6 +57,13 @@ return array( 'is_show' => 1, 'icon' => 'am-icon-gear', ), + array( + 'control' => 'UserAddress', + 'action' => 'Index', + 'name' => '我的地址', + 'is_show' => 1, + 'icon' => 'am-icon-map-marker', + ), array( 'control' => 'Safety', 'action' => 'Index', diff --git a/service/Application/Home/View/Default/Buy/Index.html b/service/Application/Home/View/Default/Buy/Index.html index f8e2b1e09..47dd88b52 100755 --- a/service/Application/Home/View/Default/Buy/Index.html +++ b/service/Application/Home/View/Default/Buy/Index.html @@ -21,7 +21,7 @@

确认收货地址

- +
@@ -30,6 +30,9 @@
  • address-default" id="data-list-{{$address.id}}" data-value="{{$address.id}}">
    + + {{$address.alias}} + {{$address.name}} {{$address.tel}} @@ -37,7 +40,7 @@
    收货地址： - + {{$address.province_name}} {{$address.city_name}} {{$address.county_name}} @@ -54,7 +57,7 @@
    设为默认 | - 编辑 + 编辑 | 删除
    @@ -66,7 +69,7 @@
    {{:L('buy_user_address_not_data_tips')}} -
    +
    diff --git a/service/Application/Home/View/Default/UserAddress/Index.html b/service/Application/Home/View/Default/UserAddress/Index.html new file mode 100644 index 000000000..4f9599561 --- /dev/null +++ b/service/Application/Home/View/Default/UserAddress/Index.html @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + +
    + + + + + + +
    +
    +
    + +
    + +
      + +
    • address-default" id="data-list-{{$address.id}}" data-value="{{$address.id}}"> +
      +
      + + {{$address.alias}} + + + {{$address.name}} + {{$address.tel}} + +
      +
      + 收货地址： + + {{$address.province_name}} + {{$address.city_name}} + {{$address.county_name}} + {{$address.address}} + +
      + + 默认地址 + +
      +
      + 设为默认 + | + 编辑 + | + 删除 +
      +
      • +       +
    +     +
    +
    + +
    + + + + \ No newline at end of file diff --git a/service/Public/Home/Default/Css/Common.css b/service/Public/Home/Default/Css/Common.css index 11df8dcac..f9af22b39 100755 --- a/service/Public/Home/Default/Css/Common.css +++ b/service/Public/Home/Default/Css/Common.css @@ -667,7 +667,7 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23 .user-content-body {-webkit-box-flex:1;-webkit-flex:1 0 auto;-ms-flex:1 0 auto;flex:1 0 auto; } .user-offcanvas-bar { z-index: 900; } @media only screen and (min-width:640px) { - .user-sidebar {display:block;position:static;background:none; border-top: 5px solid #f78590;} + .user-sidebar {display:block;position:static;background:none; border-top: 5px solid #e94353;} .user-offcanvas-bar {position:static;width:auto;background:none;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);overflow-y:hidden;} .user-offcanvas-bar:after {content:none;} .user-main { padding: 0 5px; } diff --git a/service/Public/Home/Default/Css/UserAddress.css b/service/Public/Home/Default/Css/UserAddress.css index 4a398df16..8b80e5dc4 100755 --- a/service/Public/Home/Default/Css/UserAddress.css +++ b/service/Public/Home/Default/Css/UserAddress.css @@ -1,4 +1,76 @@ -.my-content { padding: 15px 10px; } -.region-linkage .chosen-select { display: -webkit-inline-box; width: calc(33.3% - 3px) !important; } -.region-linkage .chosen-select .chosen-single { width: 100%; } -#map { width: 100%; height: 250px; } \ No newline at end of file +/** + * 地址管理 + */ +ul.address-list { + overflow: hidden; + margin-top: 10px; +} + +ul.address-list li.address-default { + background-image: url(../Images/peraddressbg.png); +} + +ul.address-list li { + display: block; + width: calc(50% - 5px); + height: 150px; + float: left; + background-image: url(../Images/peraddbg.png); + background-repeat: no-repeat; + background-size: 100% 100%; + margin: 0 10px 10px 0; + padding: 10px; + position: relative; +} + +ul.address-list li .user-base { + font-size: 14px; + font-weight: 700; +} + +.new-addr-btn { + position: absolute; + bottom: 10px; + right: 25px; + color: #282828; + text-align: right; +} + +ul.address-list li:nth-child(2n) { + margin-right: 0; +} + +@media only screen and (min-width: 1025px) { + ul.address-list li { + width: calc(25% - 8px); + } + + ul.address-list li:nth-child(2n) { + margin-right: 10px; + } + ul.address-list li:nth-child(4n) { + margin-right: 0; + } +} + + +/** + * 地址添加/编辑 + */ +.my-content { + padding: 15px 10px; +} + +.region-linkage .chosen-select { + display: -webkit-inline-box; + width: calc(33.3% - 3px) !important; +} + +.region-linkage .chosen-select .chosen-single { + width: 100%; +} + +#map { + width: 100%; + height: 250px; +} \ No newline at end of file diff --git a/service/Public/Home/Default/Js/Buy.js b/service/Public/Home/Default/Js/Buy.js index 98f1eaf7f..a62c16366 100755 --- a/service/Public/Home/Default/Js/Buy.js +++ b/service/Public/Home/Default/Js/Buy.js @@ -93,7 +93,7 @@ $(function() // 弹出地址选择 $('.address-submit-save').on('click', function(e) { - ModalLoad($(this).data('url'), '地址管理', 'popup-modal-address', 'common-address-modal'); + ModalLoad($(this).data('url'), $(this).data('popup-title'), 'popup-modal-address', 'common-address-modal'); // 阻止事件冒泡 e.stopPropagation(); diff --git a/service/Public/Home/Default/Js/UserAddress.js b/service/Public/Home/Default/Js/UserAddress.js new file mode 100644 index 000000000..77d804a70 --- /dev/null +++ b/service/Public/Home/Default/Js/UserAddress.js @@ -0,0 +1,25 @@ +$(function() +{ + // 弹出地址选择 + $('.address-submit-save').on('click', function(e) + { + ModalLoad($(this).data('url'), $(this).data('popup-title'), 'popup-modal-address', 'common-address-modal'); + + // 阻止事件冒泡 + e.stopPropagation(); + }); + + // 阻止事件冒泡 + $('.address-submit-delete').on('click', function(e) + { + DataDelete($(this)); + e.stopPropagation(); + }); + + // 设为默认地址 + $('.address-default-submit').on('click', function(e) + { + ConfirmNetworkAjax($(this)); + e.stopPropagation(); + }); +}); \ No newline at end of file