增加支付接口

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -9,7 +9,7 @@
         </view>
         <view class="page-item" v-show="activeIndex === 2">
             <pageThree @handleNextClick="handleNextClick" :orderDetail="detail" @handleNeedSave="handleNeedSave"
-                ref="pageThreeComp" :orderId="orderId" />
+                @handleConfirmPay="handleConfirmPay" ref="pageThreeComp" :orderId="orderId" />
         </view>
         <view class="page-item" v-show="activeIndex === 3">
             <pageFour @handleNextClick="handleNextClick" :orderDetail="detail" />
@@ -58,7 +58,8 @@ export default {
                 formThree: {},
                 formFour: {},
             },
-            pageThreeForm: {}
+            pageThreeForm: {},
+            fileIds: ''
         }
     },
     name: 'OrderDetailNewView',
@@ -72,9 +73,20 @@ export default {
                 this.$refs.pageThreeComp.getList('2', '3');
             }
         },
-        // 支付前保存数据
-        async saveData() {
-            await uni.$u.api.addReceiptForm({
+        // 没有recepitid就新增
+        async saveData(params) {
+            await uni.$u.api.addReceiptForm(params);
+        },
+        // 有recepitid就更新
+        async updateData(params) {
+            await uni.$u.api.updateReceiptForm(params);
+        },
+
+        handleNeedSave({ nowPage, form, fileIds }) {
+            this.pageThreeForm = form;
+            this.fileIds = fileIds;
+
+            const params = {
                 "searchValue": this.detail.searchValue,
                 "createBy": this.detail.createBy,
                 "createTime": this.detail.createTime,
@@ -102,7 +114,7 @@ export default {
                 // "repairAmount": null, //维修总金额 ，先不传
                 // "grossPerformance": "7443.00",   //毛利 performance*splitRatio
                 // "expressOrderNo": null,   //快递单号+后续加上一个键加上图url
-                // "fileIds": "",  //传第三部里面排序完成之后的id的数组，参考编辑收单里面的附件传的方法
+                "fileIds": this.fileIds,  //传第三部里面排序完成之后的id的数组，参考编辑收单里面的附件传的方法
                 "model": this.detail.model,
                 // "splitRatio": "25",   //分成比例，先不传
                 "customerServiceName": "1", //默认传1，判断入库的类型，回收类入库，销售类入库，维保类入库，第四步传，增加选项下拉
@@ -114,38 +126,18 @@ export default {
                 "bankCardNumber": this.pageThreeForm.bankAccount,
                 "bankName": this.pageThreeForm.bankName,
                 "customName": this.pageThreeForm.customName,
-            });
-        },
-        // 保存实物图数据
-        saveDetailImagesData() {
-            // 上传二进制文件
-            // console.log("上传文件成功:1", this.allFroms.formOne.truePic)
-
-            // this.allFroms.formOne.truePic.forEach(async (item) => {
-            //     const res = await uni.$u.api.uploadFile(item);
-            //     console.log("上传文件成功:", res)
-            // })
-        },
-        // // 保存聊天图数据
-        // saveChatPicData() {
-        //     this.allFroms.formOne.truePic.forEach(async (item) => {
-        //         await uni.$u.api.uploadFile(item);
-        //     })
-        // },
-        // // 保存高清图数据
-        // saveHighDefinitionPicData() {
-        //     this.allFroms.formOne.truePic.forEach(async (item) => {
-        //         await uni.$u.api.uploadFile(item);
-        //     })
-        // },
-        handleNeedSave({ nowPage, form }) {
-            this.pageThreeForm = form;
+            }
 
             //调用接口保存收单表单
-            this.saveData();
-            // this.saveDetailImagesData();
-
-            //保存数据之后调支付接口
+            if (this.detail.receiptId) {
+                this.updateData(params);
+            } else {
+                this.saveData(params);
+            }
+        },
+        // 确认支付
+        handleConfirmPay() {
+            // 调用支付接口
             this.pay();
         },
         //支付
@@ -162,7 +154,8 @@ export default {
                 uni.$u.toast(`支付失败：${response.msg}`)
             }
         },
-    }
+    },
+
 }
 
 

pages/orderDetailNew/components/pageThree.vue

@@ -268,12 +268,12 @@ export default {
             // 执行元素交换
             if (this.canDropIndex !== -1 && this.canDropIndex !== this.draggingIndex) {
                 // 交换元素位置
-                const temp = this.localDetailImages[this.draggingIndex];
-                this.localDetailImages[this.draggingIndex] = this.localDetailImages[this.canDropIndex];
-                this.localDetailImages[this.canDropIndex] = temp;
+                const temp = this.detailImages[this.draggingIndex];
+                this.detailImages[this.draggingIndex] = this.detailImages[this.canDropIndex];
+                this.detailImages[this.canDropIndex] = temp;
 
                 // Update position properties after swap
-                this.localDetailImages.forEach((item, index) => {
+                this.detailImages.forEach((item, index) => {
                     item.position = index + 1;
                 });
             }
@@ -342,6 +342,7 @@ export default {
 
             //让父组件保存数据
             this.$emit('handleNeedSave', {
+                fileIds: this.detailImages.map(item => item.id).join(','),
                 nowPage: 'formThree',
                 form: {
                     ...this.paymentInfo,
@@ -369,10 +370,12 @@ export default {
             console.log('确认转账');
             this.payNowModelShow = false;
             // 可以在这里添加转账确认的逻辑
+
+            this.$emit('handleConfirmPay');
         },
         // 下一步按钮点击事件
         handleNextClick() {
-            console.log('page3点击了下一步按钮', this.localDetailImages);
+            console.log('page3点击了下一步按钮', this.detailImages);
             this.$emit('handleNextClick', {
                 nowPage: 'formThree',
                 form: {