liukangdong
2024-06-07 c3501daa1d6cf6f0cb8428afcaa329755ca16621
‘’
已修改12个文件
178 ■■■■■ 文件已修改
admin/src/views/operation/serviceCar/apprConfig.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/App.vue 补丁 | 查看 | 原始文档 | blame | 历史
h5/api/index.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/api/staff.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/index.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/meetingSubOrder.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/snapshot.vue 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/vehicle/applePeo.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/vehicle/apply.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/userinfo/userinfo.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/static/redirect.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/utils/config.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/operation/serviceCar/apprConfig.vue
@@ -13,7 +13,7 @@
          <div class="config_content">
            <div class="item">
              <div class="head">发起人</div>
              <div class="content">访客</div>
              <div class="content">内部员工</div>
            </div>
            <div class="arrows">
              <div class="line"></div>
h5/App.vue
h5/api/index.js
@@ -4,6 +4,8 @@
export * from './staff'
export * from './meeting'
// 查询字典值数据
export const getSystemDictData = (data) => {
  return http({
h5/api/staff.js
@@ -31,6 +31,7 @@
export const findTypeMemberInfo = (data) => {
  return http({
    url: 'visitsAdmin/cloudService/business/member/findTypeMemberInfo',
    // url: 'visitsAdmin/cloudService/business/member/page',
    method: 'post',
    data
  })
h5/pages/staff/index.vue
@@ -84,6 +84,9 @@
    },
    onLoad(){
        console.log('userInfo', this.userInfo);
    },
    onShow() {
        this.getTaskInfo()
    },
    methods: {
h5/pages/staff/meetingSubOrder.vue
@@ -67,7 +67,6 @@
            <text
              v-else
              class="placeholder9"
              @click="$jump('/pages/staff/memberSel')"
              >请选择</text
            >
          </view>
@@ -75,7 +74,6 @@
            name="arrow-right"
            color="#999999"
            size="14"
            @click="$jump('/pages/staff/memberSel')"
          />
        </view>
      </view>
h5/pages/staff/snapshot.vue
@@ -55,15 +55,20 @@
            class="adduser_list_item_ipt1_upload"
            v-for="(item, i) in submitFileList"
            :key="i"
            ><image
          >
            <u-icon
              class="close"
              size="20"
              name="close-circle-fill"
              color="red"
              @click="fileDel(i)"
            ></u-icon>
            <image
              v-if="item.type == 0"
              :src="item.fileurlFull"
              mode="widthFix"
            ></image
            ><video
              v-if="item.type == 1"
              :src="item.fileurlFull"
            ></video
            ><video v-if="item.type == 1" :src="item.fileurlFull"></video
          ></view>
        </view>
      </view>
@@ -266,38 +271,53 @@
        url: '/pages/staff/memberSel'
      })
    },
    fileDel(i) {
      this.submitFileList.splice(i, 1)
    },
    uploadImage() {
      this.showUpload = false
      uni.chooseImage({
        count: 1,
        count: 4,
        success: (chooseImageRes) => {
          console.log('chooseImageRes.tempFilePaths', chooseImageRes.tempFilePaths)
          uni.showLoading({ title: '上传中', mask: true })
          for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
          const tempFilePaths = chooseImageRes.tempFilePaths
          let imgs = tempFilePaths.map((value, index) => {
            return {
              name: 'file',
              uri: value
            }
          })
            uni.uploadFile({
              url: `${uploadUrl}`,
              filePath: chooseImageRes.tempFilePaths[i],
            files: imgs,
              name: 'file',
              formData: {
                folderCode: 'HIDDEN_DANGER_FILE'
              folder: 'HIDDEN_DANGER_FILE'
              },
              success: (uploadFileRes) => {
                let res = JSON.parse(uploadFileRes.data)
                console.log('res', res)
                let obj = {
                  type: '0'
                }
                obj.fileurl = res.data.halfPath
                obj.fileurlFull = res.data.addr
                this.submitFileList.push(obj)
              },
              complete() {
                if (i === chooseImageRes.tempFilePaths.length - 1) {
                  uni.hideLoading()
                }
              }
              console.log('res', res.data)
              if (res.data && res.data.length > 0) {
                res.data.forEach(i => {
                  i.type = 0
                  i.fileurl = i.imgaddr
                  i.fileurlFull = i.url
                  this.submitFileList.push(i)
            })
          }
            },
            fail(err) {
              console.log('err', err)
            },
            complete() {
              uni.hideLoading()
              // if (i === chooseImageRes.tempFilePaths.length - 1) {
              //   uni.hideLoading()
              // }
            }
          })
          // }
        }
      })
    },
@@ -312,17 +332,18 @@
            filePath: chooseImageRes.tempFilePath,
            name: 'file',
            formData: {
              folderCode: 'HIDDEN_DANGER_FILE'
              folder: 'HIDDEN_DANGER_FILE'
            },
            success: (uploadFileRes) => {
              let res = JSON.parse(uploadFileRes.data)
              console.log('res', res)
              let obj = {
                type: '1'
              if (res.data && res.data.length > 0) {
                res.data.forEach(i => {
                  i.type = 1
                  i.fileurl = i.imgaddr
                  i.fileurlFull = i.url
                  this.submitFileList.push(i)
                })
              }
              obj.fileurl = res.data.halfPath
              obj.fileurlFull = res.data.addr
              this.submitFileList.push(obj)
            },
            complete() {
              uni.hideLoading()
@@ -390,13 +411,19 @@
      display: flex;
      align-items: center;
      justify-content: center;
      overflow: hidden;
      position: relative;
      .close {
        position: absolute;
        right: -20rpx;
        top: -20rpx;
      }
      image {
        width: 100%;
        height: 100%;
      }
      video {
        width: 100%;
        max-height: 160rpx;
      }
    }
  }
