From 5f852fa4401e63903e4eaaa808d3c9c6ac86395d Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 23 三月 2023 10:55:39 +0800
Subject: [PATCH] 修改我要登记

---
 miniprogram/pages/user/report/submitReport/index.ts |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/miniprogram/pages/user/report/submitReport/index.ts b/miniprogram/pages/user/report/submitReport/index.ts
index 78ef684..0538308 100644
--- a/miniprogram/pages/user/report/submitReport/index.ts
+++ b/miniprogram/pages/user/report/submitReport/index.ts
@@ -89,14 +89,16 @@
             formData: { user: 'test' },
             success(res) {
                 // 涓婁紶瀹屾垚闇�瑕佹洿鏂� fileList
-                const { fileImgList = [] } = that.data;
-                const { transactionReceiptList = [] } = that.data;
-                const { otherList = [] } = that.data;
-                const { cardIdList = [] } = that.data;
+                const { fileImgList = [] } = that.data;  //鍚堝悓
+                const { transactionReceiptList = [] } = that.data; // 浜ゆ槗鍑瘉
+                const { otherList = [] } = that.data; //鍏朵粬
+                const { cardIdList = [] } = that.data;  //韬唤璇�
                 let result = JSON.parse(res.data)
                 if (that.data.beforList == 'a') {
                     cardIdList.push({ ...file, url: result.data });
                     that.setData({ cardIdList });
+                    console.log(that.data.cardIdList);
+                    
                 } else if (that.data.beforList == 'b') {
                     fileImgList.push({ ...file, url: result.data });
                     that.setData({ fileImgList });
@@ -230,10 +232,10 @@
         this.data.reportDetail.reportMaterials = this.data.materials
         this.data.reportDetail.userId = wx.getStorageSync('id')
         this.data.reportDetail.cheatTime = this.data.cheatTime
-        this.data.reportDetail.idCardMaterials = this.data.cardIdList.map(res => res.url).join(',')
-        this.data.reportDetail.contractMaterials = this.data.fileImgList.map(res => res.url).join(',')
-        this.data.reportDetail.transactionMaterials = this.data.transactionReceiptList.map(res => res.url).join(',')
-        this.data.reportDetail.elseMaterials = this.data.otherList.map(res => res.url).join(',')
+        this.data.reportDetail.idCardMaterials =this.data.cardIdList.length>0? this.data.cardIdList.map(res => res.url).join(','):null
+        this.data.reportDetail.contractMaterials =this.data.fileImgList.length>0? this.data.fileImgList.map(res => res.url).join(','):null
+        this.data.reportDetail.transactionMaterials =this.data.transactionReceiptList.length>0? this.data.transactionReceiptList.map(res => res.url).join(','):null
+        this.data.reportDetail.elseMaterials =this.data.otherList.length>0? this.data.otherList.map(res => res.url).join(','):null;;
         // if (  this.data.reportDetail.information==null||  this.data.reportDetail.reportDescription==null) {
         //     wx.showToast({
         //         icon: "none",
@@ -258,9 +260,7 @@
     },
     onLoad:function(e) {
         console.log(e);
-
         let that = this
-       
         let phone = wx.getStorageSync('phone')
         that.setData({
             phone: phone
@@ -356,38 +356,38 @@
                         sexId: arraySex.findIndex(val=>{return val.sex == form.sex}),
                         Location: form.location,
                         workingLocation: form.workingLocation,
-                        cardIdList: form.idCardMaterials.split(',').map(i => {
+                        cardIdList:form.idCardMaterials? form.idCardMaterials.split(',').map(i => {
                             return {
                                 thumb: that.imgComplete(i),
                                 url: i,
                                 type: "image",
                                 size: 999999
                             }
-                        }),
-                        fileImgList: form.contractMaterials.split(',').map(i => {
+                        }):[],
+                        fileImgList:form.contractMaterials? form.contractMaterials.split(',').map(i => {
                             return {
                                 thumb: that.imgComplete(i),
                                 url: i,
                                 type: "image",
                                 size: 999999
                             }
-                        }),
-                        transactionReceiptList: form.transactionMaterials.split(',').map(i => {
+                        }):[],
+                        transactionReceiptList:form.transactionMaterials? form.transactionMaterials.split(',').map(i => {
                             return {
                                 thumb: that.imgComplete(i),
                                 url: i,
                                 type: "image",
                                 size: 999999
                             }
-                        }),
-                        otherList: form.elseMaterials.split(',').map(i => {
+                        }):[],
+                        otherList:form.elseMaterials? form.elseMaterials.split(',').map(i => {
                             return {
                                 thumb: that.imgComplete(i),
                                 url: i,
                                 type: "image",
                                 size: 999999
                             }
-                        })
+                        }):[]
                     })
                 }
             })

--
Gitblit v1.8.0