From 15171d9f0b4714d06cb7de3f8d462881742cb608 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 23 三月 2023 13:58:34 +0800
Subject: [PATCH] 修改登记图片

---
 miniprogram/pages/user/report/submitReport/index.ts   |   32 ++++++++++++++++
 miniprogram/pages/user/report/detail/index.ts         |   30 ++++++++++++++
 miniprogram/pages/manager/report/detail/index.ts      |    8 ++--
 miniprogram/pages/user/report/submitReport/index.wxml |    8 ++--
 4 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/miniprogram/pages/manager/report/detail/index.ts b/miniprogram/pages/manager/report/detail/index.ts
index 6e9514a..c9df331 100644
--- a/miniprogram/pages/manager/report/detail/index.ts
+++ b/miniprogram/pages/manager/report/detail/index.ts
@@ -149,10 +149,10 @@
                         causeIndex:this.data.causeList.findIndex(val=>{return val.id == res.data.data.causeId}),
                         reportDetail: res.data.data,
                         sex:res.data.data.sex,
-                        contractMaterials:res.data.data.contractMaterials.split(',').map(item=>{return item=managerReportDetail.globalData.imageUrl + "/img/" +item}),
-                        idCardMaterials:res.data.data.idCardMaterials.split(',').map(item=>{return item=managerReportDetail.globalData.imageUrl + "/img/" +item}),
-                        transactionMaterials:res.data.data.transactionMaterials.split(',').map(item=>{return item=managerReportDetail.globalData.imageUrl + "/img/" +item}),
-                        elseMaterials:res.data.data.elseMaterials.split(',').map(item=>{return item=managerReportDetail.globalData.imageUrl + "/img/" +item})
+                        contractMaterials:res.data.data.contractMaterials?res.data.data.contractMaterials.split(',').map(item=>{return item=managerReportDetail.globalData.imageUrl + "/img/" +item}):[],
+                        idCardMaterials:res.data.data.idCardMaterials?res.data.data.idCardMaterials.split(',').map(item=>{return item=managerReportDetail.globalData.imageUrl + "/img/" +item}):[],
+                        transactionMaterials:res.data.data.transactionMaterials?res.data.data.transactionMaterials.split(',').map(item=>{return item=managerReportDetail.globalData.imageUrl + "/img/" +item}):[],
+                        elseMaterials:res.data.data.elseMaterials?res.data.data.elseMaterials.split(',').map(item=>{return item=managerReportDetail.globalData.imageUrl + "/img/" +item}):[]
 
                     })
                     console.log(this.data.idCardMaterials);
