商城测试版v5

src/components/addCollection/index.tsx

@@ -26,14 +26,19 @@ export default memo(({show = false, onClose, onAdd}: ReasonInfoParam) => {
         if(show) getFavoriteList()
     }, [show])
 
+    const onCreate = () => {
+        onClose?.()
+        goLink('/pages/collection/index')
+    }
+
     return (
         <Popup show={show} onClose={onClose} showTitle={false} >
             <View className={styles.collection_con}>
                 <View className={styles.header}>
-                    <Text className={styles.title}>选择文件夹</Text>
+                    <Text className={styles.title}>选择收藏夹</Text>
                     <View className={styles.miconfont_con} >
                         <Text className={classnames(styles.miconfont, 'iconfont icon-jia')}></Text>
-                        <Text onClick={() => goLink('/pages/collection/index')}>新建</Text>
+                        <Text onClick={onCreate}>新建</Text>
                     </View>
                 </View>
                 <ScrollView scrollY className={styles.scrollView}>

src/components/estimatedAmount/index.tsx

@@ -3,8 +3,8 @@ import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useState } from
 import {formatKbPrice} from '@/common/common'
 import classnames from "classnames";
 import styles  from './index.module.scss'
-import AmountShow from "../amountShow";
 import Taro from "@tarojs/taro";
+import AmountShow from "../amountShow";
 
 type Param = {
     style?: Object,

src/components/orderBtns/index.tsx

@@ -91,11 +91,17 @@ export default memo(({orderInfo, onClick}:Param) => {
             value: [SaleOrderStatusBooking.value], //按钮对应： 待接单
             label: '退款'
         },
+        {
+            id: 9,
+            value: [SaleOrderStatusRefund.value], //售后记录按钮：已退款
+            label: '售后记录'
+        },
         {
             id: 2,
             value: [SaleOrderStatusTaking.value, SaleorderstatusWaitingPrePayment.value, SaleOrderStatusWaitingPayment.value, SaleOrderStatusWaitingDelivery.value, SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value], //去付款按钮对应：待付款， 待发货, 待收货, 已收货, 已完成
             label: '去付款'
         },
+        
     ])
     
     //判断是否显示该按钮

src/components/searchInput/index.module.scss

@@ -1,8 +1,8 @@
 
 .searchInput_main{
     display: flex;
-    align-items: center;
     min-height: 62px;
+    align-items: center;
     border-bottom: 1px solid #F0F0F0;
     .searchInput_title {
         min-width: 145px;
@@ -26,6 +26,9 @@
     .searchInput_con{
         flex:1;
         width: 100%;
+        display: flex;
+        width: 100%;
+        align-items: center;
         input{
             font-size: 26px;
         }

src/components/searchInput/index.tsx

@@ -12,7 +12,7 @@ type Params = {
     changeOnInput?: (string) => void,
     clickOnInput?: () => void,
     children?: ReactNode
-    height?: number,
+    height?: string,
     titleStyle?: Object,
     styleObj?: Object
 
@@ -28,7 +28,7 @@ export default memo((props: Params) => {
         showBorder = true,
         changeOnInput,
         clickOnInput,
-        height = 80,
+        height = '80rpx',
         titleStyle = {}
     } = props
 
@@ -39,11 +39,11 @@ export default memo((props: Params) => {
         return {}
     }, [showBorder])
     return (
-        <View className={styles.searchInput_main} style={{height: height + 'rpx', ...stylen,}}>
+        <View className={styles.searchInput_main} style={{height: height, ...stylen}}>
             {showTitle&&<View className={styles.searchInput_title} style={titleStyle}>{title}</View>}
             <View className={styles.searchInput_con}>
                 {!props.children&&<Input disabled={disabled} placeholder={placeholder} onClick={() => clickOnInput?.()} onInput={(e) => changeOnInput?.(e.detail.value)}/>
-                    ||<View>{props.children}</View>
+                    ||<>{props.children}</>
                 }
             </View>
             {showIcon&&<View className={`iconfont icon-jiantou ${styles.icon_more_self}`}></View>}