h5/pages/staff/vehicle/applePeo.vue
@@ -113,43 +113,66 @@
      param: {},
      selList: [],
      isShowSelMem: false
      isShowSelMem: false,
      pagination: {
        capacity: 20,
        page: 1
      },
    }
  },
  onLoad() {
    this.initData()
  },
  onReachBottom() {
    // if(){}
  },
  mounted() {
    this.$eventBus.$on('applePeoDetail', (res)=>{
      res.forEach(item => {
        this.changeMem(item)
        this.memberList.forEach(mem => {
          if (item.id === mem.id) {
            mem.checked = !mem.checked
          }
      })
      this.$nextnick(() => {
      })
      this.selList = this.memberList.filter(i => i.checked)
      this.$nextTick(() => {
        this.$forceUpdate()
      })
    })
  },
  methods: {
    initData() {
      const { param, pagination } = this
      findTypeMemberInfo({
        // model: {
        name: param.name,
        // },
        type: '2',
        ...pagination
      }).then(res => {
        this.memberList = res.data || []
        this.memberList.forEach(i => {
          i.checked = false
        })
      })
    },
    onSubmit() {
      if (this.selList.length === 0) return uni.showToast({
        title: '请先选择人员',
        icon: 'none'
      })
      this.$eventBus.$emit('applePeo', this.selList)
      uni.navigateBack()
    },
    changeMem(item, index) {
      item.checked = !item.checked
      this.selList = this.memberList.filter(i => i.checked)
      // const arr = e.detail.value
      // let arrTemp = arr.map(item => {
      //   let obj = {}
      //   this.memberList.forEach(ite => {
      //     if (item == ite.id) {
      //       obj.name = ite.name.split('-')[0]
      //       obj.componey = ite.name.split('-')[1] || ''
      //       obj.id = ite.id
      // this.memberList.forEach(mem => {
      //   if(item.id === mem.id){
      //     item.checked = !item.checked
      //     }
      //   })
      //   return obj
      // })
      // this.selList = arrTemp
      item.checked = !item.checked
      this.selList = this.memberList.filter(i => i.checked)
      this.$forceUpdate()
    },
    handleRemove(item) {
@@ -161,18 +184,6 @@
      // console.log(this.memberList);
      this.$forceUpdate()
    },
    initData() {
      const { param } = this
      findTypeMemberInfo({
        name: param.name,
        type: '2'
      }).then(res => {
        this.memberList = res.data || []
        this.memberList.forEach(i => {
          i.checked = false
        })
      })
    }
  }
};
</script>
h5/pages/staff/vehicle/apply.vue
@@ -202,7 +202,9 @@
    },
    selPeople() {
      if(this.param.memberList && this.param.memberList.length > 0){
        this.$eventBus.$emit('applePeoDetail', this.param.memberList)
        setTimeout(() => {
          this.$eventBus.$emit('applePeoDetail', this.param.memberList || [])
        }, 500)
      }
      this.$jump('/pages/staff/vehicle/applePeo')
    },
h5/pages/userinfo/userinfo.vue
@@ -74,7 +74,7 @@
    import tlyPictureCut from "@/components/tly-picture-cut/tlyPictureCut.vue";
    import QfImageCropper from '@/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue';
    import { mapState } from 'vuex'
    import { uploadUrl } from "@/utils/config"
    import { uploadAvatar } from "@/utils/config"
    import { getSystemDictData, visitorSub } from '@/api'
    export default {
        data() {
@@ -202,7 +202,7 @@
                that.$refs.cropper.close()
                uni.showLoading({ title: '上传中', mask: true });
                uni.uploadFile({
                    url: uploadUrl,
                    url: uploadAvatar,
                    filePath: file.tempFilePath,
                    name: 'file',
                    formData: {
@@ -238,7 +238,7 @@
                        if (type === 'imgurl') {
                            uni.showLoading({ title: '上传中', mask: true });
                            uni.uploadFile({
                                url: uploadUrl,
                                url: uploadAvatar,
                                filePath: chooseImageRes.tempFilePaths[0],
                                name: 'file',
                                formData: {
h5/static/redirect.html
@@ -7,6 +7,7 @@
    var p = location.href.split("?")
    // window.location.href = 'https://dmtest.ahapp.net/hsvisit_h5/#/pages/notice/notice?' + p[1]
    window.location.href = 'http://xiaopiqiu2.natapp1.cc/#/pages/notice/notice?' + p[1]
      // window.location.href = 'http://xiaopiqiu2.natapp1.cc/#/pages/staff/index?' + p[1]
  </script>
</head>
<body>
h5/utils/config.js
@@ -1,3 +1,4 @@
export const baseUrl = 'api/'
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`