From d973905bbe507d235b3b2b3a4ab9557989e5b94a Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Thu, 1 Dec 2022 15:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E4=BC=98=E5=8C=96):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderStatusList/index.module.scss         | 37 ++++++++++---------
 src/pages/user/index.tsx                      |  5 ++-
 src/use/useLogin.ts                           |  2 +
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/pages/order/orderList/components/orderStatusList/index.module.scss b/src/pages/order/orderList/components/orderStatusList/index.module.scss
index 47de83d..ec16ce7 100644
--- a/src/pages/order/orderList/components/orderStatusList/index.module.scss
+++ b/src/pages/order/orderList/components/orderStatusList/index.module.scss
@@ -1,18 +1,19 @@
-.order_status_list{
-    font-size: $font_size;
-    color: #9E9E9E;
-    margin-top: 20px;
-    .order_status_item{
-        padding: 20px;
-        box-sizing: border-box;
-    }
-    .selected{
-        font-weight: 700;
-        color: #000;
-        border-bottom: 4px solid #707070;
-    }
-    .order_list_scroll{
-        white-space: nowrap;
-        display: flex;
-    }
-}
\ No newline at end of file
+.order_status_list {
+  font-size: $font_size;
+  color: #9e9e9e;
+  margin-top: 20px;
+  .order_status_item {
+    padding: 20px;
+    padding-bottom: 6px;
+    box-sizing: border-box;
+  }
+  .selected {
+    font-weight: 700;
+    color: #000;
+    border-bottom: 4px solid #707070;
+  }
+  .order_list_scroll {
+    white-space: nowrap;
+    display: flex;
+  }
+}
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index 996cc5c..2ddec86 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -1,5 +1,5 @@
 import { View, Image, Text, Navigator, Button } from '@tarojs/components'
-import { memo, useEffect, useState } from 'react'
+import { memo, useEffect, useMemo, useState } from 'react'
 import styles from './index.module.scss'
 import classnames from 'classnames'
 import { useSelector } from '@/reducers/hooks'
@@ -8,7 +8,7 @@ import useLogin from '@/use/useLogin'
 import { BASE_URL } from '@/common/constant'
 import Taro, { useShareAppMessage } from '@tarojs/taro'
 import { userassets, userorderStatistics } from '@/api/mine'
-import { formatPriceDiv } from '@/common/fotmat'
+import { formatImgUrl, formatPriceDiv } from '@/common/fotmat'
 import { useDidShow } from '@tarojs/taro'
 import { GetAdminUserInfoApi } from '@/api/user'
 
@@ -143,6 +143,7 @@ const Header = memo((props: any) => {
       url: '/pages/userEdit/index',
     })
   }
+
   return (
     <View className={styles.header} onClick={props.onClick}>
       <View className={`${styles.crad} ${styles['header-card']}`}>
diff --git a/src/use/useLogin.ts b/src/use/useLogin.ts
index af06029..42a661c 100644
--- a/src/use/useLogin.ts
+++ b/src/use/useLogin.ts
@@ -7,6 +7,7 @@ import { GetShortCodeApi } from '@/api/share'
 import { alert } from '@/common/common'
 import { LoginApi } from '@/api/login'
 import { IMG_CND_Prefix } from '@/common/constant'
+import { formatImgUrl } from '@/common/fotmat'
 
 export default () => {
   const { setUserInfo, setAdminUserInfo, setSortCode, userInfo } = useUserInfo()
@@ -31,6 +32,7 @@ export default () => {
   const { fetchData: useFetchData } = GetAdminUserInfoApi()
   const getAdminUserInfo = async () => {
     let res = await useFetchData()
+    res.data.avatar_url = res.data.avatar_url ? res.data.avatar_url : formatImgUrl('/user/avatar.png')
     setAdminUserInfo({ ...res.data })
     getShortCode(res.data.user_id)
   }