From 8b86f0f4d481230b93d18ead89b3734657e667d4 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 13 Oct 2018 01:00:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/Default/Buy/Index.html | 20 ++-- .../Home/View/Default/UserAddress/Index.html | 18 ++-- service/Public/Home/Default/Css/Buy.css | 15 +-- .../Public/Home/Default/Css/UserAddress.css | 92 ++++++++++++------- 4 files changed, 84 insertions(+), 61 deletions(-) diff --git a/service/Application/Home/View/Default/Buy/Index.html b/service/Application/Home/View/Default/Buy/Index.html index 16ffc2a60..1507063de 100755 --- a/service/Application/Home/View/Default/Buy/Index.html +++ b/service/Application/Home/View/Default/Buy/Index.html @@ -36,9 +36,9 @@ 默认 - - {{$address.name}} - {{$address.tel}} + + {{$address.name}} + {{$address.tel}}
@@ -49,14 +49,14 @@
- +
-
- 设为默认 - | - 编辑 - | - 删除 + diff --git a/service/Application/Home/View/Default/UserAddress/Index.html b/service/Application/Home/View/Default/UserAddress/Index.html index 5d92c71d1..78ee29ebe 100644 --- a/service/Application/Home/View/Default/UserAddress/Index.html +++ b/service/Application/Home/View/Default/UserAddress/Index.html @@ -37,9 +37,9 @@ 默认 - - {{$address.name}} - {{$address.tel}} + + {{$address.name}} + {{$address.tel}}
@@ -49,12 +49,12 @@ {{$address.address}}
-
- 设为默认 - | - 编辑 - | - 删除 + diff --git a/service/Public/Home/Default/Css/Buy.css b/service/Public/Home/Default/Css/Buy.css index 5d5bccba3..25f0f1bc4 100755 --- a/service/Public/Home/Default/Css/Buy.css +++ b/service/Public/Home/Default/Css/Buy.css @@ -3,13 +3,13 @@ h3 { font-size: 14px;font-weight: 700;} .address h3 { border-bottom:none;} ul.address-list li{display:none;width:100%;padding:10px;position: relative;min-height:80px;} -.address-left{ width:90%;float:left;position: relative;} -ul.address-list li .user-base {font-size: 14px;font-weight: 700;} +.address-left{ width:calc(100% - 25px);float:left;position: relative;} +ul.address-list li .user-base {font-size: 14px; font-weight: 700; margin-bottom: 5px; } .address-right{ float:right; margin-right:5px;padding-top:15px ;} /*地址操作-编辑删除*/ -.new-addr-btn {display:none;font-size: 12px;color: #282828;text-align: right; padding-right:5px ;} -.new-addr-bar {padding: 0px 5px;vertical-align: top;} +.address-operation-btn {display:none;font-size: 12px;color: #282828;text-align: right; padding-right:5px ;} +.address-operation-btn .cut { padding: 0 5px;color: #ccc; vertical-align: top; } .address-default { display:block !important;} /* 物流/支付 */ @@ -52,7 +52,7 @@ ul.address-list, .business-item ul { overflow: hidden; } .mobile-address { position: fixed; left: 0; bottom: 0; background-color: #fff; width: 100%; height: 100%; z-index: 1099; padding-top: 0 !important; margin-top: 0 !important; border-top: 0 !important; overflow-y: scroll; overflow-x: hidden; padding-bottom: 28px; } .mobile-address .control { margin-bottom: 10px; } .mobile-address .control h3 { background-color: #eee; padding: 5px; } -.mobile-address .control, .mobile-address ul.address-list li, .mobile-address ul.address-list li .new-addr-btn { display: block !important; } +.mobile-address .control, .mobile-address ul.address-list li, .mobile-address ul.address-list li .address-operation-btn { display: block !important; } .mobile-address .control .address-submit-save { position: fixed; left: 0; bottom: 0; width: 100%; z-index: 100; } .mobile-address ul.address-list li { border-bottom: 1px solid #eee; padding-top: 5px; } .mobile-address ul.address-list li .address-left { width: 100%; } @@ -103,8 +103,7 @@ ul.address-list, .business-item ul { overflow: hidden; } .th .td-inner{padding-left:0 ;} /*地址操作*/ - .new-addr-btn {display:block;position: absolute;bottom:25px ;right:10px ;} - .new-addr-bar {padding: 0px 5px;vertical-align: top;} + .address-operation-btn {display:block;position: absolute;bottom:25px ;right:10px ;} .address-right .am-icon-angle-right { display: none; } } @@ -132,6 +131,8 @@ ul.address-list, .business-item ul { overflow: hidden; } .address .control { display: none; } .address-default {background: url(../Images/peraddress.png) repeat-x; background-position: bottom; } ul.address-list li { padding: 5px; min-height: 60px; overflow: hidden; } + .address-detail .phone { float: right; } + ul.address-list .am-icon-angle-right { color: #888; } .business-item ul li { width: calc(50% - 6px); } .business-item ul li:nth-child(2n) { margin-right: 0; } diff --git a/service/Public/Home/Default/Css/UserAddress.css b/service/Public/Home/Default/Css/UserAddress.css index 704b22bd2..aee7bb579 100755 --- a/service/Public/Home/Default/Css/UserAddress.css +++ b/service/Public/Home/Default/Css/UserAddress.css @@ -1,59 +1,60 @@ /** * 地址管理 */ -ul.address-list { - overflow: hidden; -} - -ul.address-list li.address-default { - background-image: url(../Images/peraddressbg.png); -} - -ul.address-list li { - display: block; - width: calc(50% - 5px); - height: 130px; - 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; + margin-bottom: 5px; } - -.new-addr-btn { - position: absolute; - bottom: 5px; - right: 25px; - color: #282828; - text-align: right; +.address-operation-btn .cut { + padding: 0 5px; + color: #ccc; } - -ul.address-list li:nth-child(2n) { - margin-right: 0; -} - @media only screen and (min-width: 641px) { 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: 130px; + 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; + } + + .address-operation-btn { + position: absolute; + bottom: 5px; + 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); + width: calc(33.33% - 7px); } ul.address-list li:nth-child(2n) { margin-right: 10px; } - ul.address-list li:nth-child(4n) { + ul.address-list li:nth-child(3n) { margin-right: 0; } } @@ -69,6 +70,27 @@ ul.address-list li:nth-child(2n) { .am-footer { padding-bottom: 30px; } + + ul.address-list li { + padding: 5px 0 28px 5px; + position: relative; + } + ul.address-list li:not(:last-child) { + border-bottom: 1px solid #eee; + } + .address-detail .phone { + float: right; + } + .address-operation-btn { + position: absolute; + bottom: 5px; + right: 0; + color: #282828; + text-align: right; + } + .address-operation-btn a { + text-decoration: none; + } }