From 8ac939e693a4e564a488a837c4e767ad3ebc8785 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Mon, 12 Dec 2022 17:21:45 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(=E5=90=88=E5=B9=B6=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=B8=8E=E5=AE=A2=E6=88=B7=E6=B5=AE?=
 =?UTF-8?q?=E7=AA=97):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/constant.ts                               | 4 ++--
 src/components/iconfont/iconfont.tsx                 | 1 -
 src/pages/user/components/customer/index.module.scss | 2 +-
 src/pages/user/components/customer/index.tsx         | 8 ++++----
 src/pages/user/index.module.scss                     | 4 +++-
 src/pages/user/index.tsx                             | 2 +-
 src/pages/userEdit/index.tsx                         | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/common/constant.ts b/src/common/constant.ts
index 63b09c0..a012d5c 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -1,4 +1,4 @@
-export const BASE_URL = CURRENT_BASE_URL
+// export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = `http://192.168.0.75:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:50001/lymarket`
 // export const BASE_URL = `http://10.0.0.5:50001/lymarket`
@@ -12,7 +12,7 @@ export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
-// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
+export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
 // export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
 // export const BASE_URL = `http://192.168.1.42:50002/lymarket` //  杰
 
diff --git a/src/components/iconfont/iconfont.tsx b/src/components/iconfont/iconfont.tsx
index 52d351a..dda8d1b 100644
--- a/src/components/iconfont/iconfont.tsx
+++ b/src/components/iconfont/iconfont.tsx
@@ -86,7 +86,6 @@ const IconFont:FC<PropsType> = ({
 
       { name === 'icon-dianhua' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M880.384 820.768c31.552-54.72 14.08-96.736-41.792-138.784-65.664-49.44-129.856-82.688-176-29.44 0 0-48.992 58.112-193.152-77.856-167.584-159.232-97.28-215.68-97.28-215.68 58.336-58.432 21.28-101.984-27.616-168-48.896-65.952-98.272-86.848-169.184-30.08C38.72 270.272 231.36 527.04 328.8 626.88c0 0 148.096 152.672 241.28 203.52l49.888 27.776c71.52 36.576 151.84 53.312 208.384 19.36 0 0 27.264-13.984 52.032-56.8z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(51,127,255)'}' /%3E%3C/svg%3E${quot})`, width: `${svgSize}px`, height: `${svgSize}px`, ...customStyle}} className={classnames("icon", customClassName)} />) }
 {/* icon-paixu */}
->>>>>>> f0abc88 (✨ feat(ID1000800浮窗提示客户经理电话完成):)
 
       { name === 'icon-paixu' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 940l200-260H312zM512 84l200 260H312z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(0,0,0)'}' opacity='.5' /%3E%3C/svg%3E${quot})`, width: `${svgSize}px`, height: `${svgSize}px`, ...customStyle}} className={classnames("icon", customClassName)} />) }
 {/* icon-shaixuan */}
diff --git a/src/pages/user/components/customer/index.module.scss b/src/pages/user/components/customer/index.module.scss
index 9414bab..c656bed 100644
--- a/src/pages/user/components/customer/index.module.scss
+++ b/src/pages/user/components/customer/index.module.scss
@@ -32,7 +32,7 @@
       background: #ffffff;
       box-shadow: 0px 0px 28px -3px rgba(0, 0, 0, 0.06);
       border-radius: 16px;
-      margin-top: 16px;
+      margin-bottom: 16px;
       position: relative;
       button {
         position: absolute;
diff --git a/src/pages/user/components/customer/index.tsx b/src/pages/user/components/customer/index.tsx
index a44dc28..b5dde0d 100644
--- a/src/pages/user/components/customer/index.tsx
+++ b/src/pages/user/components/customer/index.tsx
@@ -37,18 +37,18 @@ export default (props: Param) => {
             <Text>竭诚为您服务！</Text>
           </View>
           <View className={styles.customer_service_item_icon}>
-            <IconFont name="icon-xiala" />
+            <IconFont name="icon-xiala" size={40} />
           </View>
           <Button openType="contact" className={styles.customer} />
         </View>
-        {userInfo?.adminUserInfo?.sale_user_id && <View onClick={makePhoneCall} className={styles.customer_service_item}>
+        {!!userInfo?.adminUserInfo?.sale_user_id && <View onClick={makePhoneCall} className={styles.customer_service_item}>
           <IconFont name="icon-bodakehujingli" size={60} />
           <View className={styles.customer_service_item_con}>
             <Text>客户经理</Text>
             <Text>点击拨打{userInfo?.adminUserInfo?.sale_user_phone}</Text>
           </View>
-          <View className={styles.customer_service_item_icon}>
-            <IconFont name="icon-xiala" />
+          <View className={styles.customer_service_item_icon} >
+            <IconFont name="icon-xiala" size={40} />
           </View>
         </View>}
       </View>
diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss
index ddf3439..5cc8217 100644
--- a/src/pages/user/index.module.scss
+++ b/src/pages/user/index.module.scss
@@ -16,9 +16,9 @@
     width: 100%;
     background-color: #eff3ff;
     position: relative;
+    overflow: hidden;
     .header_bg {
       width: 100%;
-      height: 100%;
       position: absolute;
       top: 0;
       left: 0;
@@ -97,6 +97,8 @@
       display: flex;
       justify-content: space-between;
       margin-top: 48px;
+      padding-bottom: 24px;
+      box-sizing: border-box;
       .header_count__item {
         flex: 1;
         display: flex;
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index 642ed5e..f0ba710 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -111,7 +111,7 @@ export default () => {
             <Text>0</Text>
             <Text>活动积分</Text>
           </View>
-          <View className={styles.header_count__item} onClick={() => goLink('/pages/bindSalesman/index')}>
+          <View className={styles.header_count__item} onClick={() => goLink('/pages/inviteCode/index')}>
             <IconFont name="icon-erweima" size={50} />
             <Text>邀请码</Text>
           </View>
diff --git a/src/pages/userEdit/index.tsx b/src/pages/userEdit/index.tsx
index 886d976..2dd167a 100644
--- a/src/pages/userEdit/index.tsx
+++ b/src/pages/userEdit/index.tsx
@@ -216,7 +216,7 @@ export default () => {
         />
       </View>
 
-      {userInfo?.adminUserInfo?.sale_user_id && <View className="customer_service">
+      {!!userInfo?.adminUserInfo?.sale_user_id && <View className="customer_service">
         <Image className="customer_service_image" src={formatImgUrl('/mall/avatar2.png', '')}></Image>
         <View className="customer_service_name_and_phone">
           <View className="customer_service_name">