Merge branch 'master' of http://www.kingtomtech.com:10101/kingtom/shengtai_web

# Conflicts:
#	src/pages/affairs/transaction.vue

src/pages/affairs/transaction.vue

@@ -1,9 +1,7 @@
 <!--
  * @Author: PoJun
  * @Date: 2023-10-13 10:35:43
- * @LastEditors: XuanJi
- * @LastEditTime: 2024-05-08 21:23:29
- * @Message: 事务处理中心
+ * @LastEditTime: 2024-05-08 21:14:46 * @Message: 事务处理中心
 -->
 <template>
     <div class="affairsTransaction">
@@ -38,7 +36,12 @@
                         <common-card-item label="联系方式" :text="detailItem?.data.phone" :span="24"></common-card-item>
                         <common-card-item label="地址" :text="detailItem?.data.address" :span="24"></common-card-item>
                         <common-card-item label="企业简介" :text="detailItem?.data.intro" :span="24"></common-card-item>
-                        <common-card-item label="产品" :text="productName" :span="24"></common-card-item>
+                        
+                        <common-card-item
+                            label="产品分类"
+                            :text="detailItem?.productName"
+                            :span="24"
+                        ></common-card-item>
                         <common-card-item
                             label="优势产品"
                             :text="detailItem?.data.superiorProduct"
@@ -136,7 +139,6 @@ export default {
             showModal: false,
             detailItem: null,
             currentKey: "todo",
-            productName: "",
         };
     },
     created() {},
@@ -176,13 +178,11 @@ export default {
 
         async getProductName(idArray) {
             try {
-                // console.log(idArray);
                 const data = await getProductsInfoFromIds({ ids: idArray.join(",") });
                 const productName = data.map(item => {
                     return item.name;
                 });
-                this.productName = productName.join("，");
-            } catch (error) {
+this.$set(this.detailItem, "productName", productName.join("，"));            } catch (error) {
                 console.log(error);
             }
         },
@@ -192,7 +192,6 @@ export default {
             handler: function (val) {
                 if (!val) {
                     this.detailItem = null;
-                    this.productName = "";
                 }
             },
         },