Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components

Tevin

2022-03-02 cb3098b11e63171ea13865e9ea67e19fe15ef079

 forms/imagePicker/CImagePicker.vue

@@ -32,6 +32,7 @@
import Taro from '@tarojs/taro';
import { $ } from '@tarojs/extend';
import { AtInput, AtImagePicker, AtCurtain } from 'taro-ui-vue';
import { Fetcher } from '@components/bases/Fetcher';
import { $fetchCommon } from '@fetchers/FCommon';
import { Tools } from '@components/common/Tools';
import CImageCompressor from './CImageCompressor.vue';
@@ -55,7 +56,9 @@
        },
    },
    data() {
        return {};
        return {
            fileNames: {},
        };
    },
    computed: {
        files() {
@@ -77,6 +80,10 @@
            const value = [];
            files.forEach(file => {
                value.push(file.url);
                // 记录原文件名
                if (file.file && file.file.originalFileObj) {
                    this.fileNames[file.url] = file.file.originalFileObj.name;
                }
            });
            this.itemRes.onChange(value);
        },
@@ -160,7 +167,6 @@
            this.showImg = false;
        },
        handleFail(msg) {
            console.log(msg);
            Taro.showToast({
                title: msg,
                icon: 'none',
@@ -169,20 +175,37 @@
            });
        },
        $uploadImage(callback) {
            const url = $fetchCommon.getUploadImgURL();
            const url = Fetcher.host + $fetchCommon.getUploadImgURL();
            const uploadTeam = [];
            const imgs = [];
            this.files.forEach(file => {
                if (file.type === 'btn') {
                    return;
                }
                // blob 临时文件才上传
                if (file.url.indexOf('blob') >= 0) {
                // 临时文件才上传
                if (
                    file.url.indexOf('blob') >= 0 ||
                    file.url.indexOf('wxfile') >= 0 ||
                    file.url.indexOf('http://tmp/') >= 0
                ) {
                    let header = {};
                    if (process.env.TARO_ENV === 'weapp') {
                        const localCookies = JSON.parse(
                            Taro.getStorageSync('cookies') || '{}'
                        );
                        const cookiesArr = [];
                        Object.keys(localCookies).forEach(key => {
                            cookiesArr.push(key + '=' + localCookies[key]);
                        });
                        header['Cookie'] = cookiesArr.join('; ');
                    }
                    uploadTeam.push(
                        new Promise((resolve, reject) => {
                            Taro.uploadFile({
                                url,
                                header,
                                filePath: file.url,
                                fileName: this.fileNames[file.url],
                                name: 'file',
                                formData: {},
                                success(res) {
@@ -194,7 +217,9 @@
                                        resolve(
                                            $fetchCommon.transImgPath(
                                                'fix',
                                                res2.data.src
                                                res2.data.src ||
                                                    res2.data.file ||
                                                    res2.data.url
                                            )
                                        );
                                    } else {