From 1c0caaa395331920cf58cfd53924c9beb4a2b0d0 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期二, 24 六月 2025 15:22:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- pages/product/goods.vue | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/pages/product/goods.vue b/pages/product/goods.vue index 8702a7d..fa701a1 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -275,6 +275,9 @@ </template> <script> +import '@/components/uview-components/uview-ui'; + + /************鎺ュ彛API***************/ import { getGoods, getGoodsList, getMpScene, getGoodsDistribution } from "@/api/goods.js"; import * as API_trade from "@/api/trade.js"; @@ -302,7 +305,9 @@ import popups from "@/components/popups/popups"; //姘旀场妗� import takeDownFormSaleGoods from "@/components/m-take-down-sale-goods/index"; //涓嬫灦妗� import setup from "./product/popup/popup"; - + import { + getSTSToken + } from '@/api/common.js' export default { components: { popups, @@ -573,8 +578,35 @@ this.$store.state.distributionId = distributionId; } } + const sts = await getSTSToken(); + const stsUrl = sts.data.data.endpoint + // // 澶勭悊鏁版嵁 + // goodsList.data.result.records.forEach(item => { + // if (item.thumbnail !== '' && item.thumbnail !== null && item.thumbnail.indexOf('http') === + // -1) { + // item.thumbnail = stsUrl + '/' + item.thumbnail + // } + // if (item.goodsVideo !== '' && item.goodsVideo !== null && item.goodsVideo.indexOf( + // 'http') === -1) { + // item.goodsVideo = stsUrl + '/' + item.goodsVideo + // } + // }) /**鍟嗗搧淇℃伅浠ュ強瑙勬牸淇℃伅瀛樺偍 */ + console.log('--------------------------1>',response.data.result.data.goodsGalleryList) + response.data.result.data.goodsGalleryList.forEach((item,index)=>{ + if (item !== '' && item !== null && item.indexOf('http') === + -1) { + response.data.result.data.goodsGalleryList[index] = stsUrl + '/' + item + console.log('鏄惁鎵ц-------------銆�',item) + } + }) + console.log('--------------------------2>',response.data.result.data.goodsGalleryList) this.goodsDetail = response.data.result.data; + if (this.goodsDetail.goodsVideo !== '' && this.goodsDetail.goodsVideo !== null && this.goodsDetail.goodsVideo.indexOf( + 'http') === -1) { + this.goodsDetail.goodsVideo = stsUrl + '/' + this.goodsDetail.goodsVideo + } + console.log('--------------------------2>',this.goodsDetail.goodsGalleryList) this.wholesaleList = response.data.result.wholesaleList; this.goodsSpec = response.data.result.specs; this.PromotionList = response.data.result.promotionMap; -- Gitblit v1.8.0