fix

src/components/CompoentsOrder/complete/index.jsx

@@ -76,13 +76,16 @@ export default (props) => {
 
   //核销
   const onWriteOff = (item) => {
+    // Taro.navigateTo({
+    //   url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}&subOrderId=${item.subOrderId}`,
+    // });
     Taro.scanCode({
       onlyFromCamera: true,
       success: (res) => {
         console.log(res,'-------------')
         if (res.path) {
           Taro.navigateTo({
-            url: `/${res.path}&validPackage=${item.packageId}`,
+            url: `/${res.path}&subOrderId=${item.subOrderId}`,
           });
         } else {
           Taro.showToast({

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

@@ -1,109 +1,187 @@
-import BlackSpot from '@/assets/icons/GuideCheck/BlackSpot.png'
-import Taro from '@tarojs/taro'
-import { Button, Icon, Text, Textarea } from '@tarojs/components'
+import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
+import Taro from "@tarojs/taro";
+import { Button, Icon, Text, Textarea } from "@tarojs/components";
 
-import { useState } from 'react'
-import withLayout from '@/layouts'
+import { useState,useEffect } from "react";
+import withLayout from "@/layouts";
+import { getOrderSub } from "@/services/payOrder";
+import image from "@/assets/icons/ProCard/8kb.jpg";
+import food from "@/assets/icons/ProCard/food.png";
+import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
+import CustomNav from "@/components/CustomNav";
+import "./style.less";
+import formatTime from "@/utils/formatTime";
 
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import CustomNav from '@/components/CustomNav'
-import './style.less'
 
 export default withLayout((props) => {
-  const [view, setView] = useState(true)
-  const [view2, setView2] = useState(false)
-  const [view3, setView3] = useState(false)
-  const [view4, setView4] = useState(false)
-  const [view5, setView5] = useState(false)
-  const [view6, setView6] = useState(false)
-  const { router, person } = props
-
-  let value = view
-  let list = [
-    {
-      className: `Refund-star-view4 ${!value ? 'bg2' : 'Refund-star-view2'}`,
-      name: '预约不上',
-      value: false,
-    }
-  ]
+  const { router, person } = props;
+  const { id } = props.router.params;
+  const [view, setView] = useState(true);
+  const [view2, setView2] = useState(false);
+  const [view3, setView3] = useState(false);
+  const [view4, setView4] = useState(false);
+  const [view5, setView5] = useState(false);
+  const [view6, setView6] = useState(false);
+
+  const [list, setList] = useState([]);
+    // 总价 totalPrice
+    const [totalPrice, setTotalPrice] = useState({});
+
+  const getData = (orderId) => {
+    Taro.showLoading();
+    getOrderSub({
+      pageNum: 1,
+      pageSize: 50,
+      orderId: orderId,
+    }).then((res) => {
+      setList(res.records);
+      Taro.hideLoading();
+    });
+  };
+
+  useEffect(() => {
+    getData(id);
+  }, []);
 
   const viewOK = () => {
-    setView(!view)
-  }
+    setView(!view);
+  };
 
   const view2OK = () => {
-    setView2(!view2)
-  }
+    setView2(!view2);
+  };
 
   const view3OK = () => {
-    setView3(!view3)
-  }
+    setView3(!view3);
+  };
 
   const view4OK = () => {
-    setView4(!view4)
-  }
+    setView4(!view4);
+  };
   const view5OK = () => {
-    setView5(!view5)
-  }
+    setView5(!view5);
+  };
 
   const view6OK = () => {
-    setView6(!view6)
-  }
-
-
+    setView6(!view6);
+  };
+
+  useEffect(() => {
+    let total = {
+      cashback: 0, //已获返现
+      charges: 0, //实付金额
+      refundPrice: 0, //退款金额
+    };
+    list.map((x) => {
+      total.cashback += x.cashback ;
+      total.charges += x.charges;
+      total.refundPrice += x.charges - x.cashback;
+    });
+    setTotalPrice(total);
+  }, [list]);
 
   return (
-
-    <view className='box-content'>
-      <CustomNav title='售后退款' />
-      <view className='Refund-Content-box'>
-        <view className='title-image'>
-          <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
-          <text className='title-title-boss' >商品信息</text>
+    <view className="box-content">
+      <CustomNav title="售后退款" />
+      <view className="Refund-Content-box">
+        <view className="title-image">
+          <image
+            mode="scaleToFill"
+            className="title-image-cup"
+            src={BlackSpot}
+          />
+          <text className="title-title-boss">商品信息</text>
         </view>
       </view>
       {/* 商品信息结束 */}
-      <view class='wrapper'>
-        <view class='left-complete-one'>
-          <image className='left-image-1' src={ProCard_hot}></image>
-          <view className='left-viewText'>
-            返现￥16.00
-          </view>
-          <view className='title-image'>
-            <image className='image-1' mode='scaleToFill' src={image}></image>
-            <image className='image-2' src={food}></image>
-          </view>
-          <view className='title-content'>
-            <view className='Pro-title'>
-              <view className='title-text'>【米啊糯】新街口店 <text className='title-money-2' >数量：1张</text></view>
-
+      <view>
+        {list?.map((item) => {
+          return (
+            <view class="wrapper" key={item.orderId}>
+              <view class="left-complete-one">
+                <image className="left-image-1" src={ProCard_hot}></image>
+                <view className="left-viewText">返现￥{item.cashback/100}</view>
+                <view className="title-image">
+                  <image
+                    className="image-1"
+                    mode="scaleToFill"
+                    src={item.poster}
+                  ></image>
+                  <image className="image-2" src={food}></image>
+                </view>
+                <view className="title-content">
+                  <view className="Pro-title">
+                    <view className="title-text">
+                      {item.packageDescription}
+                      <text className="title-money-2">数量：{item.amount}张</text>
+                    </view>
+                  </view>
+                  <text className="title-money">
+                    ￥{item.unitPrice/100}元<text className="title-money-2">门市价{item.standardPrice/100}元</text>
+                  </text>
+                  <view className="title-time">
+                    有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
+                        {formatTime(item.endTime, "yyyy/MM/dd")}
+                  </view>
+                </view>
+              </view>
+              <view class="right-complete-two">
+                <view className="right-content"></view>
+              </view>
             </view>
-            <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-            <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
-          </view>
-        </view>
-        <view class='right-complete-two'>
-          <view className='right-content'>
-          </view>
-        </view>
+          );
+        })}
       </view>
+
       {/* 卡片结束 */}
-      <view className='Refund-Content-box'>
-        <view className='title-image'>
-          <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
-          <text className='title-title-boss' >退款原因</text>
+      <view className="Refund-Content-box">
+        <view className="title-image">
+          <image
+            mode="scaleToFill"
+            className="title-image-cup"
+            src={BlackSpot}
+          />
+          <text className="title-title-boss">退款原因</text>
         </view>
         {/* 退款结束 */}
       </view>
-      <view className='Refund-content'>
-        <text className={`Refund-star-view ${view ? 'bg2' : 'Refund-star-view'}`} onClick={() => viewOK()} >计划有变,没时间消费</text>
-        <text className={`Refund-star-view2 ${view2 ? 'bg2' : 'Refund-star-view2'}`} onClick={() => view2OK()}  >误认为是外卖</text>
-        <text className={`Refund-star-view3 ${view3 ? 'bg2' : 'Refund-star-view3'}`} onClick={() => view3OK()} >没看清楚使用规则,要用时才发现限制很多</text>
-        <text className={`Refund-star-view4 ${view4 ? 'bg2' : 'Refund-star-view4'}`} onClick={() => view4OK()} >预约不上</text>
-        <text className={`Refund-star-view5 ${view5 ? 'bg2' : 'Refund-star-view5'}`} onClick={() => view5OK()} >店里更优惠</text>
-        <text className={`Refund-star-view6 ${view6 ? 'bg2' : 'Refund-star-view6'}`} onClick={() => view6OK()} >网友/朋友评价不好</text>
+      <view className="Refund-content">
+        <text
+          className={`Refund-star-view ${view ? "bg2" : "Refund-star-view"}`}
+          onClick={() => viewOK()}
+        >
+          计划有变,没时间消费
+        </text>
+        <text
+          className={`Refund-star-view2 ${view2 ? "bg2" : "Refund-star-view2"}`}
+          onClick={() => view2OK()}
+        >
+          误认为是外卖
+        </text>
+        <text
+          className={`Refund-star-view3 ${view3 ? "bg2" : "Refund-star-view3"}`}
+          onClick={() => view3OK()}
+        >
+          没看清楚使用规则,要用时才发现限制很多
+        </text>
+        <text
+          className={`Refund-star-view4 ${view4 ? "bg2" : "Refund-star-view4"}`}
+          onClick={() => view4OK()}
+        >
+          预约不上
+        </text>
+        <text
+          className={`Refund-star-view5 ${view5 ? "bg2" : "Refund-star-view5"}`}
+          onClick={() => view5OK()}
+        >
+          店里更优惠
+        </text>
+        <text
+          className={`Refund-star-view6 ${view6 ? "bg2" : "Refund-star-view6"}`}
+          onClick={() => view6OK()}
+        >
+          网友/朋友评价不好
+        </text>
         {/* 
         <view>
           {
@@ -117,34 +195,46 @@ export default withLayout((props) => {
         </view> */}
       </view>
 
-      <view className='Refund-Content-box'>
-        <view className='title-image'>
-          <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
-          <text className='title-title-boss' >退款说明</text>
+      <view className="Refund-Content-box">
+        <view className="title-image">
+          <image
+            mode="scaleToFill"
+            className="title-image-cup"
+            src={BlackSpot}
+          />
+          <text className="title-title-boss">退款说明</text>
         </view>
       </view>
-      <view class='section'>
-        <Textarea placeholder='请补充退款说明（选填）!' confirm-type='done' />
+      <view class="section">
+        <Textarea placeholder="请补充退款说明（选填）!" confirm-type="done" />
+      </view>
+      <view className="money-title">
+        实付金额: <text className="money-name">{totalPrice.charges/100}元</text>
+      </view>
+      <view className="money-title">
+        已获返现: <text className="money-name">{totalPrice.cashback/100}元</text>
+      </view>
+      <view className="money-title">
+        退款金额: <text className="money-name">{totalPrice.refundPrice/100}元</text>
       </view>
-      <view className='money-title' >实付金额: <text className='money-name' >58元</text></view>
-      <view className='money-title' >已获返现: <text className='money-name' >1.88元</text></view>
-      <view className='money-title' >退款金额: <text className='money-name' >56.12元</text></view>
-      <view className='ul-li-text'>
-        <view className='ul-li-view' ></view>
-        <text className='ul-li-textname'>退款金额不可修改</text>
+      <view className="ul-li-text">
+        <view className="ul-li-view"></view>
+        <text className="ul-li-textname">退款金额不可修改</text>
       </view>
-      <view className='ul-li-text'>
-        <view className='ul-li-view' ></view>
-        <text className='ul-li-textname'>下单获得返现金额，会在退款时被扣除；</text>
+      <view className="ul-li-text">
+        <view className="ul-li-view"></view>
+        <text className="ul-li-textname">
+          下单获得返现金额，会在退款时被扣除；
+        </text>
       </view>
-      <view className='ul-li-text'>
-        <view className='ul-li-view' ></view>
-        <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
+      <view className="ul-li-text">
+        <view className="ul-li-view"></view>
+        <text className="ul-li-textname">退款将在七个工作日内原路退还。</text>
       </view>
 
-      <view className='button-info'>
-        <Button className='button-box'>提交申请</Button>
+      <view className="button-info">
+        <Button className="button-box">提交申请</Button>
       </view>
     </view>
-  )
-})
+  );
+});

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -1,117 +1,152 @@
+import { useState, useEffect } from "react";
+import Taro from "@tarojs/taro";
+import image from "@/assets/icons/ProCard/8kb.jpg";
+import food from "@/assets/icons/ProCard/food.png";
+import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
+import withLayout from "@/layouts";
 
