🌈 style:订单页搜索合成一个

src/pages/order/index.tsx

@@ -22,14 +22,24 @@ import {
 } from '@/api/order'
 import PayPopup from './components/PayPopup'
 import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
+interface filterObj {
+  purchaser_id?: string | number,
+  clientName?: string,
+  sale_user_id?: string | number,
+  saleuserName?: string,
+  order_no?: string | undefined,
+  sale_mode?: Number | undefined,
+  shipment_mode?: Number | undefined
+}
+
 
 export default () => {
   //页码和页数
-  const [searchField, setSearchField] = useState<{ status: number | unknown; page: number; size: number; name: string }>({
+  const [searchField, setSearchField] = useState<{ status: number | unknown; page: number; size: number; order_no: string }>({
     status: -1,
     page: 1,
     size: 10,
-    name: '',
+    order_no: '',
   })
 
   //获取订单列表
@@ -88,8 +98,6 @@ export default () => {
   const changeStatus = useCallback((e) => {
     pageNum.current.page = 1
     setSearchField((value) => ({ ...value, status: e, size: 10 }))
-
-    console.log(e, '123123')
     setOrderData(() => ({ list: [], total: 0 }))
   }, [])
 
@@ -97,7 +105,7 @@ export default () => {
   const getSearchData = useCallback((e) => {
     pageNum.current.page = 1
     setOrderData(() => ({ list: [], total: 0 }))
-    setSearchField((val) => ({ ...val, name: e, size: 10 }))
+    setSearchField((val) => ({ ...val, order_no: e, size: 10 }))
   }, [])
   //筛选内容展示
   const [showPopup, setshowPopup] = useState(false)
@@ -126,15 +134,7 @@ export default () => {
     }))
   })
 
-  interface filterObj {
-    purchaser_id?: string | number,
-    clientName?: string,
-    sale_user_id?: string | number,
-    saleuserName?: string,
-    orderNo?: string | undefined,
-    sale_mode?: Number | undefined,
-    shipment_mode?: Number | undefined
-  }
+
 
   //筛选参数
   const [searchObj, setsearchObj] = useState<filterObj>({
@@ -142,7 +142,7 @@ export default () => {
     clientName: '',
     sale_user_id: '',
     saleuserName: '',
-    orderNo: '',
+    // order_no: '',
     sale_mode: undefined,
     shipment_mode: undefined
   })
@@ -158,10 +158,10 @@ export default () => {
       })
     }
   }
-  //订单号输入框
-  const handInput = (eq) => {
-    setsearchObj((e) => ({ ...e, orderNo: eq.detail.value }))
-  }
+  // //订单号输入框
+  // const handInput = (eq) => {
+  //   setsearchObj((e) => ({ ...e, order_no: eq.detail.value }))
+  // }
 
   //订单类型
   const [modeList, setModeList] = useState<any[]>([{ id: -1, name: '不限' }, { id: 0, name: '大货' }, { id: 1, name: '剪版' }, { id: 2, name: '散剪' }])
@@ -197,7 +197,6 @@ export default () => {
   //是否不允许确认筛选
   const isDisabled = useMemo(() => {
     if (searchObj.clientName !== '' ||
-      searchObj.orderNo !== '' ||
       searchObj.saleuserName !== '' ||
       searchObj.sale_mode !== undefined ||
       searchObj.shipment_mode !== undefined
@@ -210,15 +209,16 @@ export default () => {
 
   //重置
   const handReset = () => {
+    pageNum.current.page = 1
     setsearchObj({
       purchaser_id: '',
       clientName: '',
       sale_user_id: '',
       saleuserName: '',
-      orderNo: '',
       sale_mode: undefined,
-      shipment_mode: undefined
+      shipment_mode: undefined,
     })
+    setSearchField({ ...searchField, size: 10 })
     const arrOne = resetArr(modeList)
     setModeList([...arrOne])
     const arrTwo = resetArr(deliveryList)
@@ -242,7 +242,8 @@ export default () => {
   const handScan = () => {
     Taro.scanCode({
       success(res) {
-        setsearchObj((e) => ({ ...e, orderNo: res.result }))
+        // setsearchObj((e) => ({ ...e, order_no: res.result }))
+        setSearchField({ ...searchField, order_no: res.result })
       },
       fail(res) {
         console.log(res);
@@ -594,7 +595,7 @@ export default () => {
   return (
     <View>
       <View style={{ background: '#FFFFFF', paddingLeft: '20rpx', paddingBottom: '20rpx', position: 'sticky', top: '0', zIndex: '99' }}>
-        <Search placeholder='搜索商品/名称/颜色/订单号' showBtn={false} changeOnSearch={getSearchData} debounceTime={300}>
+        <Search handScan={() => handScan()} showScan placeholder='搜索商品/名称/颜色/订单号' showBtn={false} changeOnSearch={getSearchData} debounceTime={300}>
           <View className={styles.flexBox} onClick={() => showSelctPopup()}>
             <View className={classnames('iconfont', 'icon-shaixuan', !isDisabled ? styles.icon_shaixuan : styles.activeshaixuan)}></View>
             <View className={classnames(isDisabled ? styles.shaixuan : styles.activeshai)}>筛选</View>
@@ -644,24 +645,6 @@ export default () => {
               </View>
             </View>
           </View>
-          <View className={styles.secondBox}>
-            <View className={styles.secondTopfont}>订单单号</View>
-            <View className={styles.inputBox}>
-              <Input
-                onInput={(e) => {
-                  handInput(e)
-                }}
-                placeholderStyle='color:#000000; font-size:26rpx'
-                className={styles.orderInput}
-                value={searchObj.orderNo}
-                placeholder={'请输入或扫描条形码'}></Input>
-              <View
-                className={classnames('iconfont', 'icon-saomiao', styles.saomiao)}
-                onClick={() => {
-                  handScan()
-                }}></View>
-            </View>
-          </View>
           <View className={styles.thirdBox}>
             <View className={styles.thirdTopfont}>订单类型</View>
             <View className={styles.flexModebox}>