Yannay месяцев назад: 2
Родитель
Сommit
ff51a067ff

+ 2 - 1
pages/orderDetailNew/components/orderDetailNewView.vue

@@ -9,7 +9,8 @@
9 9
         </view>
10 10
         <view class="page-item" v-show="activeIndex === 2">
11 11
             <pageThree @handleNextClick="handleNextClick" :orderDetail="detail" @handleNeedSave="handleNeedSave"
12
-                @handleConfirmPay="handleConfirmPay" ref="pageThreeComp" :orderId="orderId" />
12
+                :receiptList="receiptList" @handleConfirmPay="handleConfirmPay" ref="pageThreeComp"
13
+                :orderId="orderId" />
13 14
         </view>
14 15
         <view class="page-item" v-show="activeIndex === 3">
15 16
             <pageFour @confirmInterStore="confirmInterStore" @handleNextClick="handleNextClick" :orderDetail="detail"

+ 0 - 24
pages/orderDetailNew/components/pageFour.vue

@@ -432,30 +432,6 @@ export default {
432 432
                 }
433 433
             }
434 434
 
435
-            // // 校验前端分成比例总和必须是100%
436
-            // const frontendTotal = this.profitSharingList
437
-            //     .filter(item => item.accountType === '1')
438
-            //     .reduce((sum, item) => sum + Number(item.commissionRate), 0);
439
-            // if (frontendTotal !== 100) {
440
-            //     uni.showToast({
441
-            //         title: '前端分成比例总和必须为100%',
442
-            //         icon: 'none'
443
-            //     });
444
-            //     return false;
445
-            // }
446
-
447
-            // // 校验后端分成比例总和必须是100%
448
-            // const backendTotal = this.profitSharingList
449
-            //     .filter(item => item.accountType === '2')
450
-            //     .reduce((sum, item) => sum + Number(item.commissionRate), 0);
451
-            // if (backendTotal !== 100) {
452
-            //     uni.showToast({
453
-            //         title: '后端分成比例总和必须为100%',
454
-            //         icon: 'none'
455
-            //     });
456
-            //     return false;
457
-            // }
458
-
459 435
             return true;
460 436
         },
461 437
         // 获取分成人名单

+ 14 - 1
pages/orderDetailNew/components/pageThree.vue

@@ -149,7 +149,11 @@ export default {
149 149
         orderId: {
150 150
             type: String,
151 151
             default: '',
152
-        }
152
+        },
153
+        receiptList: {
154
+            type: Array,
155
+            default: () => { },
156
+        },
153 157
     },
154 158
     watch: {
155 159
         orderDetail: {
@@ -165,6 +169,15 @@ export default {
165 169
             },
166 170
             deep: true,
167 171
         },
172
+        receiptList: {
173
+            handler(newVal) {
174
+                if (newVal) {
175
+                    console.log('这里是page3的', newVal[0].tableFee)
176
+                    this.paymentAmount = newVal[0].tableFee || '0.00'
177
+                }
178
+            },
179
+            deep: true,
180
+        }
168 181
 
169 182
     },
170 183
     components: {