From 9d03caee741d6028a88c4524814d090d15871735 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Wed, 14 Dec 2022 17:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(ID1000823=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E4=BC=98=E5=8C=96):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/moveBtn/index.tsx | 14 +++++++-------
 src/pages/index/index.tsx        |  2 +-
 src/pages/order/index.tsx        |  2 +-
 src/pages/salesAfter/index.tsx   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/moveBtn/index.tsx b/src/components/moveBtn/index.tsx
index b68dda3..adafd84 100644
--- a/src/components/moveBtn/index.tsx
+++ b/src/components/moveBtn/index.tsx
@@ -16,11 +16,11 @@ interface param {
   children?: ReactElement | null
   onShopClick?: () => void
   showList?: ShowStatus[]
-  messageTitle: string
-  messagePath: string
-  showCart: false|true
+  messageTitle?: string
+  messagePath?: string
+  showCart?: false|true
 }
-const MoveBtn = ({ children = null, onShopClick, showList = [], messageTitle = '', messagePath = '', showCart }: param) => {
+const MoveBtn = ({ children = null, onShopClick, showList = [], messageTitle = '', messagePath = '', showCart = false }: param) => {
   const userInfo = useSelector(state => state.userInfo)
   // 获取购物车数据数量
   const { getShopCount, commonData } = useCommonData()
@@ -82,7 +82,7 @@ const MoveBtn = ({ children = null, onShopClick, showList = [], messageTitle = '
       </MovableView>}
       {onShow('order') && <MovableView
         onClick={() => set_customer_service_show(true) }
-        className={styles.moveBtn}
+        className={classnames(styles.moveBtn, styles.no_bg_moveBtn)}
         direction="all"
         inertia
         x="630rpx"
@@ -92,7 +92,7 @@ const MoveBtn = ({ children = null, onShopClick, showList = [], messageTitle = '
       </MovableView>}
       {onShow('customer') && <MovableView
         onClick={onPhone}
-        className={styles.moveBtn}
+        className={classnames(styles.moveBtn, styles.no_bg_moveBtn)}
         direction="all"
         inertia
         x="630rpx"
@@ -100,7 +100,7 @@ const MoveBtn = ({ children = null, onShopClick, showList = [], messageTitle = '
       >
         <Image mode="aspectFit" src={formatImgUrl('/mall/float_button_customer_service.png')} />
       </MovableView>}
-      <Customer messageTitle={messageTitle} messagePath={messageTitle} show={customer_service_show} onClose={customerClose} />
+      <Customer messageTitle={messageTitle} messagePath={messageTitle} show={customer_service_show} showCard={showCart} onClose={customerClose} />
     </MovableArea>
   )
 }
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index b26afd3..6171cfe 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -95,7 +95,7 @@ const Index = () => {
     categoryList()
   }, [])
   return (
-    <MoveBtn showList={['shop']} onClick={() => setShowShopCart(!showShopCart)}>
+    <MoveBtn showList={['shop']} onShopClick={() => setShowShopCart(!showShopCart)}>
       <View className={styles.main}>
         <View className={styles.header}>
           <View className={styles.search}>
diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx
index 762073c..cc238f8 100644
--- a/src/pages/order/index.tsx
+++ b/src/pages/order/index.tsx
@@ -287,7 +287,7 @@ const Order = () => {
     [orderDetail],
   )
   return (
-    <MoveBtn showList={['order']}>
+    <MoveBtn showList={['order']} messageTitle={orderDetail?.order_no} messagePath={`/pages/order/index?id=${orderDetail?.id}`} showCart>
       <View className={styles.order_main}>
         {(orderDetail?.status != SaleorderstatusWaitingPrePayment.value && <OrderState orderInfo={orderDetail} />) || (
           <AdvanceOrderState orderInfo={orderDetail} onRefresh={refresh} />
diff --git a/src/pages/salesAfter/index.tsx b/src/pages/salesAfter/index.tsx
index 76cda71..9594155 100644
--- a/src/pages/salesAfter/index.tsx
+++ b/src/pages/salesAfter/index.tsx
@@ -189,7 +189,7 @@ const SalesAfter = () => {
     if (orderDetail) { formatData() }
   }, [orderDetail])
   return (
-    <MoveBtn showList={['customer']}>
+    <MoveBtn showList={['order']} messageTitle={orderDetail?.return_order_no} messagePath={`/pages/salesAfter/index?id=${orderDetail?.id}`} showCart>
       <View className={styles.order_main}>
         <OrderState orderInfo={orderDetail} />
         <AddressInfoDetail orderInfo={orderDetail} onLogistics={onShowLogistics} />