From 30dbe5b15902d90a5ca41e77ccd7d399d6c9578d Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 11 九月 2025 18:33:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into send_coupon
---
manager/src/views/goods/goods-info/goodsDetail.vue | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue
index 60d4c41..3c15744 100644
--- a/manager/src/views/goods/goods-info/goodsDetail.vue
+++ b/manager/src/views/goods/goods-info/goodsDetail.vue
@@ -18,6 +18,9 @@
<FormItem label="鍟嗗搧鍗栫偣">
{{ goods.sellingPoint }}
</FormItem>
+ <FormItem label="鎶芥垚姣斾緥">
+ {{ goods.commission }}%
+ </FormItem>
<FormItem label="鍟嗗搧鍙傛暟">
<div v-if="goods.goodsParamsDTOList && goods.goodsParamsDTOList.length" v-for="(item,index) in goods.goodsParamsDTOList" :key="index">
<div style="margin-bottom: 10px; display: flex; align-items: center;" >
@@ -27,12 +30,23 @@
</div>
</div>
</FormItem>
+ <FormItem label="鍟嗗搧鏍囩">
+ <span v-for="(item ,index) in goodsTag" :key="index">
+ {{index === goodsTag.length - 1 ? item.tagName: item.tagName +"锛�" }}
+ </span>
+
+ </FormItem>
</div>
<h4>鍟嗗搧浜ゆ槗淇℃伅</h4>
<div class="form-item-view">
<FormItem label="璁￠噺鍗曚綅"> {{ goods.goodsUnit }}</FormItem>
<FormItem label="閿�鍞ā寮�">
- {{ goods.salesModel === "RETAIL" ? "闆跺敭鍨�" : "鎵瑰彂鍨�" }}
+ <span v-if="goods.salesModel ==='RETAIL'">闆跺敭鍨�</span>
+ <span v-else-if="goods.salesModel ==='PRESALE'">棰勫敭</span>
+ <span v-else-if="goods.salesModel ==='WHOLESALE'">鎵瑰彂鍨�</span>
+ <span v-else>鍏朵粬绫诲瀷</span>
+
+<!-- {{ goods.salesModel === "RETAIL" ? "闆跺敭鍨�" : "鎵瑰彂鍨�" }}-->
</FormItem>
<FormItem label="閿�鍞鍒�" v-if="goods.salesModel !== 'RETAIL'">
<Table
@@ -78,6 +92,8 @@
controls
class="player"
:src="goods.goodsVideo"
+ width="200"
+ height="180"
/>
</FormItem>
<FormItem label="鍟嗗搧瑙勬牸">
@@ -143,10 +159,13 @@
</template>
<script>
import { getGoodsDetail } from "@/api/goods";
+import {getGoodSTagById} from "@/api/goods-tag"
+import {getSts} from '@/api/file'
export default {
name: "goodsDetail",
data() {
return {
+ goodsTag:[],
goods: {}, // 鍟嗗搧淇℃伅
previewGoodsPicture: "", // 棰勮鍥剧墖
goodsPictureVisible: false, // 棰勮鍥剧墖妯℃�佹
@@ -187,12 +206,41 @@
},
mounted() {
this.initGoods(this.$route.query.id);
+ this.getGoodSTagById(this.$route.query.id);
+
},
methods: {
+ getGoodSTagById(id){
+ getGoodSTagById(id).then(res =>{
+ if (res.code === 200){
+ this.goodsTag = res.data;
+ }
+ })
+ },
// 鍒濆鍖栨暟鎹紝鑾峰彇鍟嗗搧璇︽儏
initGoods(id) {
getGoodsDetail(id).then((res) => {
this.goods = res.result;
+ if (this.goods.goodsVideo != null && this.goods.goodsVideo !== '') {
+ getSts().then(res => {
+ console.log('--------------->',this.goods.goodsVideo.indexOf('http')!== -1)
+ if (this.goods.goodsVideo !== null && this.goods.goodsVideo.indexOf('http')=== -1) {
+ this.goods.goodsVideo = res.data.endpoint+'/'+this.goods.goodsVideo;
+ }
+ })
+ }
+ if (this.goods.goodsGalleryList != null && this.goods.goodsGalleryList.length > 0) {
+ getSts().then(res => {
+ this.goods.goodsGalleryList = this.goods.goodsGalleryList.map((item) => {
+ if (item !== null&&item.indexOf('http')===-1) {
+ return res.data.endpoint+'/'+item;
+ }else {
+ return item;
+ }
+ })
+ })
+ }
+
let that = this;
res.result.skuList.forEach(function (sku, index, array) {
that.skuData.push({
--
Gitblit v1.8.0