From 2f2fcea13247ff25d0ac8d76b0a656d41b73e916 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 12 Oct 2018 12:24:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=B0=E5=9D=80=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/Application/Home/View/Default/Buy/Index.html        | 6 +++---
 .../Application/Home/View/Default/UserAddress/Index.html    | 6 +++---
 service/Public/Home/Default/Css/Buy.css                     | 2 --
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/service/Application/Home/View/Default/Buy/Index.html b/service/Application/Home/View/Default/Buy/Index.html
index 47dd88b52..59cf61509 100755
--- a/service/Application/Home/View/Default/Buy/Index.html
+++ b/service/Application/Home/View/Default/Buy/Index.html
@@ -33,6 +33,9 @@
                                     <notempty name="address.alias">
                                         <span class="am-badge am-badge-danger am-radius">{{$address.alias}}</span>
                                     </notempty>
+                                    <if condition="isset($address['is_default']) and $address['is_default'] eq 1">
+                                        <span class="am-badge am-radius">默认地址</span>
+                                    </if>
                                     <span class="buy-address-detail">   
                                         <span class="buy-user">{{$address.name}}</span>
                                         <span class="buy-phone">{{$address.tel}}</span>
@@ -47,9 +50,6 @@
                                         <span class="street">{{$address.address}}</span>
                                     </span>
                                 </div>
-                                <if condition="isset($address['is_default']) and $address['is_default'] eq 1">
-                                    <span class="deftip">默认地址</span>
-                                </if>
                             </div>
                             <div class="address-right">
                                 <span class="am-icon-angle-right am-icon-lg"></span>
diff --git a/service/Application/Home/View/Default/UserAddress/Index.html b/service/Application/Home/View/Default/UserAddress/Index.html
index 4f9599561..7a38c3330 100644
--- a/service/Application/Home/View/Default/UserAddress/Index.html
+++ b/service/Application/Home/View/Default/UserAddress/Index.html
@@ -34,6 +34,9 @@
                                     <notempty name="address.alias">
                                         <span class="am-badge am-badge-danger am-radius">{{$address.alias}}</span>
                                     </notempty>
+                                    <if condition="isset($address['is_default']) and $address['is_default'] eq 1">
+                                        <span class="am-badge am-radius">默认地址</span>
+                                    </if>
                                     <span class="buy-address-detail">   
                                         <span class="buy-user">{{$address.name}}</span>
                                         <span class="buy-phone">{{$address.tel}}</span>
@@ -48,9 +51,6 @@
                                         <span class="street">{{$address.address}}</span>
                                     </span>
                                 </div>
-                                <if condition="isset($address['is_default']) and $address['is_default'] eq 1">
-                                    <span class="deftip">默认地址</span>
-                                </if>
                             </div>
                             <div class="new-addr-btn">
                                 <a href="javascript:;" class="address-default-submit" data-url="{{:U('Home/UserAddress/SetDefault')}}" data-id="{{$address.id}}" data-view="reload">设为默认</a>
diff --git a/service/Public/Home/Default/Css/Buy.css b/service/Public/Home/Default/Css/Buy.css
index d827e245c..2b7a8226f 100755
--- a/service/Public/Home/Default/Css/Buy.css
+++ b/service/Public/Home/Default/Css/Buy.css
@@ -6,8 +6,6 @@ ul.address-list li{display:none;width:100%;padding:10px;position: relative;min-h
 .address-left{ width:90%;float:left;position: relative;}
 ul.address-list li .user-base {font-size: 14px;font-weight: 700;}
 .address-right{ float:right; margin-right:5px;padding-top:15px ;}   
-.deftip {position: absolute;top: 0px;right: 0px;padding: 0px 2px;text-decoration: none;opacity: 0.7; z-index: 3;background: #CCC none repeat scroll 0% 0%;
-color: #FFF;}
 
 /*地址操作-编辑删除*/
 .new-addr-btn {display:none;font-size: 12px;color: #282828;text-align: right; padding-right:5px ;}