From e81eae6c8446bbd91c162b5ef3e42051b5523bf1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 09:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/goods/goods-info/goodsDetail.vue | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue
index 2b79c55..1f96c75 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;" >
@@ -32,7 +35,12 @@
<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
--
Gitblit v1.8.0