From c3501daa1d6cf6f0cb8428afcaa329755ca16621 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 六月 2024 16:40:30 +0800
Subject: [PATCH] ‘’
---
h5/api/index.js | 2
h5/pages/staff/meetingSubOrder.vue | 2
h5/utils/config.js | 3
h5/pages/staff/index.vue | 3
h5/pages/staff/snapshot.vue | 101 ++++++++++++++++---------
h5/api/staff.js | 1
h5/App.vue | 4
admin/src/views/operation/serviceCar/apprConfig.vue | 2
h5/pages/staff/vehicle/applePeo.vue | 71 ++++++++++-------
h5/pages/userinfo/userinfo.vue | 6
h5/static/redirect.html | 3
h5/pages/staff/vehicle/apply.vue | 4
12 files changed, 124 insertions(+), 78 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprConfig.vue b/admin/src/views/operation/serviceCar/apprConfig.vue
index 9f2d3e6..4e203a3 100644
--- a/admin/src/views/operation/serviceCar/apprConfig.vue
+++ b/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>
diff --git a/h5/App.vue b/h5/App.vue
index 7306882..c8be8f8 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -30,8 +30,8 @@
// 鍒锋柊token
const token = uni.getStorageSync('token')
if(token){
- // refreshToken().then(res => {
- // if(res.code && res.code === 200){
+ // refreshToken().then(res => {
+ // if(res.code && res.code === 200){
// this.$store.commit('setToken', res.data)
// }
// })
diff --git a/h5/api/index.js b/h5/api/index.js
index 6c90980..b4daa7c 100644
--- a/h5/api/index.js
+++ b/h5/api/index.js
@@ -4,6 +4,8 @@
export * from './staff'
export * from './meeting'
+
+
// 鏌ヨ瀛楀吀鍊兼暟鎹�
export const getSystemDictData = (data) => {
return http({
diff --git a/h5/api/staff.js b/h5/api/staff.js
index feebb25..c9688d4 100644
--- a/h5/api/staff.js
+++ b/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
})
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index dedc392..aa3b76f 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -84,6 +84,9 @@
},
onLoad(){
console.log('userInfo', this.userInfo);
+
+ },
+ onShow() {
this.getTaskInfo()
},
methods: {
diff --git a/h5/pages/staff/meetingSubOrder.vue b/h5/pages/staff/meetingSubOrder.vue
index 18d5a41..f12e3dd 100644
--- a/h5/pages/staff/meetingSubOrder.vue
+++ b/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>
diff --git a/h5/pages/staff/snapshot.vue b/h5/pages/staff/snapshot.vue
index a72a86b..0c80c25 100644
--- a/h5/pages/staff/snapshot.vue
+++ b/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++) {
- uni.uploadFile({
- url: `${uploadUrl}`,
- filePath: chooseImageRes.tempFilePaths[i],
+ const tempFilePaths = chooseImageRes.tempFilePaths
+ let imgs = tempFilePaths.map((value, index) => {
+ return {
name: 'file',
- formData: {
- folderCode: '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()
- }
+ uri: value
+ }
+ })
+ uni.uploadFile({
+ url: `${uploadUrl}`,
+ files: imgs,
+ name: 'file',
+ formData: {
+ folder: 'HIDDEN_DANGER_FILE'
+ },
+ success: (uploadFileRes) => {
+ let res = JSON.parse(uploadFileRes.data)
+ 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;
}
}
}
diff --git a/h5/pages/staff/vehicle/applePeo.vue b/h5/pages/staff/vehicle/applePeo.vue
index 8dc231d..52d13c5 100644
--- a/h5/pages/staff/vehicle/applePeo.vue
+++ b/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)=>{
+ 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) {
+ // this.memberList.forEach(mem => {
+ // if(item.id === mem.id){
+ // item.checked = !item.checked
+ // }
+ // })
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
- // }
- // })
- // return obj
- // })
- // this.selList = arrTemp
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>
@@ -302,7 +313,7 @@
}
}
}
- .checked{
+ .checked {
width: 48rpx;
}
}
diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index e9211a0..61bed1d 100644
--- a/h5/pages/staff/vehicle/apply.vue
+++ b/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')
},
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index 0ad93e5..b6200c8 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/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: {
diff --git a/h5/static/redirect.html b/h5/static/redirect.html
index fa9e857..b86e4aa 100644
--- a/h5/static/redirect.html
+++ b/h5/static/redirect.html
@@ -6,7 +6,8 @@
<script>
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/notice/notice?' + p[1]
+ // window.location.href = 'http://xiaopiqiu2.natapp1.cc/#/pages/staff/index?' + p[1]
</script>
</head>
<body>
diff --git a/h5/utils/config.js b/h5/utils/config.js
index aff5d77..fec6301 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,3 +1,4 @@
export const baseUrl = 'api/'
-export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
\ No newline at end of file
+export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
+export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`
--
Gitblit v1.9.3