✨ feat:状态按钮重新对接完成进度20%

src/pages/applyGoods/index.tsx

@@ -25,16 +25,23 @@ export default () => {
     const [ListArr, setListArr] = useState<any[]>([])
     //获取订单详情
     const getDetail = async () => {
-        const res = await infoFetch({ id: router.params.orderId })
-        res.data.av_return_product.forEach(item => {
-            item.av_product_color.map(it => {
-                it.isTui = false
-                it.nums = 1
-            })
-            return item
+        Taro.showLoading({
+            title: '请稍等...',
+            mask: true
         })
-        setListArr(res.data.av_return_product)
-        setInfoObj(res.data)
+        const res = await infoFetch({ id: router.params.orderId })
+        if (res.data) {
+            res.data.av_return_product.forEach(item => {
+                item.av_product_color.map(it => {
+                    it.isTui = false
+                    it.nums = 1
+                })
+                return item
+            })
+            setListArr(res.data.av_return_product)
+            setInfoObj(res.data)
+            Taro.hideLoading()
+        }
     }
 
     //点击退货
@@ -176,9 +183,10 @@ export default () => {
 
     //判断是否允许提交
     const isDisabled = useMemo(() => {
+        console.log(Query, 8888)
         if (Query.GoodStatus !== '' &&
             Query.return_explain !== '' &&
-            totalNums !== 0 &&
+            totalNums > 0 &&
             Query.GoodStatus !== ''
         ) {
             return false
@@ -236,7 +244,8 @@ export default () => {
         })
         setReasonListTwo([...ReasonListTwo])
         // queryRef.current.reasonNameTwo = item.name
-        setQuery({ return_explain: item.id })
+        setQuery((val) => ({ ...val, return_explain: item.id }))
+
         // queryRef.current.return_explain = item.id
     }
 
@@ -265,10 +274,10 @@ export default () => {
 
     //判断选择原因
     const selectIsDisabled = useMemo(() => {
-        if (Query.return_explain == '') {
-            return true
-        } else {
+        if (Query.return_explain !== '') {
             return false
+        } else {
+            return true
         }
     }, [Query])
 
@@ -362,12 +371,15 @@ export default () => {
         const arr: any = [];
         ListArr.forEach((item) => {
             item.av_product_color.forEach((it) => {
-                arr.push({
-                    product_color_id: it.sale_mode == 0 ? it.product_color_id : '',
-                    product_id: it.sale_mode == 0 ? it.product_id : '',
-                    product_roll: it.sale_mode == 0 ? it.nums : 0,
-                    sale_order_detail_id: it.sale_order_detail_id,
-                });
+                if (it.isTui) {
+                    arr.push({
+                        product_color_id: it.sale_mode == 0 ? it.product_color_id : '',
+                        product_id: it.sale_mode == 0 ? it.product_id : '',
+                        product_roll: it.sale_mode == 0 ? it.nums : 0,
+                        sale_order_detail_id: it.sale_order_detail_id,
+                    });
+                }
+
             });
         });
         const query = {
@@ -380,6 +392,7 @@ export default () => {
             roll_list: arr,
             sale_order_id: Number(infoObj.id),
         }
+
         Taro.showModal({
             content: "确认退货吗？",
             confirmText: "确认",
@@ -409,7 +422,9 @@ export default () => {
             }
         })
     }
-
+    useEffect(() => {
+        setQuery(Query)
+    }, [Query])
 
     //备注信息
     const [TextareaValue, setTextareaValue] = useState('')
@@ -471,7 +486,6 @@ export default () => {
                         value={TextareaValue}
                         // style='background:#f6f6f6;height:210px;padding:15rpx 24rpx 24rpx 24rpx;border-radius: 8rpx;'
                         placeholderStyle='font-size: 28rpx;font-weight: 400;'
-                        autoFocus
                         placeholder={'选填/退货说明中选择时（其他问题）必填'}
                     ></Textarea>
                 </View>