From 97fc2c4510f290995f8b610d1cd095643663b796 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 28 二月 2024 15:42:28 +0800
Subject: [PATCH] mrshi
---
admin/src/views/business/userAction.vue | 21 +++++-----
h5/pages/cropping/cropping.vue | 39 +++++++++----------
h5/pages/userinfo/userinfo.vue | 41 ++++++++++++++++++--
3 files changed, 66 insertions(+), 35 deletions(-)
diff --git a/admin/src/views/business/userAction.vue b/admin/src/views/business/userAction.vue
index 29c359f..a23c5a9 100644
--- a/admin/src/views/business/userAction.vue
+++ b/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>
diff --git a/h5/pages/cropping/cropping.vue b/h5/pages/cropping/cropping.vue
index cae2d62..8d590ad 100644
--- a/h5/pages/cropping/cropping.vue
+++ b/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;
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index ae9cb78..0c56d64 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/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({
--
Gitblit v1.9.3