From 0f380ac05d3be2f0b56e8a769dfead256c623db0 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 23 三月 2023 14:09:28 +0800
Subject: [PATCH] 修改我要登记图片回显

---
 miniprogram/pages/user/report/detail/index.ts                    |   39 +++------
 miniprogram/pages/manager/group/message/member/detail/index.ts   |   56 +++++++------
 miniprogram/pages/manager/group/message/member/detail/index.wxml |   21 ++--
 miniprogram/pages/manager/report/detail/index.ts                 |   90 ++++++++++++----------
 4 files changed, 100 insertions(+), 106 deletions(-)

diff --git a/miniprogram/pages/manager/group/message/member/detail/index.ts b/miniprogram/pages/manager/group/message/member/detail/index.ts
index 90265a6..fc592a7 100644
--- a/miniprogram/pages/manager/group/message/member/detail/index.ts
+++ b/miniprogram/pages/manager/group/message/member/detail/index.ts
@@ -15,12 +15,13 @@
             url: '../logs/logs',
         })
     },
-//鏌ョ湅鍥剧墖
-face(){
-    wx.previewMedia({
-        sources:[{url:managerCauseDetail.globalData.imageUrl+"/img/"+this.data.reportDetail.pic}]
-    })
-},
+    //鏌ョ湅鍥剧墖
+    face(e) {
+        console.log(e.currentTarget.dataset.img);
+        wx.previewMedia({
+            sources: [{ url: e.currentTarget.dataset.img }]
+        })
+    },
     //閫夋嫨妗堜欢
     pickCause(e) {
         this.data.reportDetail.causeId = this.data.causeList[e.detail.value].id
@@ -43,38 +44,39 @@
     //             })
     //         }   
     // })   
-   
 
-// },
+
+    // },
     onLoad(e) {
         console.log(e)
         wx.request(
             {
-                url:memberDetail.globalData.url+"/wx/group/member/detail",
+                url: memberDetail.globalData.url + "/wx/group/member/detail",
                 method: "GET",
-                data:{
-                    id:e.id
+                data: {
+                    id: e.id
                 },
-                header: { 'token':wx.getStorageSync('token') },
+                header: { 'token': wx.getStorageSync('token') },
                 success: (res) => {
-                    var  ress=res.data.data
-                    ress.pic=memberDetail.globalData.imageUrl+"/img/"+ress.pic
-                    this.setData({
-                        reportDetail:ress,
-                        images:res.data.data.reportMaterials.split(",")
-                    })
-            
-                    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]=memberDetail.globalData.imageUrl+"/img/"+this.data.images[index]
-                        }  else{
-                            this.data.images=[]
-                        } 
+                    var ress = res.data.data
+                    ress.pic = memberDetail.globalData.imageUrl + "/img/" + ress.pic
+                    let imgs = []
+                    if (ress.idCardMaterials != '') {
+                        imgs.push(...ress.idCardMaterials.split(","))
+                        if (ress.contractMaterials != '') {
+                            imgs.push(...ress.contractMaterials.split(","))
+                            if (ress.transactionMaterials != '') {
+                                imgs.push(...ress.transactionMaterials.split(","))
+                                if (ress.elseMaterials != '') {
+                                    imgs.push(...ress.elseMaterials.split(","))
+                                }
+                            }
+                        }
                     }
                     this.setData({
-                        images:this.data.images
+                        reportDetail: ress,
+                        images: imgs.map(i => memberDetail.globalData.imageUrl + '/img/' + i)
                     })
-                    console.log(this.data.reportDetail)
                 }
             })
         // wx.request(
diff --git a/miniprogram/pages/manager/group/message/member/detail/index.wxml b/miniprogram/pages/manager/group/message/member/detail/index.wxml
index e8def19..371e345 100644
--- a/miniprogram/pages/manager/group/message/member/detail/index.wxml
+++ b/miniprogram/pages/manager/group/message/member/detail/index.wxml
@@ -1,11 +1,11 @@
 <!--index.wxml-->
 <view>
-   <view class="id">
-     <image class="face" src="{{reportDetail.pic}}"></image>
-       <view class="name" >{{reportDetail.reporterName}}</view>
-       <view class="mobile">{{reportDetail.mobile}}</view>
-       <view class="idcard">{{reportDetail.idcard}}</view>
-   </view>
+    <view class="id">
+        <image class="face" src="{{reportDetail.pic}}"></image>
+        <view class="name">{{reportDetail.reporterName}}</view>
+        <view class="mobile">{{reportDetail.mobile}}</view>
+        <view class="idcard">{{reportDetail.idcard}}</view>
+    </view>
     <view class="list1">
         <view class="font-wenzi">鎶ユ鏃堕棿</view>
         <view class="content">{{reportDetail.ctime}}</view>
@@ -15,7 +15,7 @@
         <view class="content">{{reportDetail.reportMethod}}</view>
     </view>
     <view class="list1">
-     
+
         <view class="font-wenzi">娑夋閲戦</view>
         <view class="content">{{reportDetail.amountInvolved}}</view>
     </view>
@@ -30,14 +30,13 @@
     </view> -->
     <view class="list2">
         <view class="font-wenzi">琛ュ厖淇℃伅</view>
-        <view class="font-wenzi1">{{reportDetail.information}}</view>
+        <view class="font-wenzi1">{{reportDetail.information||"鏆傛棤"}}</view>
     </view>
     <view class="list3">
         <view class="font-wenzi3">鎶ユ鏉愭枡</view>
-        <view class= wx:for="{{images}}" wx:key="index">
-            <image style="width: 100%;" src="{{item}}" mode="aspectFill"></image>
+        <view wx:for="{{images}}" wx:key="index">
+            <image style="width: 100%;" src="{{item}}" mode="aspectFill" bindtap="face" data-img="{{item}}"></image>
         </view>
-
     </view>
 
     <!-- <view class="list1">
diff --git a/miniprogram/pages/manager/report/detail/index.ts b/miniprogram/pages/manager/report/detail/index.ts
index c9df331..8bb1c3c 100644
--- a/miniprogram/pages/manager/report/detail/index.ts
+++ b/miniprogram/pages/manager/report/detail/index.ts
@@ -4,19 +4,19 @@
 
 Page({
     data: {
-        valuereject:'',
-        showreject:false,
+        valuereject: '',
+        showreject: false,
         arraySex: [
             { sex: '鐢�', id: 1 },
             { sex: '濂�', id: 0 }
         ],
-        sex:'鐢�',
+        sex: '鐢�',
         sexId: 0,
-        datae:null,
-        idCardMaterials:[], //  韬唤璇�
-        contractMaterials:[],//  鍚堝悓
-        transactionMaterials:[],//  浜ゆ槗
-        elseMaterials:[],//  鍏朵粬
+        datae: null,
+        idCardMaterials: [], //  韬唤璇�
+        contractMaterials: [],//  鍚堝悓
+        transactionMaterials: [],//  浜ゆ槗
+        elseMaterials: [],//  鍏朵粬
         reportDetail: {},
         isShow: false,
         causeList: [],
@@ -24,20 +24,20 @@
         images: [],
         array: ["2022/08/19/5040f71639fd44b48228ce0e5c242727.jpeg", "2022/08/19/47bbd7c1d7bd4c07a0b17d671fe47010.jpeg"]
     },
-    onChangereject(e){
+    onChangereject(e) {
         console.log(e);
-            this.setData({
-                valuereject:e.detail
-            })
+        this.setData({
+            valuereject: e.detail
+        })
     },
-    deny(){
+    deny() {
         this.setData({ showreject: true });
     },
     subreject() {
         console.log('6666666666');
-        let parms={
+        let parms = {
             id: this.data.reportDetail.id,
-            reason:this.data.valuereject
+            reason: this.data.valuereject
         }
         wx.request(
             {
@@ -46,18 +46,18 @@
                 data: parms,
                 header: { 'token': wx.getStorageSync('token') },
                 success: (res) => {
-                 console.log(res);
-                 wx.reLaunch({
-                    url: '../../../manager/index'
-                })
-                } 
+                    console.log(res);
+                    wx.reLaunch({
+                        url: '../../../manager/index'
+                    })
+                }
             })
-      },
-    
-      onClose() {
+    },
+
+    onClose() {
         this.setData({ showreject: false });
-      },
-   
+    },
+
     // 浜嬩欢澶勭悊鍑芥暟
     bindViewTap() {
         wx.navigateTo({
@@ -66,7 +66,7 @@
     },
     bindPickerChangeSex(e) {
         console.log(e);
-        
+
         this.setData({
             sexId: e.detail.value
         })
@@ -119,45 +119,51 @@
         }
     },
     onChangeTabs(e) {
-      console.log(e);
-      
+        console.log(e);
+
     },
-     onLoad(e) {
+    onLoad(e) {
         wx.request(
             {
                 url: managerReportDetail.globalData.url + "/cause/getCauseList",
                 method: "GET",
                 header: { 'token': wx.getStorageSync('token') },
                 success: (res) => {
-                    this.data.causeList=res.data.data.records
+                    this.data.causeList = res.data.data.records
                     this.setData({
                         causeList: res.data.data.records
                     })
                     this.getDataList(e)
-                } 
+                }
             })
     },
-     getDataList(e){
+    getDataList(e) {
         wx.request(
             {
                 url: managerReportDetail.globalData.url + "/report/" + e.id,
                 method: "GET",
                 header: { 'token': wx.getStorageSync('token') },
                 success: (res) => {
-                  console.log(this.data.causeList);
+                    let detail = res.data.data
+                    console.log(this.data.causeList);
                     this.setData({
-                        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?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}):[]
-
+                        causeIndex: this.data.causeList.findIndex(val => { return val.id == detail.causeId }),
+                        reportDetail: detail,
+                        sex: detail.sex,
+                        contractMaterials: this.materialStringToArray(detail.contractMaterials),
+                        idCardMaterials: this.materialStringToArray(detail.idCardMaterials),
+                        transactionMaterials: this.materialStringToArray(detail.transactionMaterials),
+                        elseMaterials: this.materialStringToArray(detail.elseMaterials)
                     })
                     console.log(this.data.idCardMaterials);
-                    
                 }
             })
     },
+    materialStringToArray(s: string): string[] {
+        if (s == '' || s == null) {
+            return []
+        } else {
+            return s.split(',').map(i => managerReportDetail.globalData.imageUrl + "/img/" + i)
+        }
+    }
 })
diff --git a/miniprogram/pages/user/report/detail/index.ts b/miniprogram/pages/user/report/detail/index.ts
index 3d000fe..1624458 100644
--- a/miniprogram/pages/user/report/detail/index.ts
+++ b/miniprogram/pages/user/report/detail/index.ts
@@ -28,34 +28,21 @@
                 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(','))
+                    let imgs = []
+                    if (res.data.data.idCardMaterials != '') {
+                        imgs.push(...res.data.data.idCardMaterials.split(","))
+                        if (res.data.data.contractMaterials != '') {
+                            imgs.push(...res.data.data.contractMaterials.split(","))
+                            if (res.data.data.transactionMaterials != '') {
+                                imgs.push(...res.data.data.transactionMaterials.split(","))
+                                if (res.data.data.elseMaterials != '') {
+                                    imgs.push(...res.data.data.elseMaterials.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:img
+                        images: imgs.map(i => userDetail.globalData.imageUrl + "/img/" + i)
                     })
                     this.setData({
                         reportDetail: res.data.data

--
Gitblit v1.8.0