From a007ca89cb5e47eee672b2e5042628742acd682c Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 27 Oct 2021 17:49:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E9=82=AE=E7=AE=B1=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingDetailSigned.js                    | 34 +++++++++++--------
 .../meetingDetailSigned.wxml                  |  2 +-
 .../meetingDetailSigned.wxss                  |  9 +++--
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index 3b125fc..4d3e70c 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -1,6 +1,7 @@
 // pages/meeting/meeting.js
 import {
-  previewFile,sliceFileTypeByFileName
+  previewFile,
+  sliceFileTypeByFileName
 } from '../../assets/js/preview'
 
 import MeetingApi from '../../assets/js/http/meetingApi'
@@ -33,7 +34,7 @@ Page({
     payRecordImgSrc: '',
     // 签到图片的回显
     signImgSrc: '',
-    userId:''
+    userId: ''
   },
 
   // 获取图片的id
@@ -55,7 +56,7 @@ Page({
       orderCode: this.data.ordeCode,
       paymentRecord: this.data.imageIds
     }
-    if(Array.isArray(this.data.imageIds)){
+    if (Array.isArray(this.data.imageIds)) {
       param.paymentRecord = this.data.imageIds.join(',')
     }
     signUpApi.uploadPayRecord(param).then(res => {
@@ -65,7 +66,7 @@ Page({
           title: res.message,
           icon: "success",
           duration: 2000,
-          success(){
+          success() {
             wx.navigateBack({
               delta: 1,
             })
@@ -90,9 +91,13 @@ Page({
         this.setData({
           singInPersonInfo: res.result,
           ordeCode: res.result.orderCode,
-          // 这是为了不点击图片上传的bug
-          imageIds: res.result.paymentRecord.split(',')
         })
+        if (!!res.result.paymentRecord) {
+          this.setData({
+            // 这是为了不点击图片上传的bug
+            imageIds: res.result.paymentRecord.split(',')
+          })
+        }
         // 已经审核的获取审核凭证的src
         if (res.result.checkResult !== 0) {
           this.setData({
@@ -105,6 +110,7 @@ Page({
           this.setData({
             signImgSrc: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.checkFile
           })
+          console.log(this.data.signImgSrc, 'this.data.signImgSrc');
         }
       }
     })
@@ -145,29 +151,29 @@ Page({
     const fileObj = e.currentTarget.dataset.file
     let fileType = sliceFileTypeByFileName(fileObj.name)
     // 文件类型不是docx，doc，pdf时，已邮件形式发送到参会人的邮箱
-    if(fileType !== 'docx' && fileType !== 'doc' && fileType !== 'pdf') {
+    if (fileType !== 'docx' && fileType !== 'doc' && fileType !== 'pdf') {
       let params = {
         fileId: fileObj.id,
         userId: this.data.userId
       }
-      UserApi.sendEmail(params).then(res=>{
-        if(res.success){
+      UserApi.sendEmail(params).then(res => {
+        if (res.success) {
           wx.showToast({
             title: '文件已发送到您的邮箱',
             icon: 'none'
           })
-        }else{
+        } else {
           wx.showToast({
             title: res.message,
             icon: "none"
           })
         }
       })
-    }else {
+    } else {
       previewFile(fileObj.fileId, fileObj.name)
     }
   },
-  
+
   /**
    * 生命周期函数--监听页面加载
    */
@@ -183,7 +189,7 @@ Page({
 
     wx.getStorage({
       key: 'userInfo',
-      success(res){
+      success(res) {
         that.setData({
           userId: res.data.id
         })
@@ -259,4 +265,4 @@ Page({
   onShareAppMessage: function () {
 
   }
-})
+})
\ No newline at end of file
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 6436b50..005b062 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -167,7 +167,7 @@
 		</view>
 		<view style='width:100%;height:120px'>
 			<text>签到信息</text>
-			<imgae style='margin-right:30px' class="back-img" src="{{signImgSrc}}"></imgae>
+			<image style='margin-right:30px' class="back-img" src="{{signImgSrc}}"></image>
 		</view>
 	</view>
 	<!-- 签到信息end -->
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss
index f7837cf..16a0227 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxss
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss
@@ -54,16 +54,21 @@ page{
 }
 .file-name view{
   padding: 0;
-  height: 30px;
-  line-height: 30px;
+  height: auto;
   border-bottom: 0;
 }
+
+.file-name view text{
+ overflow: hidden;
+}
 .file-name view image{
   width: 30px;
+  min-width: 30px;
   height: 30px;
   margin-right: 10px;
 }
 .basic-info .meeting-files .file-name .look-file{
+  min-width: 40px;
   color: #069F99;
 }
 .warning-text{