diff --git a/miniprogram/pages/user/report/detail/index.ts b/miniprogram/pages/user/report/detail/index.ts
index c961571..3d000fe 100644
--- a/miniprogram/pages/user/report/detail/index.ts
+++ b/miniprogram/pages/user/report/detail/index.ts
@@ -28,8 +28,34 @@
                 method: "GET",
                 header: { 'token': wx.getStorageSync('token') },
                 success: (res) => {
+                    console.log(res);
+                    let img=[]
+                    if (res.data.data.idCardMaterials) {
+                        img.push(...res.data.data.idCardMaterials.split(','))
+                    }
+                    if (res.data.data.contractMaterials) {
+                        img.push(...res.data.data.contractMaterials.split(','))
+                    }
+                   if (res.data.data.elseMaterials) {
+                    img.push(...res.data.data.elseMaterials.split(','))
+                   }
+                   if (res.data.data.transactionMaterials) {
+                    img.push(...res.data.data.transactionMaterials.split(','))
+                   }   
+                   console.log(img);
+                  img= img.map(i => 
+                    i= userDetail.globalData.imageUrl + "/img/" + i    
+                    )
+                    console.log(img);
+                    // this.setData({
+                    //     images: [...res.data.data.idCardMaterials.split(","), ...res.data.data.contractMaterials.split(","), ...res.data.data.elseMaterials.split(","), ...res.data.data.transactionMaterials.split(",")].map((i) => 
+                    //              i= userDetail.globalData.imageUrl + "/img/" + i    
+                    //     )
+                    // })
+
+   
                     this.setData({
-                        images: [...res.data.data.idCardMaterials.split(","), ...res.data.data.contractMaterials.split(","), ...res.data.data.elseMaterials.split(","), ...res.data.data.transactionMaterials.split(",")].map(i => userDetail.globalData.imageUrl + "/img/" + i)
+                        images:img
                     })
                     this.setData({
                         reportDetail: res.data.data
@@ -37,6 +63,8 @@
                     this.setData({
                         remarks: res.data.data.remarks
                     })
+                    console.log(this.data.images);
+                    
                     // for (let index = 0; index < this.data.images.length; index++) {
                     //     if (this.data.images != null && this.data.images[index] != "" && this.data.images != undefined) {
                     //         this.data.images[index] = userDetail.globalData.imageUrl + "/img/" + this.data.images[index]
diff --git a/miniprogram/pages/user/report/submitReport/index.ts b/miniprogram/pages/user/report/submitReport/index.ts
index 0538308..b3bd870 100644
--- a/miniprogram/pages/user/report/submitReport/index.ts
+++ b/miniprogram/pages/user/report/submitReport/index.ts
@@ -38,6 +38,36 @@
         ],
         sexId: 0
     },
+    afterRadeDel(e){
+        console.log(e);
+        console.log(this.data.cardIdList);
+        let arr=this.data.cardIdList
+        arr.splice(e.detail.index,1)
+        this.setData({
+            cardIdList: arr
+        })
+    },
+    afterRadeDelFile(e){
+        let arr=this.data.fileImgList
+        arr.splice(e.detail.index,1)
+        this.setData({
+            fileImgList: arr
+        })
+    }, 
+    afterRadeDelTran(e){
+        let arr=this.data.transactionReceiptList
+        arr.splice(e.detail.index,1)
+        this.setData({
+            transactionReceiptList: arr
+        })
+    },
+    afterRadeDelOther(e){
+        let arr=this.data.otherList
+        arr.splice(e.detail.index,1)
+        this.setData({
+            otherList: arr
+        })
+    },
     getrealName(e) {
         this.setData({
             realName: e.detail
@@ -389,6 +419,8 @@
                             }
                         }):[]
                     })
+                    console.log(this.data.cardIdList);
+                    
                 }
             })
       
diff --git a/miniprogram/pages/user/report/submitReport/index.wxml b/miniprogram/pages/user/report/submitReport/index.wxml
index 41b0c53..efe4734 100644
--- a/miniprogram/pages/user/report/submitReport/index.wxml
+++ b/miniprogram/pages/user/report/submitReport/index.wxml
@@ -56,17 +56,17 @@
             </view> -->
         <van-tabs active="a" ellipsis="{{false}}" bind:change="onChangeTabs">
             <van-tab title="韬唤璇佹鍙嶉潰" name="a">
-                <van-uploader file-list="{{ cardIdList }}" max-count="2" bind:after-read="afterReadImg" capture="{{ capture }}" accept="image" />
+                <van-uploader bind:delete="afterRadeDel" file-list="{{ cardIdList }}" max-count="2" bind:after-read="afterReadImg" capture="{{ capture }}" accept="image" />
 
             </van-tab>
             <van-tab title="鐩稿叧鍚堝悓" name="b">
-                <van-uploader file-list="{{ fileImgList }}" bind:after-read="afterReadImg" />
+                <van-uploader bind:delete="afterRadeDelFile" file-list="{{ fileImgList }}" bind:after-read="afterReadImg" />
             </van-tab>
             <van-tab title="浜ゆ槗鍑瘉" name="c">
-                <van-uploader file-list="{{ transactionReceiptList }}" bind:after-read="afterReadImg" />
+                <van-uploader bind:delete="afterRadeDelTran" file-list="{{ transactionReceiptList }}" bind:after-read="afterReadImg" />
             </van-tab>
             <van-tab title="鍏朵粬" name="d">
-                <van-uploader file-list="{{ otherList }}" bind:after-read="afterReadImg" />
+                <van-uploader bind:delete="afterRadeDelOther" file-list="{{ otherList }}" bind:after-read="afterReadImg" />
             </van-tab>
         </van-tabs>
     </van-cell-group>

--
Gitblit v1.8.0