吃个甘蔗嚼一年 3 년 전
부모
커밋
0bf5b7d132
3개의 변경된 파일36개의 추가작업 그리고 8개의 파일을 삭제
  1. 8
    2
      src/components/foodCards/foodCards.jsx
  2. 27
    5
      src/pages/PayOrder/index.jsx
  3. 1
    1
      src/pages/details/foodDetails/foodDetails.jsx

+ 8
- 2
src/components/foodCards/foodCards.jsx 파일 보기

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

+ 27
- 5
src/pages/PayOrder/index.jsx 파일 보기

@@ -17,7 +17,8 @@ import "./style.less";
17 17
 
18 18
 export default withLayout((props) => {
19 19
   const { router, person } = props;
20
-  const { packageId, orderId } = props.router.params;
20
+  console.log("🚀 ~ file: index.jsx ~ line 20 ~ withLayout ~ props", props)
21
+  const { packageId, orderId, scene, subOrderId, id } = props.router.params;
21 22
   const [payInfo, setPayInfo] = useState();
22 23
   // 是否已阅读协议
23 24
   const [agreement, setAgreement] = useState(false);
@@ -64,14 +65,35 @@ export default withLayout((props) => {
64 65
       package: params.packageValue,
65 66
       success: () => {
66 67
         setPayInfo();
67
-        Taro.redirectTo({
68
-          url: "/pages/MineUserAll/AllOrder/index",
69
-        });
68
+
70 69
         Taro.showToast({
71 70
           title: "支付成功",
72 71
           icon: "none",
73
-          duration: 2000,
72
+          duration: 1000,
74 73
         });
74
+        if (!scene) {
75
+          Taro.redirectTo({
76
+            url: "/pages/MineUserAll/AllOrder/index",
77
+          });
78
+        } else {
79
+          Taro.showModal({
80
+            title: '是否核销',
81
+            success: function (res) {
82
+              if (res.confirm) {
83
+                Taro.navigateTo({
84
+                  url: `/pages/TobeShop/index?id=${id}&subOrderId=${subOrderId}`,
85
+                });
86
+
87
+              } else if (res.cancel) {
88
+                Taro.redirectTo({
89
+                  url: "/pages/MineUserAll/AllOrder/index",
90
+                });
91
+              }
92
+            }
93
+          })
94
+        }
95
+
96
+
75 97
       },
76 98
       fail: (e) => {
77 99
         Taro.showToast({

+ 1
- 1
src/pages/details/foodDetails/foodDetails.jsx 파일 보기

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