From 983dbda3e639516c156450d97877d6e6c8b50f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 10 Jun 2021 10:54:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE=E4=B8=AD?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/set/setUp.vue    | 16 ++++++++++------
 pages/order/orderDetail.vue |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue
index 7deeb18..77db428 100644
--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -3,7 +3,8 @@
     <view class="person" @click="checkUserInfo()">
       <u-image width=140 height="140" shape="circle" :src="userInfo.face || '/static/missing-face.png'" mode=""></u-image>
       <view class="user-name">
-        <view>{{ userInfo.id ? userInfo.username || '' : '暂未登录'  }}</view>
+       
+        {{ userInfo.id ? userInfo.nickName || '' : '暂未登录'  }}
       </view>
       <u-icon color="#ccc" name="arrow-right"></u-icon>
     </view>
@@ -49,7 +50,7 @@ export default {
         url: url,
       });
     },
-    
+
     /**
      * 确认退出
      * 清除缓存重新登录
@@ -136,9 +137,7 @@ export default {
                     });
                     that.getCacheSize(); // 重新计算缓存
                   },
-                  function (e) {
-                  
-                  }
+                  function (e) {}
                 );
               } else {
                 entry.remove();
@@ -195,7 +194,12 @@ export default {
   align-items: center;
   margin-bottom: 20rpx;
   .user-name {
-    flex: 1;
+    width: 500rpx;
+    overflow: hidden;
+
+    text-overflow: ellipsis;
+
+    white-space: nowrap;
     margin-left: 30rpx;
     line-height: 2em;
     font-size: 34rpx;
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 4ee6e0d..1f8ddce 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -252,7 +252,7 @@ export default {
           value: "订单已完成,祝您生活愉快",
         },
         TAKE: {
-          title: "带核验",
+          title: "待核验",
         },
       },
       order: {},