From f5fd92cfb7e8f120f181820c9ac7f5a853a83271 Mon Sep 17 00:00:00 2001
From: xindan <2499232802@qq.com>
Date: Fri, 8 Oct 2021 22:35:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/buy/buy.css   |  6 ------
 pages/buy/buy.vue   |  2 +-
 pages/user/user.vue | 23 ++++++++++++-----------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/pages/buy/buy.css b/pages/buy/buy.css
index a44c693d..86415ed1 100644
--- a/pages/buy/buy.css
+++ b/pages/buy/buy.css
@@ -26,8 +26,6 @@
     line-height: 85rpx;
 }
 .address-alias {
-    border: 1px solid #d2364c;
-    color: #d2364c;
     padding: 2rpx 10rpx;
 }
 
@@ -117,10 +115,6 @@
     width: 50rpx;
     height: 50rpx !important;
 }
-.payment-list .selected {
-    border: 1px solid #d2364c;
-    color: #d2364c;
-}
 
 /**
 * 扩展数据
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index 0af00d4b..f582e129 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -18,7 +18,7 @@
                         <view class="address arrow-right" @tap="address_event">
                             <view v-if="address != null" class="padding-bottom-main">
                                 <view class="address-base">
-                                    <text v-if="(address.alias || null) != null" class="address-alias round margin-right-sm">{{address.alias}}</text>
+                                    <text v-if="(address.alias || null) != null" class="address-alias br-main cr-main round margin-right-sm">{{address.alias}}</text>
                                     <text>{{address.name}}</text>
                                     <text class="fr">{{address.tel}}</text>
                                 </view>
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 4703e84d..ee6ee768 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -297,33 +297,34 @@
                             temp_head_nav_list[3]['count'] = (data.integral || 0) == 0 ? 0 : data.integral;
 
                             // 数据设置
-                            var data = {
+                            var upd_data = {
                                 user_order_status_list: temp_user_order_status_list,
                                 message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total,
                                 head_nav_list: temp_head_nav_list,
                                 navigation: data.navigation || []
                             }
                             // 是否存在配置订单导航
-                            if(data.navigation.length > 0) {
-                                var temp_nav_order = null;
-                                for(var i in data.navigation) {
-                                    var url = app.globalData.url_value_handle(data.navigation[i]['event_value']);
+                            var temp_nav_order = null;
+                            if(upd_data.navigation.length > 0) {
+                                for(var i in upd_data.navigation) {
+                                    var url = app.globalData.url_value_handle(upd_data.navigation[i]['event_value']);
                                     if(url == '/pages/user-order/user-order') {
-                                        temp_nav_order = data.navigation[i];
-                                        data.navigation.splice(i, 1);
+                                        temp_nav_order = upd_data.navigation[i];
+                                        upd_data.navigation.splice(i, 1);
                                         break;
                                     }
                                 }
-                                data['navigation_order'] = temp_nav_order;
                             }
+                            upd_data['navigation_order'] = temp_nav_order;
+
                             // 用户基础信息处理
                             if((data.avatar || null) != null) {
-                                data['avatar'] = data.avatar;
+                                upd_data['avatar'] = data.avatar;
                             }
                             if((data.user_name_view || null) != null) {
-                                data['nickname'] = data.user_name_view;
+                                upd_data['nickname'] = data.user_name_view;
                             }
-                            this.setData(data);
+                            this.setData(upd_data);
 
                             // 导航购物车处理
                             var cart_total = data.common_cart_total || 0;