From c963fe11c7f9010d51b4a27f1fc0f27a7056dba0 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 16 Apr 2025 14:57:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=9F=9Capi=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=92=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=AF=A6=E6=83=85=E6=97=A5=E5=BF=97=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=BA=BF=E5=92=8C=E8=B4=A7=E6=9F=9C=E5=95=86=E5=93=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Upload/Images.vue | 44 +++++++++---- src/views/hard/hard-door-manager/index.vue | 77 ++++++++++++++++++++++ src/views/hard/hard-spu/form.vue | 2 +- src/views/hard/hard-spu/index.vue | 13 +++- src/views/hard/third-door-log/index.vue | 3 +- 5 files changed, 123 insertions(+), 16 deletions(-) diff --git a/src/components/Upload/Images.vue b/src/components/Upload/Images.vue index a04bad4..6b23200 100644 --- a/src/components/Upload/Images.vue +++ b/src/components/Upload/Images.vue @@ -167,17 +167,39 @@ watch( return } - fileList.value = newValue - .split(",") - .map((item: string) => { - const url = item.startsWith("http") ? item : imageBaseUrl + item - return { - name: item.split("/").pop() || "", - url: url, - fileUrl: item, - } - }) - .filter((item) => item.url) + if (!newValue.match(/x-oss-process/g)) { + fileList.value = newValue + .split(",") + .map((item: string) => { + const url = item.startsWith("http") ? item : imageBaseUrl + item + return { + name: item.split("/").pop() || "", + url: url, + fileUrl: item, + } + }) + .filter((item) => item.url) + + console.log("fileList.value", fileList.value) + } else { + fileList.value = newValue + .split("?") + .filter( + (item) => + item.endsWith(".jpg") || item.endsWith(".png") || item.endsWith(".gif") || item.endsWith(".jpeg") || item.endsWith(".webp"), + ) + .map((item: string) => { + const url = item.startsWith("http") ? item : imageBaseUrl + item + return { + name: item.split("/").pop() || "", + url: url, + fileUrl: item, + } + }) + .filter((item) => item.url) + + console.log("fileList.value", fileList.value) + } }, { immediate: true }, ) diff --git a/src/views/hard/hard-door-manager/index.vue b/src/views/hard/hard-door-manager/index.vue index da69135..709e4af 100644 --- a/src/views/hard/hard-door-manager/index.vue +++ b/src/views/hard/hard-door-manager/index.vue @@ -177,6 +177,18 @@ + + + + + +
+ {{ "121121" }} +
+ + + + @@ -436,4 +448,69 @@ const deleteGoods = async (v: any) => { } } } +.el-timeline-right-content { + display: flex; + align-items: center; + min-height: 30px; + padding: 10px; + background-color: #409eff; + + &::before { + position: absolute; + top: 10px; + left: 13px; + border-color: transparent #409eff transparent transparent; + border-style: solid; + border-width: 8px; + content: ""; + } +} +// 时间线样式调整 +:deep(.el-timeline) { + margin: 10px 0 0 160px; + + .el-timeline-item__wrapper { + position: relative; + top: -20px; + + .el-timeline-item__timestamp { + position: absolute !important; + top: 10px; + left: -150px; + } + } + + .el-timeline-right-content { + display: flex; + align-items: center; + min-height: 30px; + padding: 10px; + background-color: #409eff; + + &::before { + position: absolute; + top: 10px; + left: 13px; + border-color: transparent #409eff transparent transparent; + border-style: solid; + border-width: 8px; + content: ""; + } + } + + .el-timeline-item__node { + position: absolute; + left: -5px; + top: -50%; + transform: translateY(100%); + display: flex; + width: 20px; + height: 20px; + font-size: 10px; + background: #409eff; + border-radius: 50%; + justify-content: center; + align-items: center; + } +} diff --git a/src/views/hard/hard-spu/form.vue b/src/views/hard/hard-spu/form.vue index 2a07d1c..1d6e916 100644 --- a/src/views/hard/hard-spu/form.vue +++ b/src/views/hard/hard-spu/form.vue @@ -173,7 +173,7 @@ const gethardSpuData = (id: string) => { hardSpu .getObj(id) .then((res: any) => { - Object.assign(form, res.data, { price: displayPrice(res.data.price, "", 0) }) + Object.assign(form, res.data, { price: Number(displayPrice(res.data.price, "", 0)) }) }) .finally(() => { loading.value = false diff --git a/src/views/hard/hard-spu/index.vue b/src/views/hard/hard-spu/index.vue index fbe3282..47a51a8 100644 --- a/src/views/hard/hard-spu/index.vue +++ b/src/views/hard/hard-spu/index.vue @@ -94,11 +94,18 @@ - - - + + + - + {{ v.label }} @@ -98,7 +98,7 @@ const loading = ref(false) // 定义字典 const { yes_no_type } = useDict("yes_no_type") // 提交表单数据 -const form = reactive({ +const form = reactive({ id: "", hardId: "", spuCategoryId: "", diff --git a/src/views/hard/hard-spu/index.vue b/src/views/hard/hard-spu/index.vue index 47a51a8..1f9f006 100644 --- a/src/views/hard/hard-spu/index.vue +++ b/src/views/hard/hard-spu/index.vue @@ -99,7 +99,7 @@ 编辑 Date: Wed, 16 Apr 2025 18:33:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=94=B3=E8=AF=B7=E6=8A=A5=E9=94=99=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wallet/wallet-recharge-apply/index.vue | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue index f8332a7..16a8e6f 100644 --- a/src/views/wallet/wallet-recharge-apply/index.vue +++ b/src/views/wallet/wallet-recharge-apply/index.vue @@ -126,8 +126,9 @@ type="primary" v-auth="'wallet_walletRechargeApply_view'" @click="doInfo(row)" - >数据 + 数据 + 申请 + 申请 + 编辑 + 编辑 + 删除 + 删除 + { } catch (error: any) { loading.close() if (error && error.code != 0) { - useMessage().error(error.msg) + // useMessage().error(error.msg) + ElMessage({ + message: h("div", { style: { maxHeight: "80vh", overflow: "auto", marginRight: "20px" } }, [ + h( + "table", + { style: { color: "#7f7f7f" } }, + error.msg.split("\n").map((item: string) => { + return h("tr", {}, [ + // h("td", { style: { padding: "0 4px", border: "1px solid #7f7f7f77", textAlign: "center" } }, index), + item.split(",").map((i: string) => { + return h("td", { style: { padding: "0 4px", border: "1px solid #7f7f7f77" } }, i) + }), + ]) + }), + ), + ]), + showClose: true, + duration: 10000, + type: "error", + }) } } }