-import { useState } from "react";
-import Taro from '@tarojs/taro'
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import withLayout from '@/layouts'
+import Null from "@/assets/icons/UserCenter/null_logo.png";
+import Refund from "@/assets/icons/UserCenter/Refund.png";
 
-import Null from '@/assets/icons/UserCenter/null_logo.png'
-import Refund from '@/assets/icons/UserCenter/Refund.png'
+import starOn from "@/assets/icons/GuideCheck/starOn.png";
+import starOff from "@/assets/icons/GuideCheck/starOff.png";
 
-import starOn from '@/assets/icons/GuideCheck/starOn.png'
-import starOff from '@/assets/icons/GuideCheck/starOff.png'
+import { getOrderSub } from "@/services/payOrder";
+import formatTime from '@/utils/formatTime'
+import CustomNav from "@/components/CustomNav";
+import "./style.less";
 
+const scoreList = new Array(5).fill(0);
+const score = "3.9";
+export default withLayout((props) => {
+  const { router, person } = props;
+  const [list, setList] = useState([]);
+  const [IsPull, setPull] = useState(false);
+  const [pageNum, setNumber] = useState(1);
+  const [HasNextPage, setHasNextPage] = useState(true);
 
+  const getList = () => {
+    setHasNextPage(false);
+    getOrderSub({
+      pageNum,
+      pageSize: 10,
+      status: 1,
+      isVerified: 0,
+    }).then((res) => {
+      setList(
+        pageNum === 1 ? res.records || [] : list.concat(res.records || [])
+      );
+      setHasNextPage(res.current < res.pages);
+      setPull(false);
+    });
+  };
 
+  const handleRefund2 = (item) => {
+    Taro.navigateTo({
+      url: `/pages/MineUserAll/RefundMoney/CheckRefund/index?id=${item.orderId}`,
+    });
+  };
+  const pageRefresh = () => {
+    // 页面下拉刷新回调
+    setPull(true);
+  };
 
-import CustomNav from '@/components/CustomNav'
-import './style.less'
+  const pageLoadMore = () => {
+    // 页面上拉加载更多
+    if (HasNextPage) {
+      setNumber(pageNum + 1);
+    }
+  };
 
+  useEffect(() => {
+    // 下拉刷新触发
+    if (IsPull) {
+      if (pageNum === 1) {
+        getList();
+      } else {
+        setNumber(1);
+      }
+    }
+  }, [IsPull]);
 
-const scoreList = new Array(5).fill(0)
-const score = '3.9'
-export default withLayout((props) => {
-  const { router, person } = props
+  useEffect(() => {
+    getList();
+  }, [pageNum]);
 
-  const handleRefund2 = () => {
-    Taro.navigateTo({ url: '/pages/MineUserAll/RefundMoney/CheckRefund/index' })
-  }
   return (
-    <view className='box-content'>
-      <CustomNav title='售后退款' />
-      <view class='wrapper'>
-        <view class='left-complete-one'>
-          <image className='left-image-1' src={ProCard_hot}></image>
-          <view className='left-viewText'>
-            返现￥16.00
-          </view>
-          {/* 评分 */}
-          <view className='card-box-star'>
-            {
-              scoreList.map((_, index) => {
+    <view className="box-content">
+      <CustomNav title="售后退款" />
+      <scroll-view
+        scroll-y
+        style="height: calc(100vh - 176rpx);"
+        refresher-enabled
+        refresher-triggered={IsPull}
+        onrefresherrefresh={pageRefresh}
+        refresher-background="#fff"
+        onscrolltolower={pageLoadMore}
+      >
+        <view>
+          {list?.map((item) => {
+            return (
+              <view class="wrapper" key={item.orderId}>
+                <view class="left-complete-one">
+                  <image className="left-image-1" src={ProCard_hot}></image>
 
-                const src = (index + '0.1') < score ? starOn : starOff
-                return (
-                  <image className='card-star-image' key={index} src={src} />
-                )
-              })
-            }
-            <text className='card-star-text' >{score}</text>
-          </view>
-          <view className='title-image'>
-            <image className='image-1' mode='scaleToFill' src={image}></image>
-            <image className='image-2' src={food}></image>
-          </view>
-          <view className='title-content'>
-            <view className='Pro-title'>
-              <view className='title-text'>【米啊糯】新街口店 <text className='title-money-2' >数量：1张</text></view>
-            </view>
-            <text className='title-money' >￥6990元</text>
-            <view className='title-time' >有效期：2021/06/21  14:00</view>
-          </view>
-        </view>
-        <view class='right-complete-two' onClick={handleRefund2} >
-          <view className='right-content'>
-            <image className='right-image' src={Refund} />
-            <view className='right-title'>售后</view>
-          </view>
-        </view>
-      </view>
-      {/* 已核销 */}
-      <view class='wrapper'>
-        <view class='left-complete-one'>
-          <image className='left-image-1' src={ProCard_hot}></image>
-
-          <view className='left-viewText'>
-            返现￥16.00
-          </view>
-          {/* 评分 */}
-          <view className='card-box-star'>
-            {
-              scoreList.map((_, index) => {
-
-                const src = (index + '0.1') < score ? starOn : starOff
-                return (
-                  <image className='card-star-image' key={index} src={src} />
-                )
-              })
-            }
-            <text className='card-star-text' >{score}</text>
-          </view>
-          <view className='title-image'>
-            <image className='image-1' mode='scaleToFill' src={image}></image>
-            <image className='image-2' src={food}></image>
-          </view>
-          <view className='title-content'>
-            <view className='Pro-title'>
-              <view className='title-text'>【米啊糯】新街口店 <text className='title-money-2' >数量：1张</text></view>
-            </view>
-            <text className='title-money' >￥6990元</text>
-            <view className='title-time' >有效期：2021/06/21  14:00</view>
-          </view>
-        </view>
-        <view class='right-complete-two' onClick={handleRefund2} >
-          <view className='right-content'>
-            {/* <image className='right-image-two' src={Null} /> */}
-            <image className='right-image' src={Refund} />
-            <view className='right-title'>售后</view>
-          </view>
+                  <view className="left-viewText">
+                    返现￥{item.cashback / 100}
+                  </view>
+                  {/* 评分 */}
+                  <view className="card-box-star">
+                    {scoreList.map((_, index) => {
+                      const src = index + 1 < item.score ? starOn : starOff;
+                      return (
+                        <image
+                          className="card-star-image"
+                          key={index}
+                          src={src}
+                        />
+                      );
+                    })}
+                    <text className="card-star-text">
+                      {item.score?.toFixed(1)}
+                    </text>
+                  </view>
+                  <view className="title-image">
+                    <image
+                      className="image-1"
+                      mode="scaleToFill"
+                      src={item.poster}
+                    ></image>
+                    <image className="image-2" src={food}></image>
+                  </view>
+                  <view className="title-content">
+                    <view className="Pro-title">
+                      <view className="title-text">
+                        {item.packageDescription}
+                        <text className="title-money-2">
+                          数量：{item.amount}张
+                        </text>
+                      </view>
+                    </view>
+                    <text className="title-money">
+                      ￥{item.unitPrice / 100}元
+                    </text>
+                    <view className="title-time">有效期：{formatTime(item?.endTime, "yyyy/MM/dd")}</view>
+                  </view>
+                </view>
+                <view class="right-complete-two" onClick={()=>handleRefund2(item)}>
+                  <view className="right-content">
+                    {/* <image className='right-image-two' src={Null} /> */}
+                    <image className="right-image" src={Refund} />
+                    <view className="right-title">售后</view>
+                  </view>
+                </view>
+              </view>
+            );
+          })}
+          <view className="foot">已经到底了~</view>
         </view>
-      </view>
-      <view className='foot'>
-        已经到底了~
-      </view>
+      </scroll-view>
     </view>
-  )
-})
+  );
+});

