diff --git a/src/common/constant.js b/src/common/constant.js
index 76db424..dc069fb 100644
--- a/src/common/constant.js
+++ b/src/common/constant.js
@@ -6,11 +6,11 @@
 // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
 // export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
 // export const BASE_URL = `http://192.168.1.30:40001/lymarket` // 发
-export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
+// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
 // 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.4:40001/lymarket` // 王霞
-// export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
+export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
 
 // CDN
@@ -22,6 +22,7 @@ export const UPLOAD_CDN_URL = `https://v0.api.upyun.com/`
 export const IMG_CND_Prefix = CURRENT_ENV.includes('development')? "https://test.cdn.zzfzyc.com":"https://cdn.zzfzyc.com"
 
 
+
 // 上传图片视频
 export const CDN_UPLOAD_IMG = `${UPLOAD_CDN_URL || ''}`;
 
diff --git a/src/common/fotmat.js b/src/common/fotmat.js
index 2176a51..09b2d01 100644
--- a/src/common/fotmat.js
+++ b/src/common/fotmat.js
@@ -142,5 +142,22 @@ export const toDecimal2 = (x) => {
  * @returns 
  */
 export const formatImgUrl = (url, suffix="!w200") => {
-    return url?IMG_CND_Prefix + url + suffix:'https://cdn.zzfzyc.com/mall/no_img.png'
-}
\ No newline at end of file
+    return url?IMG_CND_Prefix + url + suffix:IMG_CND_Prefix +'/mall/no_img.png'
+}
+
+/**
+ * 
+ * @param {纹理图} imgurl 
+ * @param {rgb} rgb 
+ * @param {} suffix 
+ * @returns 1 有纹理图，2 有rgb 3默认图
+ */
+export const isLabImage = (imgurl, rgb, suffix="!w200") => {
+    if(imgurl) {
+        return {status:1, value:  IMG_CND_Prefix+'/'+imgurl+suffix}
+    } else if(rgb.r != 0 || rgb.g != 0 || rgb.b != 0) {
+        return {status:2, value: rgb}
+    } else {
+        return {status:3, value: IMG_CND_Prefix+'/mall/no_img.png'}
+    }
+}
diff --git a/src/components/search/index.tsx b/src/components/search/index.tsx
index 9c2191b..294aec5 100644
--- a/src/components/search/index.tsx
+++ b/src/components/search/index.tsx
@@ -71,12 +71,12 @@ export default memo(forwardRef(({
             <View className={styles.search_main} >
                 <View className={styles.search_con}>
                     {showIcon&&<View className={classnames('iconfont', 'icon-sousuo', styles.icon_a_sousuo1_self, placeIcon=='inner'?styles.icon_inner:styles.icon_out)}></View>}
-                    <Input placeholderStyle='color:#ABABAB; font-size:26rpx' className={classnames(placeIcon=='out'&&styles.input_out)} disabled={disabled} value={inputCon} placeholder={placeholder} onInput={(e) => onInputEven(e)}></Input>
+                    <Input placeholderStyle='color:#ABABAB; font-size:26rpx' onConfirm={onSearch} className={classnames(placeIcon=='out'&&styles.input_out)} disabled={disabled} value={inputCon} placeholder={placeholder} onInput={(e) => onInputEven(e)}></Input>
                     {!!inputCon&&<View className={styles.search_closeBtn}>
                         <CloseBtn onClose={() => clearInput()} styleObj={{width: '20rpx', height:'20rpx', backgroundColor:'#fff', border:'0'}}/>
                     </View>}
                 </View>
-                {showBtn&&<View style={btnStyle} className={styles.btn} onClick = {() => onSearch()}>{btnTitle}</View>}
+                {showBtn&&<View style={btnStyle} className={styles.btn} onClick = {onSearch}>{btnTitle}</View>}
             </View>
         </>
     )
diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx
index 3c0304f..060dc54 100644
--- a/src/pages/order/index.tsx
+++ b/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>
     )
diff --git a/src/pages/searchList/hightSearchList.tsx b/src/pages/searchList/hightSearchList.tsx
index f7d31db..ffc8dcc 100644
--- a/src/pages/searchList/hightSearchList.tsx
+++ b/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] != '') {
diff --git a/src/pages/searchList/search.module.scss b/src/pages/searchList/search.module.scss
index 2e4ede6..f31b47a 100644
--- a/src/pages/searchList/search.module.scss
+++ b/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;
diff --git a/src/pages/searchList/search.tsx b/src/pages/searchList/search.tsx
index 7505bcd..756bd77 100644
--- a/src/pages/searchList/search.tsx
+++ b/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>
   )
 }
diff --git a/src/pages/searchList/searchList.tsx b/src/pages/searchList/searchList.tsx
index 7acb9fe..5ae921c 100644
--- a/src/pages/searchList/searchList.tsx
+++ b/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}>
diff --git a/src/use/useLogin.ts b/src/use/useLogin.ts
index c06e543..a7950fa 100644
--- a/src/use/useLogin.ts
+++ b/src/use/useLogin.ts
@@ -79,6 +79,7 @@ export default () => {
                         reslove(user_res.data)
                         getAdminUserInfo()
                     } else {
+                        console.log('aaa:::',user_res.msg)
                         reject(user_res.msg)
                     }
                 },