flx

src/components/foodCards/foodCards.jsx

@@ -13,13 +13,19 @@ const Action = CouponCard.Action
 
 //套餐卡片
 export default (props) => {
-  const { item, st, det, editable, goshop } = props
+  const { item, st, det, editable, goshop, scene, subOrderId, id } = props
   const { shopId } = props.item
   const goFood = () => {
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
   }
+
+  // 支付成功--判断---有---问--没有--跳转到全部订单
+
+
   const handlePayClick = () => {
-    Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}` })
+    Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
+    console.log("🚀 ~ file: foodCards.jsx ~ line 17 ~ scene", item.packageId, scene)
+
   }
   const PayAction = <Action.Icon icon={Pay} text='支付' onClick={handlePayClick} />
   return (

src/pages/PayOrder/index.jsx

@@ -17,7 +17,8 @@ import "./style.less";
 
 export default withLayout((props) => {
   const { router, person } = props;
-  const { packageId, orderId } = props.router.params;
+  console.log("🚀 ~ file: index.jsx ~ line 20 ~ withLayout ~ props", props)
+  const { packageId, orderId, scene, subOrderId, id } = props.router.params;
   const [payInfo, setPayInfo] = useState();
   // 是否已阅读协议
   const [agreement, setAgreement] = useState(false);
@@ -64,14 +65,35 @@ export default withLayout((props) => {
       package: params.packageValue,
       success: () => {
         setPayInfo();
-        Taro.redirectTo({
-          url: "/pages/MineUserAll/AllOrder/index",
-        });
+
         Taro.showToast({
           title: "支付成功",
           icon: "none",
-          duration: 2000,
+          duration: 1000,
         });
+        if (!scene) {
+          Taro.redirectTo({
+            url: "/pages/MineUserAll/AllOrder/index",
+          });
+        } else {
+          Taro.showModal({
+            title: '是否核销',
+            success: function (res) {
+              if (res.confirm) {
+                Taro.navigateTo({
+                  url: `/pages/TobeShop/index?id=${id}&subOrderId=${subOrderId}`,
+                });
+
+              } else if (res.cancel) {
+                Taro.redirectTo({
+                  url: "/pages/MineUserAll/AllOrder/index",
+                });
+              }
+            }
+          })
+        }
+
+
       },
       fail: (e) => {
         Taro.showToast({

src/pages/details/foodDetails/foodDetails.jsx

@@ -217,7 +217,7 @@ export default withLayout((props) => {
                     <text>返现套餐</text>
                   </view>
                   {(spackage || []).map((item) => (
-                    <Cards key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
+                    <Cards scene={scene} id={id} subOrderId={subOrderId} key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
                   ))}
                 </view>
                 <view