src/pages/TobeShop/index.jsx

@@ -1,137 +1,188 @@
-import withLayout from '@/layouts'
-
-import CustomNav from "@/components/CustomNav"
-import Popup from '@/components/Popup'
-import { useState, useEffect } from 'react'
-import LocationBig from '@/assets/icons/UserCenter/LocationBig.png'
-import Perfection from '@/assets/icons/UserCenter/Perfection.png'
-import Check_OK from '@/assets/icons/UserCenter/Check_OK.png'
-import Check_NO from '@/assets/icons/UserCenter/Check_NO.png'
-import BlackSpot from '@/assets/icons/GuideCheck/BlackSpot.png'
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import { Button, Icon, Text, Textarea } from '@tarojs/components'
-import './style.less'
+import withLayout from "@/layouts";
 
+import CustomNav from "@/components/CustomNav";
+import Popup from "@/components/Popup";
+import { useState, useEffect } from "react";
+import LocationBig from "@/assets/icons/UserCenter/LocationBig.png";
+import Perfection from "@/assets/icons/UserCenter/Perfection.png";
+import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
+import Check_NO from "@/assets/icons/UserCenter/Check_NO.png";
+import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
+import image from "@/assets/icons/ProCard/8kb.jpg";
+import food from "@/assets/icons/ProCard/food.png";
+import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
+import { Button, Icon, Text, Textarea } from "@tarojs/components";
+import { getVerifyTargetList,putVerifyTarget } from "@/services/payOrder";
+import formatTime from '@/utils/formatTime'
+import "./style.less";
+import Taro from "@tarojs/taro";
 
 export default withLayout((props) => {
-  const { router, person } = props
-
-  const [showDialog, setShowDialog] = useState(false)
+  const { router, person } = props;
+  const { id, subOrderId } = props.router.params;
+  const [showDialog, setShowDialog] = useState(false);
   //核销
-  const [Consumption, setConsumption] = useState(false)
+  const [Consumption, setConsumption] = useState(false);
+
+  const [checked, setChecked] = useState();
+
+  
+
+  const [list, setList] = useState([]);
+
+  const getList = (params) => {
+    getVerifyTargetList({
+      shopId: id,
+      isMine: true,
+      isVerified: 0,
+      pageNum:1,
+      pageSize:50,
+    }).then((res) => {
+      if(res){
+        setList(res.records)
+        
+          setChecked(res?.records.filter(x=>x.subOrderId==subOrderId)[0].verifyNo)
+        
+        // if(item.verifyNo==checked)
+      }
+      
+    });
+  };
+
+  useEffect(() => {
+    getList();
+  }, []);
 
   const ShowMoldeOn = () => {
-    setShowDialog(true)
-  }
+    setShowDialog(true);
+  };
   const ButtonCancel = () => {
-    setShowDialog(false)
-  }
+    setShowDialog(false);
+  };
   const ButtonOK = (e) => {
+    if(!checked) return
     // setShowDialog(false)
     if (showDialog === true) {
-      setShowDialog(false)
-      setConsumption(true)
+      Taro.showLoading({
+        title:'核销中'
+      })
+    
+      putVerifyTarget(checked).then(res=>{
+        Taro.hideLoading()
+        setShowDialog(false);
+        setConsumption(true);
+      }).catch(e=>{
+        Taro.hideLoading()
+        setShowDialog(false);
+        Taro.showToast({
+          title: '核销失败',
+          icon: 'none',
+          duration: 2000
+        })
+      })
     }
-
-  }
+  };
 
   const PerfectionOK = () => {
-    setConsumption(false)
-  }
-
+    setConsumption(false);
+    if(list?.length>1){
+      getList()
+    }else{
+      Taro.navigateBack({delta: 1})
+    }
+  };
 
   return (
-    <view className='shop-Eat' >
-      <CustomNav title='到店核销' />
+    <view className="shop-Eat">
+      <CustomNav title="到店核销" />
       <Popup show={showDialog} maskClosable={false}>
-        <view className='Consumption-Now' >您即将核销1张套餐券！</view>
-        <text className='Consumption-text' >核销后套餐券不退不换</text>
-        <text className='Consumption-text' >请核对无误后再点击确认！</text>
-        <view className='buy-button-box' >
-          <button className='button-Cancel' onClick={ButtonCancel} >取消</button>
-          <button className='button-OK' onClick={ButtonOK} >确定</button>
+        <view className="Consumption-Now">您即将核销1张套餐券！</view>
+        <text className="Consumption-text">核销后套餐券不退不换</text>
+        <text className="Consumption-text">请核对无误后再点击确认！</text>
+        <view className="buy-button-box">
+          <button className="button-Cancel" onClick={ButtonCancel}>
+            取消
+          </button>
+          <button className="button-OK" onClick={ButtonOK}>
+            确定
+          </button>
         </view>
       </Popup>
       <Popup show={Consumption} maskClosable={false}>
-        <view className='Perfection-image-view' >
-          <image src={Perfection} className='Perfection-image' />
-
+        <view className="Perfection-image-view">
+          <image src={Perfection} className="Perfection-image" />
         </view>
         <text>核销完成！请与店铺确认！</text>
-        <view className='buy-button-box' >
-          <button className='button-OK' onClick={PerfectionOK} >完成</button>
+        <view className="buy-button-box">
+          <button className="button-OK" onClick={PerfectionOK}>
+            完成
+          </button>
         </view>
       </Popup>
-      <view className='position-header' >
-        <image className='position-LocationBig' src={LocationBig} />
-        <text cla='position-LocationBig-text'>当前所在店铺：SEOUL·创意韩国料理</text>
-      </view>
-      <view className='shop-image'>
-        <image mode='scaleToFill' className='shop-title-image-cup' src={BlackSpot} />
-        <text className='shop-title-title' >请选择你要核销的套餐</text>
-      </view>
-
-      {/* 卡片 */}
-      <view class='wrapper'>
-        <view class='left-complete-one'>
-          <view className='Check_OK-box' >
-            <image className='Check_OK-image' src={Check_OK} />
-          </view>
-          <image className='left-image-1' src={ProCard_hot}></image>
-          <view className='left-viewText'>
-            返现￥16.00
-          </view>
-          <view className='title-image'>
-            <image className='image-1' mode='scaleToFill' src={image}></image>
-            <image className='image-2' src={food}></image>
-          </view>
-          <view className='title-content'>
-            <view className='Pro-title'>
-              <view className='title-text'>【米啊糯】新街口店 <text className='title-money-2' >数量：1张</text></view>
-            </view>
-            <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-            <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
-          </view>
-        </view>
-        <view class='right-complete-two'>
-          <view className='right-content'>
-          </view>
+      <view>
+        <view className="position-header">
+          <image className="position-LocationBig" src={LocationBig} />
+          <text cla="position-LocationBig-text">
+            当前所在店铺：SEOUL·创意韩国料理
+          </text>
         </view>
-      </view>
-
-      <view class='wrapper'>
-        <view class='left-complete-one'>
-          <view className='Check_OK-box' >
-            <image className='Check_OK-image' src={Check_NO} />
-          </view>
-          <image className='left-image-1' src={ProCard_hot}></image>
-          <view className='left-viewText'>
-            返现￥16.00
-          </view>
-          <view className='title-image'>
-            <image className='image-1' mode='scaleToFill' src={image}></image>
-            <image className='image-2' src={food}></image>
-          </view>
-          <view className='title-content'>
-            <view className='Pro-title'>
-              <view className='title-text'>【米啊糯】新街口店 <text className='title-money-2' >数量：1张</text></view>
-            </view>
-            <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-            <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
-          </view>
+        <view className="shop-image">
+          <image
+            mode="scaleToFill"
+            className="shop-title-image-cup"
+            src={BlackSpot}
+          />
+          <text className="shop-title-title">请选择你要核销的套餐</text>
         </view>
-        <view class='right-complete-two'>
-          <view className='right-content'>
-          </view>
+        <view>
+          {list?.map((item) => {
+            
+            return (
+              <view class="wrapper" key={item.verifyNo} onClick={()=>setChecked(item.verifyNo)}>
+                <view class="left-complete-one">
+                  <view className="Check_OK-box">
+                    <image className="Check_OK-image" src={item.verifyNo==checked? Check_OK:Check_NO} />
+                  </view>
+                  <image className="left-image-1" src={ProCard_hot}></image>
+                  <view className="left-viewText">返现￥16.00</view>
+                  <view className="title-image">
+                    <image
+                      className="image-1"
+                      mode="scaleToFill"
+                      src={item.poster}
+                    ></image>
+                    <image className="image-2" src={food}></image>
+                  </view>
+                  <view className="title-content">
+                    <view className="Pro-title">
+                      <view className="title-text">
+                        {item.description}
+                        <text className="title-money-2">数量：1张</text>
+                      </view>
+                    </view>
+                    <text className="title-money">
+                      ￥{item.actualPrice/100}元<text className="title-money-2">门市价{item.standPrice/100}元</text>
+                    </text>
+                    <view className="title-time">
+                      有效期：{formatTime(item?.createDate, "yyyy/MM/dd")}-
+                        {formatTime(item?.expireDate, "yyyy/MM/dd")}
+                    </view>
+                  </view>
+                </view>
+                <view class="right-complete-two">
+                  <view className="right-content"></view>
+                </view>
+              </view>
+            );
+          })}
         </view>
-      </view>
 
-      <view className='button-info'>
-        <Button className='button-box' onClick={ShowMoldeOn} >确定核销</Button>
+        <view className="button-info">
+          <Button className="button-box" disabled={!checked} onClick={ShowMoldeOn}>
+            确定核销
+          </Button>
+        </view>
       </view>
-
     </view>
-  )
-})
+  );
+});

