From 7673b8272cfd9fc21161b70e35c263e455b59966 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 27 六月 2025 10:57:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/product/goods.vue | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index b0b21df..10b03f2 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -275,7 +275,9 @@
</template>
<script>
-import '@/uview-components/uview-ui'
+import '@/components/uview-components/uview-ui';
+
+
/************鎺ュ彛API***************/
import { getGoods, getGoodsList, getMpScene, getGoodsDistribution } from "@/api/goods.js";
import * as API_trade from "@/api/trade.js";
@@ -303,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,
@@ -340,21 +344,21 @@
// #endif
navbarListData: [
//瀵艰埅鏍忓垪琛ㄦ爮鏁版嵁
- {
- title: "棣栭〉",
- icon: "home-fill",
- ___type: "other",
- },
+ // {
+ // title: "棣栭〉",
+ // icon: "home-fill",
+ // ___type: "other",
+ // },
{
title: "璐墿杞�",
icon: "bag-fill",
___type: "other",
},
- {
- title: "鎼滅储",
- icon: "search",
- ___type: "category",
- },
+ // {
+ // title: "鎼滅储",
+ // icon: "search",
+ // ___type: "category",
+ // },
{
title: "涓汉涓績",
icon: "account-fill",
@@ -574,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