1

src/pages/order/index.tsx

@@ -226,7 +226,7 @@ import styles  from './index.module.scss'
                 <Remark onSave={(e) => getRemark(e)}/>
             </Popup>
             <Payment onSubmitSuccess={onPaySuccess} show={payMentShow} onClose={closePayShow} orderInfo={payOrderInfo} />
-            {/* <ApplyAfterSales/> */}
+            <ApplyAfterSales/>
             <View className="common_safe_area_y"></View>
         </View>
     )

src/pages/searchList/hightSearchList.tsx

@@ -108,6 +108,7 @@ export default () => {
 
     //获取筛选条件
     const getFiltr = (e) => {
+        setMaterialList(() => ({list:[], total:0}))
         const {data} = e
         setSearchField({
             ...searchField,  
@@ -123,7 +124,6 @@ export default () => {
     //筛选条件格式化
     const [selectList , setSelectList] = useState<ListProps[]>()
     const formatSelectList = (val = {data:{}, field:{}}) => {
-        console.log('data123::',val.data)
         let data:ListProps[] = []
         for(let key in val.data) {
             if(key !== 'seriesId'&& val.data[key] != '') {

src/pages/searchList/search.module.scss

@@ -1,11 +1,17 @@
 .main{
+    position: relative;
     .search{
         display: flex;
         justify-content: space-between;
         padding: 20px;
         padding-bottom: 50px;
     }
-    
+    .up_search{
+        color: $color_main;
+        font-size: $font_size;
+        position: absolute;
+        right: 20px;
+    }
     .hot {
         padding: 0 20px;
         .hot_header {
@@ -18,10 +24,9 @@
                 color: $color_font_one;
                 font-weight: 700;
             }
-            .hot_header_up{
-                color: $color_main;
-            }
+           
         }
+        
         .list{
             display: flex;
             font-size:  $font_size_medium;

src/pages/searchList/search.tsx

@@ -69,18 +69,18 @@ export default () => {
       <View className={styles.search}>
         <Search style={{width: '100%'}} placeholder="请输入面料关键词" placeIcon="out" showBtn={true} clickOnSearch={(e) => searchEvent(e)}/>
       </View>
-      <View className={styles.hot}>
+      <View className={styles.up_search} onClick={() => goLink('/pages/searchList/searchList')}>高级搜索</View>
+      {searchData?.hotField.length > 0 && <View className={styles.hot}>
         <View className={styles.hot_header}>
           <View className={styles.hot_header_title}>热门面料</View>
-          <View className={styles.hot_header_up} onClick={() => goLink('/pages/searchList/searchList')}>高级搜索</View>
         </View>
         <View className={styles.list}>
-          {searchData?.hotField?.map((item, index) => {
+          {searchData.hotField.map((item, index) => {
             return <View key={index} className={styles.item} onClick={() => searchEvent(item.search_key, false)}>{item.search_key}</View>
           })}
         </View>
-      </View>
-      <View className={styles.history}>
+      </View>}
+      {searchData?.historyField.length > 0 && <View className={styles.history}>
         <View className={styles.history_header}>
           <View className={styles.history_header_title}>历史搜索</View>
           <View className={classnames('iconfont icon-lajixiang', styles.miconfont)}></View>
@@ -88,7 +88,7 @@ export default () => {
         <View className={styles.list}>
           {searchData?.historyField?.map((item, index) => <View key={index} className={styles.item} onClick={() => searchEvent(item.search_key, false)}>{item.search_key}</View>)}
         </View>
-      </View>
+      </View>}
     </View>
   )
 }

src/pages/searchList/searchList.tsx

@@ -8,12 +8,10 @@ import SelectData, {ListProps} from "./components/selectData";
 import { goLink } from "@/common/common";
 import styles  from './searchList.module.scss'
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import useManualPullDownRefresh from "@/use/useManualPullDownRefresh";
 import {GetProductListApi} from "@/api/material"
 import Taro, { useDidShow, usePullDownRefresh, useRouter } from "@tarojs/taro";
 import { formatHashTag, formatImgUrl } from "@/common/fotmat";
 import { dataLoadingStatus, getFilterData } from "@/common/util";
-import LoadingCard from "@/components/loadingCard";
 import useLogin from "@/use/useLogin";
 
 export default () => {
@@ -95,6 +93,7 @@ export default () => {
     //获取筛选条件
     const getFiltr = (e) => {
         pageNum.current.page = 1
+        setMaterialList(() => ({list:[], total:0}))
         const {data} = e
         setSearchField({
             ...searchField,  
@@ -110,14 +109,12 @@ export default () => {
     //筛选条件格式化
     const [selectList , setSelectList] = useState<ListProps[]>()
     const formatSelectList = (val = {data:{}, field:{}}) => {
-        console.log('data123::',val.data)
         let data:ListProps[] = []
         for(let key in val.data) {
             if(key !== 'seriesId'&& val.data[key] != '') {
                 data.push({title:val.field[key], value:val.data[key]})
             }
         }
-        console.log('data::',data)
         setSelectList([...data])
     }
 
@@ -156,8 +153,8 @@ export default () => {
                 <View className={classnames(styles.list_num, scrollStatus&&styles.list_num_shadow)}>搜索结果 ({materialList.total}条记录)</View>
                 <View className={styles.scroll}>
                     <InfiniteScroll 
-                        selfonScrollToLower={() => getScrolltolower()} 
-                        selfOnScroll={(e) => onscroll(e)}
+                        selfonScrollToLower={getScrolltolower} 
+                        selfOnScroll={onscroll}
                         statusMore={statusMore}
                     >
                         <View className={styles.product_list}>