Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into dev

src/common/constant.ts

@@ -1,11 +1,11 @@
-export const BASE_URL = CURRENT_BASE_URL
+// export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = `http://192.168.0.75:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:50001/lymarket`
 // export const BASE_URL = `http://10.0.0.5:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:40001/lymarket`
 // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
 // export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
-// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
+export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发

src/components/addCollection/index.tsx

@@ -1,4 +1,5 @@
 import { Input, ScrollView, Text, View } from '@tarojs/components'
+import { useDidShow } from '@tarojs/taro'
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import classnames from 'classnames'
 import IconFont from '../iconfont/iconfont'
@@ -27,6 +28,11 @@ const AddCollection = (props: AddCollectionParam) => {
     const res = await fetchDataList(getFilterData())
     setList(() => res.data.list)
   }
+  useDidShow(() => {
+    if (show) {
+      getFavoriteList()
+    }
+  })
   useEffect(() => {
     if (show) { getFavoriteList() }
   }, [show])

src/pages/details/components/feature/index.tsx

@@ -31,9 +31,9 @@ const FeaturePopup = (param: Props) => {
 
     const res = await fetchData({ product_id: productIds })
     if (res.data) {
+      Taro.hideLoading()
       setnodes(res.data.instructions)
       setlist([...res.data.product_list])
-      Taro.hideLoading()
     }
     else {
       Taro.hideLoading()
@@ -50,7 +50,7 @@ const FeaturePopup = (param: Props) => {
     <Popup showTitle={false} show={param.showPopup} onClose={() => param.closePopup?.()}>
       <ScrollView scrollY className={styles.sollBox}>
         <View className={styles.main}>
-          <View className={styles.title}>{param.productName}</View>
+          <View className={styles.title}>{param?.productName}</View>
           <View className={styles.line}></View>
           <RichText nodes={nodes}></RichText>
           <View className={styles.topFont}>推荐面料</View>

src/pages/searchList/search.tsx

@@ -141,20 +141,30 @@ export default () => {
   // 删除历史搜索
   const { fetchData: deleteFetch } = mallsearchHistorydelete()
   const handDelete = async() => {
-    const res = await deleteFetch()
-    Taro.showLoading({
-      title: '请稍等...',
+    Taro.showModal({
+      title: '确定删除历史搜索记录吗？',
+      async success(res) {
+        if (res.confirm) {
+          const resrult = await deleteFetch()
+          if (resrult) {
+            Taro.showLoading({
+              title: '请稍等...',
+            })
+            alert.success('删除成功')
+            getSearchHistory()
+            setSearchData(val => ({ ...val, showIndex: 1 }))
+            Taro.hideLoading()
+          }
+          else {
+            alert.error('删除失败')
+            Taro.hideLoading()
+          }
+        }
+        else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      },
     })
-    if (res) {
-      alert.success('删除成功')
-      getSearchHistory()
-      setSearchData(val => ({ ...val, showIndex: 1 }))
-      Taro.hideLoading()
-    }
-    else {
-      alert.error('删除失败')
-      Taro.hideLoading()
-    }
   }
 
   return (