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 @@ -