Merge remote-tracking branch 'origin/master'

jiangping

2025-03-11 fb7fa6a1deb4b52da8e7708265a927b3cf4564b8

 admin/src/views/task/dangetDetail.vue

@@ -258,6 +258,7 @@
              class="avatar-uploader"
              :action="uploadUrl"
              :show-file-list="false"
              :on-error="uploadError"
              :on-success="handleAvatarSuccess"
              :before-upload="beforeAvatarUpload"
            >
@@ -291,6 +292,7 @@
              :action="uploadUrl"
              :show-file-list="false"
              :on-success="handleAfterSuccess"
              :on-error="uploadError"
              :before-upload="beforeAvatarUpload"
            >
              <img v-if="param.url" :src="param.url" class="avatar" />
@@ -360,6 +362,7 @@
              :action="uploadUrl"
              :show-file-list="false"
              :on-success="handleBackSuccess"
              :on-error="uploadError"
              :before-upload="beforeAvatarUpload"
            >
              <div class="upload_box">
@@ -406,6 +409,7 @@
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import { memberList } from '@/api/business/hiddenDangerParam'
import { Loading } from 'element-ui'
import {
  uploadFile,
  hiddenDangerDetail,
@@ -420,7 +424,7 @@
      id: '',
      type: '',
      uploadUrl: uploadFile,

      loadingInstance: false,
      title: '访客预约详情',
      isShowModal: false,
      info: {},
@@ -560,6 +564,11 @@
    },
    reject () { },
    handleAvatarSuccess (res) {
      this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
        if(this.loadingInstance){
          this.loadingInstance.close()
        }
      })
      if (res.code === 200) {
        const str = res.data.url.indexOf('png') > 0 || res.data.url.indexOf('jpg') > 0
        const arr = this.handleParam.dealBeforeFileList || []
@@ -572,6 +581,11 @@
      }
    },
    handleAfterSuccess (res) {
      this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
        if(this.loadingInstance){
          this.loadingInstance.close()
        }
      })
      if (res.code === 200) {
        const str = res.data.url.indexOf('png') > 0 || res.data.url.indexOf('jpg') > 0
        const arr = this.handleParam.dealAfterFileList || []
@@ -584,6 +598,11 @@
      }
    },
    handleBackSuccess (res) {
      this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
        if(this.loadingInstance){
          this.loadingInstance.close()
        }
      })
      if (res.code === 200) {
        const str = res.data.url.indexOf('png') > 0 || res.data.url.indexOf('jpg') > 0
        const arr = this.backForm.dealBeforeFileList || []
@@ -595,12 +614,25 @@
        this.$set(this.backForm, 'dealBeforeFileList', arr)
      }
    },
    beforeAvatarUpload () { }
    beforeAvatarUpload () {
      this.loadingInstance = Loading.service({
        lock: true,
        text: 'Loading',
        spinner: 'el-icon-loading',
        background: 'rgba(0, 0, 0, 0.7)'
      })
    },
    uploadError() {
      this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
        this.loadingInstance.close()
      })
    },
  }
}
</script>

<style lang="scss" scoped>
@import "@/assets/style/variables.scss";
.upload_wrap {
  display: flex;
  flex-wrap: wrap;
@@ -800,7 +832,7 @@
          font-size: 13px;
          color: #888888;
          .status {
            color: #00ba67;
            color: $primaryColor;
          }
        }
        .m_content {