MrShi
2024-02-28 97fc2c4510f290995f8b610d1cd095643663b796
mrshi
已修改3个文件
101 ■■■■■ 文件已修改
admin/src/views/business/userAction.vue 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/cropping/cropping.vue 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/userinfo/userinfo.vue 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/userAction.vue
@@ -80,15 +80,16 @@
                <el-table-column label="历史状态">
                    <template slot-scope="{row}">
                        <span v-if="row.beforeStatus === 0">解冻</span>
                        <span v-if="row.beforeStatus === 1">冻结</span>
                        <span v-if="row.beforeStatus === 2">拉黑</span>
                        <span v-if="row.beforeStatus === 3">恢复</span>
                        <span v-if="row.beforeStatus === 4">设为拜访人</span>
                        <span v-if="row.beforeStatus === 5">取消拜访人</span>
                        <span v-if="row.beforeStatus === 6">设为高级审批人</span>
                        <span v-if="row.beforeStatus === 7">取消高级审批人</span>
                        <span v-if="row.beforeStatus === 8">手动离场</span>
                        <span v-if="row.beforeStatus === 8">删除</span>
                        <span v-else-if="row.beforeStatus === 1">冻结</span>
                        <span v-else-if="row.beforeStatus === 2">拉黑</span>
                        <span v-else-if="row.beforeStatus === 3">恢复</span>
                        <span v-else-if="row.beforeStatus === 4">设为拜访人</span>
                        <span v-else-if="row.beforeStatus === 5">取消拜访人</span>
                        <span v-else-if="row.beforeStatus === 6">设为高级审批人</span>
                        <span v-else-if="row.beforeStatus === 7">取消高级审批人</span>
                        <span v-else-if="row.beforeStatus === 8">手动离场</span>
                        <span v-else-if="row.beforeStatus === 9">删除</span>
                        <span v-else>-</span>
                    </template>
                </el-table-column>
                <el-table-column label="操作">
@@ -102,7 +103,7 @@
                        <span v-if="row.type === 6">设为高级审批人</span>
                        <span v-if="row.type === 7">取消高级审批人</span>
                        <span v-if="row.type === 8">手动离场</span>
                        <span v-if="row.type === 8">删除</span>
                        <span v-if="row.type === 9">删除</span>
                    </template>
                </el-table-column>
                <el-table-column prop="createDate" label="操作时间"></el-table-column>
h5/pages/cropping/cropping.vue
@@ -14,7 +14,7 @@
        </view>
    </view>
</template>
<script>
    export default {
        data() {
@@ -104,17 +104,19 @@
                            this.preImgW = w;
                            // 设置蒙层
                            this.setBgBox();
                            // 图像预览
                            this.previewCanvas({
                                w,
                                h,
                                path
                            });
                            setTimeout(() => {
                                // 图像预览
                                this.previewCanvas({
                                    w,
                                    h,
                                    path
                                });
                            }, 500)
                        }
                    }
                });
            },
            // 设置蒙层
            setBgBox() {
                const {
@@ -148,6 +150,7 @@
                h,
                path
            }) {
                console.log(path, w, h)
                const ctx = uni.createCanvasContext('mycanvas');
                ctx.drawImage(path, 0, 0, w, h);
                ctx.draw();
@@ -189,7 +192,7 @@
                    let y = (res[0].height - res[0].width) / 2;
                    /**
                     * 判断照片可移动的距离是否大于留白的值,如果大于向右划时图片的宽减去基准框的宽减去留白向左时留白,小于时按图片的可移动值
                     * */
                     * */
                    let x = (preImgW - maxW) / 2 > 40 ? (fx < 0 ? preImgW - maxW - 40 : 40) : (preImgW - maxW) / 2;
                    if (preImgH > maxH) {
                        this.y = this.y > y ? y : this.y < -y ? -y : this.y;
@@ -228,14 +231,10 @@
                        destHeight: maxH,
                        canvasId: 'mycanvas',
                        success: fileRes => {
                            console.log(fileRes);
                            uni.previewImage({
                                count: 1,
                                urls: [fileRes.tempFilePath]
                            });
                            uni.$emit('update', fileRes)
                            uni.navigateBack({ delta: 1 });
                        },
                        fail: function(err) {
                            console.log(err);
                            uni.showToast({
                                title: '上传失败:图片生成过程中遇到错误',
                                icon: 'none'
@@ -247,19 +246,19 @@
        }
    };
</script>
<style lang="scss" scoped>
    .settingHeadImage {
        background-color: #000000;
        overflow: hidden;
        .pre-canvas {
            position: fixed;
            top: 0;
            left: 0;
            z-index: 20;
        }
        .preImage {
            min-width: 100vw;
            height: 100vh;
@@ -268,12 +267,12 @@
            align-items: center;
            overflow: hidden;
            z-index: 1;
            .pre-i {
                // transition: all 0.1s;
            }
        }
        .setting-btns {
            position: fixed;
            bottom: 0;
h5/pages/userinfo/userinfo.vue
@@ -73,6 +73,7 @@
            return {
                show: false,
                visit: '',
                type: '',
                columns: [[{name: '身份证', id: 0}, {name: '港澳证件', id: 1},{name: '护照', id: 2}]],
                fileList: [],
                visitorData: {
@@ -93,6 +94,9 @@
        onLoad(option) {
            this.visitorData.userAnswerId = option.userAnswerId
            this.getVisit()
            uni.$on('update', (data) => {
                this.uploadImg(data.tempFilePath)
            })
        },
        methods: {
@@ -150,14 +154,41 @@
                    }
                })
            },
            uploadImg(file) {
                uni.showLoading({ title: '上传中', mask: true });
                uni.uploadFile({
                    url: `${this.$baseUrl}public/api/uploadFtp.do`,
                    filePath: file,
                    name: 'file',
                    formData: {
                        folderCode: 'MEMBER_IMG'
                    },
                    success: (uploadFileRes) => {
                        let res = JSON.parse(uploadFileRes.data)
                        if (this.type === 'faceImg') {
                            this.visitorData.faceImg = res.data.halfPath
                            this.visitorData.faceImgUrl = res.data.prefixPath + res.data.folder + res.data.halfPath
                        } else {
                            this.visitorData.imgurl = res.data.halfPath
                            this.visitorData.imgurlUrl = res.data.prefixPath + res.data.folder + res.data.halfPath
                        }
                    },
                    complete() {
                        uni.hideLoading();
                    }
                });
            },
            upload(type) {
                this.type = type
                uni.chooseImage({
                    count: 1,
                    success: (chooseImageRes) => {
                        // console.log(chooseImageRes.tempFilePaths[0])
                        uni.navigateTo({
                            url: `/pages/cropping/cropping?item=${JSON.stringify({ tempFilePath: chooseImageRes.tempFilePaths[0] })}`
                        })
                        return
                        if (type === 'faceImg') {
                            uni.navigateTo({
                                url: `/pages/cropping/cropping?item=${JSON.stringify({ tempFilePath: chooseImageRes.tempFilePaths[0] })}`
                            })
                            return
                        }
                        uni.showLoading({ title: '上传中', mask: true });
                        for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
                            uni.uploadFile({