From 6837567d7a2b9eb026f8b082363f65a3e13b064e Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 3 Apr 2024 09:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/GoodsItem/GoodsItem.vue | 50 +++++++++++---------
 src/views/dataCenter/goods/Update.vue        | 13 +++++
 2 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/components/Table/GoodsItem/GoodsItem.vue b/src/components/Table/GoodsItem/GoodsItem.vue
index b01aebd..33471c0 100644
--- a/src/components/Table/GoodsItem/GoodsItem.vue
+++ b/src/components/Table/GoodsItem/GoodsItem.vue
@@ -4,19 +4,22 @@
     <div class="in-left">
       <img :src="dataObj.image" :alt="dataObj.imageAlt" />
     </div>
+
     <div class="in-right">
       <!-- 商品名称 -->
-      <p class="title twoline-hide" :style="{ width: `${dataObj.titleWidth}px` }">{{ dataObj.title }}</p>
+      <a-tooltip placement="topLeft" :title="dataObj.title">
+        <p class="title twoline-hide" :style="{ width: `${dataObj.titleWidth}px` }">{{ dataObj.title }}</p></a-tooltip
+      >
       <!-- 副标题 -->
-      <p
-        v-if="isEmpty(dataObj.goodsProps)"
-        class="subtitle"
-        :class="{ 'c-p': subTitleColor }"
-      >{{ dataObj.subtitle }}</p>
+      <p v-if="isEmpty(dataObj.goodsProps)" class="subtitle" :class="{ 'c-p': subTitleColor }">
+        <a-tooltip placement="topLeft" :title="dataObj.subtitle"> {{ dataObj.subtitle }}</a-tooltip>
+      </p>
       <!-- 商品规格 -->
       <div v-else class="goods-props clearfix">
         <div class="goods-props-item" v-for="(props, idx) in dataObj.goodsProps" :key="idx">
-          <span>{{ props.value.name }}</span>
+          <a-tooltip placement="topLeft" :title="props.value.name">
+            <span>{{ props.value.name }}</span></a-tooltip
+          >
         </div>
       </div>
     </div>
@@ -34,28 +37,29 @@ export default {
     // 商品信息
     data: PropTypes.object.def({}),
     // 副标题颜色
-    subTitleColor: PropTypes.bool.def(false)
+    subTitleColor: PropTypes.bool.def(false),
   },
   computed: {
-    dataObj () {
-      return Object.assign({
-        image: '',
-        imageAlt: '',
-        title: '',
-        subtitle: '',
-        goodsProps: [],
-        titleWidth: 200
-      }, this.$props.data)
-    }
+    dataObj() {
+      return Object.assign(
+        {
+          image: '',
+          imageAlt: '',
+          title: '',
+          subtitle: '',
+          goodsProps: [],
+          titleWidth: 200,
+        },
+        this.$props.data
+      )
+    },
   },
-  data () {
+  data() {
     return {
-      isEmpty
+      isEmpty,
     }
   },
-  methods: {
-
-  }
+  methods: {},
 }
 </script>
 
diff --git a/src/views/dataCenter/goods/Update.vue b/src/views/dataCenter/goods/Update.vue
index c8052a9..c5c4504 100644
--- a/src/views/dataCenter/goods/Update.vue
+++ b/src/views/dataCenter/goods/Update.vue
@@ -176,6 +176,19 @@
             </div>
             <!-- 单规格的表单内容 -->
             <div v-if="form.getFieldValue('spec_type') == 10">
+              <a-form-item
+                label="规格值"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                extra="规格值仅用于商品页展示"
+              >
+                <a-input-number
+                  :min="0"
+                  :precision="2"
+                  v-decorator="['specific_value', { rules: [{ required: true, message: '请输入规格值' }] }]"
+                />
+                <span class="ml-10">元</span>
+              </a-form-item>
               <a-form-item
                 label="商品价格"
                 :labelCol="labelCol"