Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/CompoentsOrder/complete/index.jsx

@@ -28,7 +28,7 @@ export default (props) => {
   })
 
   useEffect(() => {
-    if (pageNum) {
+    if (pageNum.pageNum) {
       getList();
     }
   }, [pageNum]);
@@ -39,14 +39,12 @@ export default (props) => {
     getOrderSub({
       ...pageNum,
       pageSize: 10,
-      ...(type !== undefined ? dict[type] : null),
+      isVerified: '',
+      ...(type !== undefined ? dict[type] : {}),
     }).then((res) => {
-      if (pageNum === 1) {
-        setList(res.records || [])
-      } else {
-        setList(res.records || [])
-      }
-
+      setList(
+        pageNum.pageNum === 1 ? res.records || [] : list.concat(res.records || [])
+      );
       setHasNextPage(res.current < res.pages);
       setLoading(false)
 
@@ -78,13 +76,7 @@ export default (props) => {
         title: '删除订单成功',
         icon: 'none',
       })
-      getOrderSub({
-        ...pageNum,
-        pageSize: 10,
-        ...(type !== undefined ? dict[type] : null),
-      }).then((res) => {
-        setList(res.records || [])
-      })
+      setNumber({ pageNum: 1 })
     })
   }