From bc3eb9dad3aff1824656f5e1c61197ba9add29a1 Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Thu, 8 Sep 2022 11:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(=E6=88=91=E7=9A=84):=20?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E6=88=91=E7=9A=84UI=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                           |  4 +++-
 src/components/iconCard/index.module.scss |  2 +-
 src/pages/order/index.tsx                 | 12 ------------
 src/pages/user/index.config.ts            |  2 +-
 src/pages/user/index.module.scss          |  7 +++++++
 src/pages/user/index.tsx                  |  9 +++++++--
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/config/index.js b/config/index.js
index fbb6e6d..3b436bc 100644
--- a/config/index.js
+++ b/config/index.js
@@ -44,7 +44,9 @@ const config = {
     postcss: {
       pxtransform: {
         enable: true,
-        config: {},
+        config: {
+          onePxTransform: false,
+        },
       },
       url: {
         enable: true,
diff --git a/src/components/iconCard/index.module.scss b/src/components/iconCard/index.module.scss
index 751e275..d36c6aa 100644
--- a/src/components/iconCard/index.module.scss
+++ b/src/components/iconCard/index.module.scss
@@ -4,7 +4,7 @@
   justify-content: center;
   align-items: center;
   &-name{
-    font-size: 28px;
+    font-size: 26px;
     color: #333;
     margin-top: 16px;
   }
diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx
index 459bcc3..8d378d8 100644
--- a/src/pages/order/index.tsx
+++ b/src/pages/order/index.tsx
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { View, ScrollView, Input, Button } from '@tarojs/components'
 import { useCallback, useEffect, useMemo, useRef, useState, } from 'react'
 import { mpenumsaleorderstatus, OrderListApi } from '@/api/order'
@@ -11,17 +10,6 @@ import Popup from '@/components/popup'
 import InfiniteScroll from '@/components/infiniteScroll'
 import { compose } from 'redux'
 import Taro, { useDidShow } from '@tarojs/taro'
-=======
-import { View } from '@tarojs/components'
-import Taro, { useDidShow } from '@tarojs/taro'
-import { useMemo, useState } from 'react'
-const Order = () => {
-  
-
-  const [count, setCount] = useState(0)
-  return <View>{count}</View>
-}
->>>>>>> d851d6d (🎈 perf(自定义tabbar): 优化自定义tabbar)
 
 export default () => {
   //页码和页数
diff --git a/src/pages/user/index.config.ts b/src/pages/user/index.config.ts
index 90ec98a..5531ea2 100644
--- a/src/pages/user/index.config.ts
+++ b/src/pages/user/index.config.ts
@@ -4,5 +4,5 @@ export default definePageConfig({
   navigationBarBackgroundColor: '#4581FF',
   backgroundColor: '#4581FF',
   backgroundColorTop: '#4581FF',
-  enablePullDownRefresh: true
+  enablePullDownRefresh: true,
 })
diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss
index 737373a..a1f1daf 100644
--- a/src/pages/user/index.module.scss
+++ b/src/pages/user/index.module.scss
@@ -1,7 +1,14 @@
+page{
+  position: relative;
+
+}
 .main {
   background: linear-gradient(to bottom, $color_main 25%, $color_bg_one 42%);
   padding: 24px;
+  padding-bottom: 0;
   box-sizing: border-box;
+  overflow-y: scroll;
+  height: 100%;
 }
 .userAvatar {
   position: relative;
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index 832611e..74a38c7 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -62,6 +62,11 @@ const UserInfo: FC = () => {
       name: '收款列表',
       path: '',
     },
+    {
+      iconName: 'icon-shoukuanliebiao',
+      name: '客户列表',
+      path: '',
+    },
   ]
 
   const fabric: IconCardType[] = [
@@ -156,13 +161,13 @@ const UserInfo: FC = () => {
           })}
         </View>
       </LayoutBlock>
-      <LayoutBlock circle>
+      {/* <LayoutBlock circle>
         <View className={styles.layoutTabBar}>
           <View className={styles.layoutTitle}>客户列表</View>
           <View className={styles.layoutDescription}>查看全部客户 ▶</View>
         </View>
         asdfasdfasdfas 
-      </LayoutBlock>
+      </LayoutBlock> */}
     </>
   )
 }