商城测试版v8

src/pages/collection/collectionClass/index.tsx

@@ -30,9 +30,9 @@ export default () => {
   }
 
   //获取搜索数据
-  const [searchData, setSearchData] = useState({id:0, key: ''})
+  const [searchData, setSearchData] = useState({id:0, code_or_name: ''})
   const onSearch = useCallback((e) => {
-    setSearchData(() => e)
+    setSearchData((val) => ({...val, code_or_name: e}))
   }, [])
   useEffect(() => {
     let id = router.params.id || 0
@@ -89,11 +89,12 @@ export default () => {
 
   //移动面料
   const {fetchData: fetchDataMoveFavoriteProduct} = MoveFavoriteProductApi()
-  const onAdd = async () => {
+  const onAdd = async (val) => {
     if(ids.length == 0) return alert.none('请选择要移动面料')
-    let res = await fetchDataMoveFavoriteProduct({favorite_id: searchData.id, product_id:ids})
+    let res = await fetchDataMoveFavoriteProduct({source_favorite_id: searchData.id ,target_favorite_id: val.id, product_id:ids})
     if(res.success) {
       getFavoriteInfo()
+      setCollectionShow(false)
       alert.success('修改成功')
     }
   }
@@ -102,11 +103,19 @@ export default () => {
   const {fetchData: delFavoriteProductFetchData} = DelFavoriteProductApi()
   const delCollectioin = async () => {
     if(ids.length == 0) return alert.none('请选择要取消面料')
-    let res = await delFavoriteProductFetchData({favorite_id: searchData.id, product_id:ids})
-    if(res.success) {
-      getFavoriteInfo()
-      alert.none('已取消收藏')
+    let showModalRes = await Taro.showModal({
+        title: '是否要取消收藏',
+        confirmText: '是',
+        cancelText: '否',
+    })
+    if(showModalRes.confirm) {
+      let res = await delFavoriteProductFetchData({favorite_id: searchData.id, product_id:ids})
+      if(res.success) {
+        getFavoriteInfo()
+        alert.none('已取消收藏')
+      }
     }
+    
   }
 
   return (

src/pages/collection/components/createPopup/index.tsx

@@ -45,7 +45,7 @@ export default memo(({show = false, onClose, onSuccess, defaultValue}: ReasonInf
                 <View className={styles.title_item}>
                     <View className={styles.title}>名称</View>
                     <View className={styles.select}>
-                        <Input placeholder="请输入文件夹名称" className={styles.input} onInput={changeInput} value={defaultValue?.name}/>
+                        <Input placeholder="请输入文件夹名称" className={styles.input} cursorSpacing={150} onInput={changeInput} value={defaultValue?.name} />
                     </View>
                 </View>
                 <View className={styles.desc_item}>