From 09d8d8f1ca3711788bb7f78fe119225a4c743356 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Mon, 12 Dec 2022 11:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E4=BC=98=E5=8C=96=E6=88=91?= =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E8=8E=B7=E5=8F=96=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E7=A0=81=E6=93=8D=E4=BD=9C):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/iconfont/iconfont.tsx | 20 ++++++++++++++++++-- src/pages/user/index.module.scss | 21 ++++++++++++--------- src/pages/user/index.tsx | 5 ++--- src/pages/userEdit/index.tsx | 4 ++-- src/reducers/userInfo.ts | 1 + 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/src/components/iconfont/iconfont.tsx b/src/components/iconfont/iconfont.tsx index 40fb99d..728897e 100644 --- a/src/components/iconfont/iconfont.tsx +++ b/src/components/iconfont/iconfont.tsx @@ -1,3 +1,4 @@ +<<<<<<< HEAD import React, { useState, useEffect, FC } from "react"; import { Block, View } from "@tarojs/components"; import "./iconfont.scss"; @@ -24,7 +25,7 @@ function hex2rgb(hex) { return "rgb(" + rgb.join(",") + ")"; } -export type IconNames = 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-wodekefu' | 'icon-yanseduibi' | 'icon-dizhiguanli' | 'icon-weixin' | 'icon-riqi' | 'icon-shuru' | 'icon-a-0tianzhangqi' | 'icon-huodaofukuan' | 'icon-huozhuziti' | 'icon-saomazhifu' | 'icon-xianxiahuikuan' | 'icon-yufukuan' | 'icon-xinzengshoucangjia' | 'icon-qingchusousuo' | 'icon-xuanzechenggong' | 'icon-gongnengtubiao-saomiao' | 'icon-bianjizidingyimadan' | 'icon-zidingyimadanyulan' | 'icon-yuanshimadanyulan' | 'icon-xiala' | 'icon-shangla' | 'icon-qingchuxinxi' | 'icon-sousuo' | 'icon-guanli' | 'icon-bianji' | 'icon-shoucangjia' | 'icon-shezhi' | 'icon-tishi' | 'icon-erweima' | 'icon-dianjishoucang' | 'icon-gouwuche' | 'icon-shoucangchenggong' | 'icon-fenxiangshangpin' | 'icon-kefu' | 'icon-xinzenganniu' | 'icon-jianshaoanniu' | 'icon-daifahuo2' | 'icon-daishouhuo2' | 'icon-tuikuan-shouhou' | 'icon-daipeibu2' | 'icon-daifukuan2'; +export type IconNames = 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-paixu' | 'icon-shaixuan' | 'icon-bodakehujingli' | 'icon-guanfangweixinkefu' | 'icon-tuijianbiaoqian' | 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-wodekefu' | 'icon-yanseduibi' | 'icon-dizhiguanli' | 'icon-weixin' | 'icon-riqi' | 'icon-shuru' | 'icon-a-0tianzhangqi' | 'icon-huodaofukuan' | 'icon-huozhuziti' | 'icon-saomazhifu' | 'icon-xianxiahuikuan' | 'icon-yufukuan' | 'icon-xinzengshoucangjia' | 'icon-qingchusousuo' | 'icon-xuanzechenggong' | 'icon-gongnengtubiao-saomiao' | 'icon-bianjizidingyimadan' | 'icon-zidingyimadanyulan' | 'icon-yuanshimadanyulan' | 'icon-xiala' | 'icon-shangla' | 'icon-qingchuxinxi' | 'icon-sousuo' | 'icon-guanli' | 'icon-bianji' | 'icon-shoucangjia' | 'icon-shezhi' | 'icon-tishi' | 'icon-erweima' | 'icon-dianjishoucang' | 'icon-gouwuche' | 'icon-shoucangchenggong' | 'icon-fenxiangshangpin' | 'icon-kefu' | 'icon-xinzenganniu' | 'icon-jianshaoanniu' | 'icon-daifahuo2' | 'icon-daishouhuo2' | 'icon-tuikuan-shouhou' | 'icon-daipeibu2' | 'icon-daifukuan2'; type PropsType = { name: IconNames; @@ -82,7 +83,22 @@ const IconFont:FC = ({ className={classnames(icon, customClassName)} /> )} */} - {/* icon-rukou */} + {/* icon-paixu */} + + { name === 'icon-paixu' && () } +{/* icon-shaixuan */} + + { name === 'icon-shaixuan' && () } +{/* icon-bodakehujingli */} + + { name === 'icon-bodakehujingli' && () } +{/* icon-guanfangweixinkefu */} + + { name === 'icon-guanfangweixinkefu' && () } +{/* icon-tuijianbiaoqian */} + + { name === 'icon-tuijianbiaoqian' && () } +{/* icon-rukou */} { name === 'icon-rukou' && () } {/* icon-renzhengchenggong */} diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss index ae09b22..ddf3439 100644 --- a/src/pages/user/index.module.scss +++ b/src/pages/user/index.module.scss @@ -1,6 +1,16 @@ .user_main { min-height: 100vh; background: #f7f7f7; + position: relative; + .getPhoneButton { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + opacity: 0; + z-index: 1000; + } .user_main__header { min-height: 315px; width: 100%; @@ -38,14 +48,7 @@ flex-direction: column; flex: 1; position: relative; - .getPhoneButton { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - opacity: 0; - } + .arcd-info-left-phone { position: relative; .header_title { @@ -68,7 +71,7 @@ .header_picture { display: flex; align-items: center; - padding: 5px 0; + padding: 5px 10px; padding-right: 10px; height: 38px; background: #3e6cff; diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index c8f4eac..94f9843 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -15,7 +15,6 @@ import IconFont from '@/components/iconfont/iconfont' export default () => { const userInfo = useSelector(state => state.userInfo) - const { fetchData: Apiassets, state: priceState } = userassets() const { fetchData: ApigetTotal, state: orderState } = userorderStatistics() const { getAdminUserInfo, getPhoneNumber } = useLogin() @@ -78,6 +77,7 @@ export default () => { }) return + {!userInfo?.adminUserInfo?.phone && } @@ -88,8 +88,7 @@ export default () => { {userInfo?.adminUserInfo?.phone || 'Hi,欢迎来到陆盈商城'} - {userInfo?.adminUserInfo?.company_name} - {!userInfo?.adminUserInfo?.phone && } + {userInfo?.adminUserInfo?.company_name} goLink('/pages/userEdit/index')}> diff --git a/src/pages/userEdit/index.tsx b/src/pages/userEdit/index.tsx index 1b2b6d4..dcdd46c 100644 --- a/src/pages/userEdit/index.tsx +++ b/src/pages/userEdit/index.tsx @@ -216,7 +216,7 @@ export default () => { /> - + {userInfo?.adminUserInfo?.sale_user_id && @@ -229,7 +229,7 @@ export default () => { 拨打 - + } {/*