From b3d45d14f60809cbd719f8542c2d76f670caa642 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 27 Oct 2021 17:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AFpdf=E7=9A=84=E5=88=86=E5=8F=91=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=20=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/imageUpload/imageUpload.js         | 11 +++--
 components/imageUpload/imageUpload.wxml       |  2 +-
 .../meetingDetailSigned.js                    | 42 +++++++++++++++++--
 .../meetingDetailSigned.wxml                  |  2 +-
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/components/imageUpload/imageUpload.js b/components/imageUpload/imageUpload.js
index e3948b8..ded2776 100644
--- a/components/imageUpload/imageUpload.js
+++ b/components/imageUpload/imageUpload.js
@@ -35,10 +35,15 @@ Component({
   lifetimes: {
     attached: function() {
       console.log(' this.data.initImgsList', this.data.initImgsList);
-      let initImgArr = this.data.initImgsList.split(',')
+      let initImgArr
+      if(!!this.data.initImgsList){
+        initImgArr = this.data.initImgsList.split(',')
+      }
       const arr = []
-      for (let index = 0; index < initImgArr.length; index++) {
-         arr.push( baseUrl + URL_CONFIG + 'sys/common/download/' +  initImgArr[index])
+      if(initImgArr && initImgArr.length > 0){
+        for (let index = 0; index < initImgArr.length; index++) {
+          arr.push( baseUrl + URL_CONFIG + 'sys/common/download/' +  initImgArr[index])
+       }
       }
       this.setData({
         tempFilePaths:arr
diff --git a/components/imageUpload/imageUpload.wxml b/components/imageUpload/imageUpload.wxml
index e89488c..2444eb7 100644
--- a/components/imageUpload/imageUpload.wxml
+++ b/components/imageUpload/imageUpload.wxml
@@ -1,6 +1,6 @@
 <!--components/imageUpload/imageUpload.wxml-->
 <view class="img_box">
-  <view class="imgs" wx:for="{{tempFilePaths}}" wx:key="index">
+  <view class="imgs" wx:for="{{tempFilePaths}}" wx:key="index" wx:if="{{tempFilePaths.length > 0}}">
     <image src='{{item}}' bindlongpress="deleteImage" bindtap="previewImage" data-index="{{index}}" mode='widthFix' />
   </view>
   <view class="imgs">
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index 53de302..3b125fc 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -1,10 +1,11 @@
 // pages/meeting/meeting.js
 import {
-  previewFile
+  previewFile,sliceFileTypeByFileName
 } from '../../assets/js/preview'
 
 import MeetingApi from '../../assets/js/http/meetingApi'
 import signUpApi from '../../assets/js/http/signUp'
+import UserApi from '../../assets/js/http/userApi'
 import {
   baseUrl,
   URL_CONFIG
@@ -31,7 +32,8 @@ Page({
     // 缴费凭证的回显
     payRecordImgSrc: '',
     // 签到图片的回显
-    signImgSrc: ''
+    signImgSrc: '',
+    userId:''
   },
 
   // 获取图片的id
@@ -73,7 +75,7 @@ Page({
       } else {
         wx.showToast({
           title: res.message,
-          icon: "error",
+          icon: "none",
           duration: 800,
         });
       }
@@ -141,8 +143,31 @@ Page({
   // 预览
   previewFile(e) {
     const fileObj = e.currentTarget.dataset.file
-    previewFile(fileObj.id, fileObj.name)
+    let fileType = sliceFileTypeByFileName(fileObj.name)
+    // 文件类型不是docx，doc，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){
+          wx.showToast({
+            title: '文件已发送到您的邮箱',
+            icon: 'none'
+          })
+        }else{
+          wx.showToast({
+            title: res.message,
+            icon: "none"
+          })
+        }
+      })
+    }else {
+      previewFile(fileObj.fileId, fileObj.name)
+    }
   },
+  
   /**
    * 生命周期函数--监听页面加载
    */
@@ -155,6 +180,15 @@ Page({
     this.setData({
       meetingInfo: meetingInfo
     })
+
+    wx.getStorage({
+      key: 'userInfo',
+      success(res){
+        that.setData({
+          userId: res.data.id
+        })
+      }
+    })
     //
     let {
       meetingFiles,
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 5dc50b4..6436b50 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -135,7 +135,7 @@
 		<!-- 缴费方式为线上的显示 -->
 		<view class="p-20" wx:if="{{singInPersonInfo.payMode === 2 && singInPersonInfo.checkResult !== 1 }}">
 			<text class="validate">缴费订单号后四位数</text>
-			<input class="input" placeholder="请输入订单号后四位数" value="{{ordeCode}}" bindblur="setOrdeCode" />
+			<input class="input" maxlength="4" placeholder="请输入缴费订单号后四位数" value="{{ordeCode}}" bindblur="setOrdeCode" />
 		</view>
 		<!-- 审核通过后的订单后四位 -->
 		<view class="p-20" wx:if="{{ singInPersonInfo.checkResult === 1 }}">