From 446276295e2185963d228f8c7c13a41303b3a681 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Sat, 15 Jul 2023 16:17:31 +0800
Subject: [PATCH] Merge branch 'temp'
---
forms/imagePicker/CImagePicker.vue | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/forms/imagePicker/CImagePicker.vue b/forms/imagePicker/CImagePicker.vue
index 6ebd882..33de729 100644
--- a/forms/imagePicker/CImagePicker.vue
+++ b/forms/imagePicker/CImagePicker.vue
@@ -25,6 +25,7 @@
:onImageClick="(index, file)=>handleImgView(index,file)"
/>
<CImageCompressor ref="compressor" />
+ <CImagePreview ref="imgPreview" />
</view>
</template>
@@ -36,12 +37,14 @@
import { $fetchCommon } from '@fetchers/FCommon';
import { Tools } from '@components/common/Tools';
import CImageCompressor from './CImageCompressor.vue';
+import CImagePreview from './CImagePreview.vue';
import './cImagePicker.scss';
export default {
name: 'CImagePicker',
components: {
CImageCompressor,
+ CImagePreview,
AtInput,
AtImagePicker,
AtCurtain,
@@ -53,6 +56,11 @@
count: {
type: Number,
default: 1,
+ },
+ // 上传图片参数
+ params: {
+ type: Object,
+ default: () => {},
},
},
data() {
@@ -158,7 +166,8 @@
const urls = this.files
.map(file => (file.type === 'btn' ? false : file.url))
.filter(Boolean);
- Taro.previewImage({
+ // 图片预览，支持H5模式下的双指缩放
+ this.$refs.imgPreview.$preview({
current: file.url, // 当前显示图片的http链接
urls, // 需要预览的图片http链接列表
});
@@ -186,16 +195,20 @@
file.fileName = this.fileNames[file.url];
files.push(file);
});
- uploadImage(files, (state, res) => {
- if (state === 'success') {
- this.itemRes.onChange(res);
- setTimeout(() => {
- callback(state);
- }, 10);
- } else if (state === 'error') {
- callback(state, res);
- }
- });
+ uploadImage(
+ files,
+ (state, res) => {
+ if (state === 'success') {
+ this.itemRes.onChange(res);
+ setTimeout(() => {
+ callback(state);
+ }, 10);
+ } else if (state === 'error') {
+ callback(state, res);
+ }
+ },
+ this.params
+ );
},
},
mounted() {
@@ -214,7 +227,7 @@
// 图片上传节流
const _readyUpload = {};
-export const uploadImage = (files, callback) => {
+export const uploadImage = (files, callback, params) => {
if (!files || files.length === 0) {
callback('success', []);
return;
@@ -258,7 +271,8 @@
...requestFile,
header,
name: 'file',
- formData: {},
+ formData: { ...params },
+ timeout: 30 * 1000,
success(res) {
const res2 =
typeof res.data === 'string'
--
Gitblit v1.9.1