From 7144df9b0c4d5f28c8533efd96d315e9ce8d2e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=9D=B0?= <>
Date: Sun, 17 Mar 2024 14:40:44 +0800
Subject: [PATCH] no message

---
 src/pages/my/my.vue                   |  6 ++++--
 src/pages/orderDetail/orderDetail.vue | 14 +++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index ea83b42..c77c241 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -30,6 +30,7 @@ const getMemberProfileData = async () => {
     const avatar = serviceDomain + JSON.parse(obj.headIcon)[0].url
     info.value = {
       avatar: avatar,
+      staffsName: obj.staffsName,
       orderTotal: obj.orderTotal,
       recycleMiles: obj.recycleMiles,
     }
@@ -66,7 +67,7 @@ const handleOrderList = () => {
         </navigator>
         <view class="meta">
           <view class="nickname">
-            {{ memberStore.profile?.nickName || memberStore.profile?.account }}
+            {{ info.staffsName }}
           </view>
           <navigator class="extra" url="/pagesMember/profile/profile" hover-class="none">
             <text class="update">更新头像昵称</text>
@@ -244,8 +245,9 @@ page {
 
       .num {
         color: #999a9f;
-        font-size: 28rpx;
+        font-size: 30rpx;
         margin-top: 20rpx;
+        font-weight: 600;
       }
 
       border-right: 2rpx solid #f2f2f2;
diff --git a/src/pages/orderDetail/orderDetail.vue b/src/pages/orderDetail/orderDetail.vue
index b87949b..221db25 100644
--- a/src/pages/orderDetail/orderDetail.vue
+++ b/src/pages/orderDetail/orderDetail.vue
@@ -297,9 +297,9 @@ const handleDetailPopupClose = () => {
   </view>
   <uni-popup ref="orderDetailPopup" type="bottom" background-color="#fff">
     <view class="popup-root">
-      <view class="title">
+      <view class="title" @click="handleDetailPopupClose">
         <view class="text">{{ order.orderStatus?.desc }}</view>
-        <view class="close" @click="handleDetailPopupClose">X</view>
+        <view class="close">X</view>
       </view>
       <view class="cont">
         <view class="info">
@@ -475,6 +475,7 @@ page {
     .text {
       font-size: 30rpx;
       width: 400rpx;
+      font-weight: 600;
     }
 
     .close {
@@ -501,13 +502,12 @@ page {
         .icon {
           margin-right: 10rpx;
         }
-        .value {
-
+        .val{
+          color: #999a9f;
         }
         .iphone {
           color: #3775F6;
         }
-
       }
 
       .loction {
@@ -564,6 +564,10 @@ page {
         flex-direction: row;
         margin: 20rpx 0;
         .label {
+          // color: #999a9f;
+        }
+        .val {
+          font-size: 28rpx;
           color: #999a9f;
         }
       }