src/pages/details/foodDetails/foodDetails.jsx

@@ -26,14 +26,16 @@ import useLike from "@/utils/hooks/useLike"
 
 export default withLayout((props) => {
   const { router, person } = props
-  const { id, validPackage} = props.router.params
+  const { id, subOrderId} = props.router.params
+  // console.log(id,subOrderId,'--333-----')
   useEffect(()=>{
-    if(id&&validPackage){
+    console.log(id,subOrderId,'-------')
+    if(id&&subOrderId){
       Taro.navigateTo({
-        url: `/pages/TobeShop/index&id=${id}&validPackage=${validPackage}`,
+        url: `/pages/TobeShop/index?id=${id}&subOrderId=${subOrderId}`,
       });
     }
-  },[id,validPackage])
+  },[id, subOrderId])
   //商铺基础信息
   const [detail, setDetail] = useState({})
   //商铺套餐

src/services/payOrder.js

@@ -38,3 +38,17 @@ export const getQrcode = (id) => request(`/qrcode/${id}`)
 */
 export const getMineOrder = () => request(`/orderSub/summary/mine`)
 
+/**
+* 获取待核销列表
+* @param {*} params
+* @returns 
+*/
+export const getVerifyTargetList = (params) => request(`/verifyTarget`,{ params })
+
+/**
+* 核销
+* @param {*} id
+* @returns 
+*/
+export const putVerifyTarget = (id) => request(`/verifyTarget/${id}`,{ method: 'put' })
+