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

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -61,23 +61,25 @@ export default (props) => {
     });
   };
   const PayAction =
-    kkp == '1' ? null :
-      sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> :
-        item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> :
-          item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> :
-            item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> :
-              item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> :
-                item.status === 9 ? <Action.Image image={Null} /> :
-                  item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> :
-                    item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null
+    kkp == '1' ? null ://空卡片用于售后详情页面
+      sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> ://售后页面卡片
+        item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> ://待支付
+          item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> ://待核销
+            item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> ://已退费
+              item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> ://已取消
+                item.status === 9 ? <Action.Image image={Null} /> ://已过期
+                  item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
+                    item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
 
 
   return (
     <>
       {
+        //售后和售后详情页面不显示订单编号
         sh != '1' || kkp != '1' ? <view className='OrderNumber'>订单编号：{item.orderId}</view> : null
       }
       {
+        //待支付可以左滑删除
         item.status === 0 ? <SlideView del onDelete={() => handeDelete(item)} >
           <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })}} action={PayAction}>
             <CouponMedia>

src/components/CompoentsOrder/complete/index.jsx

@@ -19,7 +19,6 @@ const dict = {
 export default (props) => {
   const { type } = props;
   const [list, setList] = useState([]);
-  const [IsPull, setPull] = useState(false);
   const [pageNum, setNumber] = useState({ pageNum: 1 });
   const [HasNextPage, setHasNextPage] = useState(true);
   const [loading, setLoading] = useState(false)
@@ -40,14 +39,12 @@ export default (props) => {
     getOrderSub({
       ...pageNum,
       pageSize: 10,
-      isVerified: '',
       ...(type !== undefined ? dict[type] : null),
     }).then((res) => {
       setList(
         pageNum === 1 ? res.records || [] : list.concat(res.records || [])
       );
       setHasNextPage(res.current < res.pages);
-      setPull(false);
       setLoading(false)
 
     }).catch(e => {
@@ -68,17 +65,6 @@ export default (props) => {
   const onClose = () => {
     setShowCutover(false)
   }
-
-  useEffect(() => {
-    // 下拉刷新触发
-    if (IsPull) {
-      if (pageNum.pageNum === 1) {
-        getList();
-      } else {
-        setNumber(1);
-      }
-    }
-  }, [IsPull]);
   const [ite, setItem] = useState({})
   const show = (val) => {
     setItem(val)
@@ -89,7 +75,13 @@ export default (props) => {
         title: '删除订单成功',
         icon: 'none',
       })
-      getList();
+      getOrderSub({
+        ...pageNum,
+        pageSize: 10,
+        ...(type !== undefined ? dict[type] : null),
+      }).then((res) => {
+        setList(res.records || [])
+      })
     })
   }