ymz 2 ماه پیش
والد
کامیت
399993ce50

BIN
dist.zip


+ 1 - 0
src/components/uploadImg/index.vue

@@ -161,6 +161,7 @@ const addWatermark = (fileUrl: string) => {
         }
         const time =
           new Date().toJSON().substring(0, 10) + ' ' + new Date().toTimeString().substring(0, 8)
+
         const ctx = uni.createCanvasContext('myCanvas', _this)
         ctx.drawImage(fileUrl, 0, 0, thumbWidth.value, thumbHeight.value) //先画出图片
         ctx.setFontSize(30) //注意:设置文字大小必须放在填充文字之前,否则不生效

+ 5 - 4
src/pages/task/task-detail/components/imgCom.vue

@@ -25,7 +25,9 @@
 
 <script setup lang="ts">
 import { onMounted, ref, getCurrentInstance } from 'vue'
+// #ifdef H5
 import heic2any from 'heic2any'
+// #endif
 
 const props = defineProps({
   item: Object,
@@ -66,14 +68,12 @@ const preImg = (imgList: any[], index: number) => {
     urls: arr
   })
 }
+
+// #ifdef H5
 const errorImage = async (item: any, index: number) => {
-  // #ifdef H5
   await handleImage(item, index)
-
-  // #endif
 }
 const instance = getCurrentInstance()
-
 const imgValue = ref('')
 const handleImage = async (item: any, index: number) => {
   let url = item.path
@@ -114,6 +114,7 @@ const isHeicFile = (file: any) => {
     reader.readAsArrayBuffer(file)
   })
 }
+// #endif
 </script>
 
 <style lang="scss" scoped>

+ 3 - 0
src/pages/task/task-detail/components/selectCom.vue

@@ -23,6 +23,9 @@ const getVal = () => {
   const arr = ['51', '52', '53']
   // 拜访类任务
   if (arr.includes(props.item?.taskTypeId) && props?.item.taskFiledKey === 'temp24') {
+    if (props?.detailInfo?.wmTaskContent['temp10']) {
+      return props?.detailInfo?.wmTaskContent['temp10']
+    }
     return props?.detailInfo?.wmTaskContent['temp24label']
   }
   const taskFiledKey = props?.item.taskFiledKey