From c1e567ddda7f65651179a8a73ca849b07b066b14 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 19:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/goods/goods-info/goods.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index 7a5f7d3..7d1d4e4 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -89,9 +89,12 @@
<template slot="goodsSlot" slot-scope="{ row }">
<div style="margin: 5px 0px; height: 80px; display: flex">
<div style="">
- <img
+ <img v-if="row.original"
:src="row.original"
style="height: 60px; margin-top: 1px; width: 60px"
+ />
+ <video v-else
+ :src="row.goodsVideo" style="height: 60px; margin-top: 1px; width: 60px"
/>
</div>
@@ -159,6 +162,7 @@
<script>
import { getGoodsListData, upGoods, lowGoods } from "@/api/goods";
+import {getSts} from '@/api/file'
import vueQr from "vue-qr";
export default {
components: {
@@ -376,6 +380,18 @@
this.loading = false;
if (res.success) {
this.data = res.result.records;
+ getSts().then(res => {
+ const endpoint = res.data.endpoint
+ this.data.forEach(item => {
+ if (item.goodsVideo != null && item.goodsVideo.indexOf('http')===-1) {
+ item.goodsVideo = endpoint + '/' + item.goodsVideo;
+ }
+ if (item.original !=null && item.original.indexOf('http') ===-1) {
+ item.original = endpoint + '/' + item.original;
+ }
+ })
+ })
+
this.total = res.result.total;
}
});
--
Gitblit v1.8.0