From c3e268c640e6e745b37360793b3e3fb455ef8346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E7=93=9C=E4=B8=80=E5=9D=97=E5=85=AB?=
 <2523890936@qq.com>
Date: Fri, 1 Aug 2025 16:17:33 +0800
Subject: [PATCH] bugfix

---
 .../ncmatch/mainPage/sendProduct/index.vue    |   4 +-
 .../ncmatch/supplyAndDemandSquare/index.vue   | 158 +++++++++++-------
 2 files changed, 95 insertions(+), 67 deletions(-)

diff --git a/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue b/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue
index 8efc9d1..7fa3a35 100644
--- a/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue
+++ b/f/web-kboss/src/views/homePage/ncmatch/mainPage/sendProduct/index.vue
@@ -267,7 +267,7 @@ export default {
     },
     methods: {
         init_company_category() {
-            reqCompanyCategorySearch({ userid: '9KVhsVCJsW_29q3hRhMAr' }).then(res => {
+            reqCompanyCategorySearch({url_link:window.location.href}).then(res => {
                 if (res.status) {
                     this.company_category_list = []
                     for (let item of res.data) {
@@ -292,7 +292,7 @@ export default {
         },
 
         init_product_category() {
-            reqGetProductCategorySearch({ userid: '9KVhsVCJsW_29q3hRhMAr' }).then(res => {
+            reqGetProductCategorySearch({ url_link: window.location.href,to_page: 'publish' }).then(res => {
                 if (res.status) {
                     this.typeList = buildCaTree(res.data)
                     console.log("2@@", this.typeList);
diff --git a/f/web-kboss/src/views/homePage/ncmatch/supplyAndDemandSquare/index.vue b/f/web-kboss/src/views/homePage/ncmatch/supplyAndDemandSquare/index.vue
index 1a3581c..8dbda40 100644
--- a/f/web-kboss/src/views/homePage/ncmatch/supplyAndDemandSquare/index.vue
+++ b/f/web-kboss/src/views/homePage/ncmatch/supplyAndDemandSquare/index.vue
@@ -13,24 +13,24 @@
                 <span class="rightText"> 广场</span></span>
 
         </div>
-   
+
 
         <div style="width: 1400px;">
             <div class="category-filter">
-                     <!-- 新增的需求和商品radio按钮组 -->
-        <div class="radio-group-container">
-            <div class="radio-group">
-                <label class="radio-item" :class="{ active: selectedType === 'product' }">
-                    <input type="radio" v-model="selectedType" value="product" @change="handleTypeChange">
-                    <span class="radio-text">企业商品</span>
-                </label>
-                <label class="radio-item" :class="{ active: selectedType === 'demand' }">
-                    <input type="radio" v-model="selectedType" value="demand" @change="handleTypeChange">
-                    <span class="radio-text">企业需求</span>
-                </label>
-           
-            </div>
-        </div>
+                <!-- 新增的需求和商品radio按钮组 -->
+                <div class="radio-group-container">
+                    <div class="radio-group">
+                        <label class="radio-item" style="margin-right: 0px;" :class="{ active: selectedType === 'product' }">
+                            <input type="radio" v-model="selectedType" value="product" @change="handleTypeChange">
+                            <span class="radio-text">企业商品</span>
+                        </label>
+                        <label class="radio-item" :class="{ active: selectedType === 'demand' }">
+                            <input type="radio" v-model="selectedType" value="demand" @change="handleTypeChange">
+                            <span class="radio-text">企业需求</span>
+                        </label>
+
+                    </div>
+                </div>
                 <!-- 所属类别 -->
                 <div class="category-section">
                     <div class="category-title">所属类别</div>
@@ -48,9 +48,9 @@
                     <div class="category-title">公司类别</div>
                     <div class="category-tags">
                         <span v-for="company in companies" :key="company.id"
-                            :class="['category-tag', { active: selectedCompany === company.id }]"
-                            @click="selectCompany(company.id)">
-                            {{ company.name }}
+                            :class="['category-tag', { active: selectedCompanies.includes(company.value) }]"
+                            @click="selectCompany(company.value)">
+                            {{ company.label }}
                         </span>
                     </div>
                 </div>
@@ -66,7 +66,8 @@
                 </div>
                 <!-- 返回 -->
                 <div class="back-btn" @click="$router.push('/ncmatchHome/index')">
-                    <span><返回</span>
+                    <span>
+                        返回 </span>
                 </div>
             </div>
         </div>
@@ -74,7 +75,7 @@
 </template>
 
 <script>
-import { reqGetProductCategorySearch, reqGetSupplyAndDemandSquareList  } from '@/api/ncmatch'
+import { reqGetProductCategorySearch, reqGetSupplyAndDemandSquareList, reqCompanyCategorySearch } from '@/api/ncmatch'
 export default {
     name: 'supplyAndDemandSquare',
     components: {
@@ -82,58 +83,65 @@ export default {
     },
     data() {
         return {
-            typeList:[],
+            page_size: 8,
+            current_page: 1,
+            typeList: [],
             selectedType: 'product', // 默认选中需求
             selectedCategory: '', // 默认选中项
-            selectedCompany: 'company1', // 默认选中项
-            categories: [
-                { id: 'category1', name: '云' },
-                { id: 'category2', name: '国产算力' },
-                { id: 'category3', name: 'NVIDIA' },
-                { id: 'category4', name: '网络服务' },
-                { id: 'category5', name: '一体机' },
-                { id: 'category6', name: '硬件' },
-                { id: 'category7', name: 'AI应用' },
-                { id: 'category8', name: '其他' }
-            ],
-            companies: [
-                { id: 'company1', name: '龙头企业' },
-                { id: 'company2', name: '骨干企业' },
-                { id: 'company3', name: '科技型企业' },
-                { id: 'company4', name: '专精特新企业' },
-                { id: 'company5', name: '高新技术企业' },
-                { id: 'company6', name: '科技小巨人领军企业' },
-                { id: 'company7', name: '其他' }
-            ],
+            selectedCompanies: [], // 默认选中项，改为数组支持多选
+            categories: [],
+            companies: [],
             productList: []
         }
     },
     created() {
-        this.init_product_category()
+        this.initAllData()
     },
     methods: {
+        initAllData() {
+            Promise.all([
+                this.init_product_category(),
+                this.init_company_category()
+            ]).then(() => {
+                this.initData(this.selectedCategory)
+            })
+
+        },
+        init_company_category() {
+            reqCompanyCategorySearch({ url_link: window.location.href }).then(res => {
+                if (res.status) {
+                    this.company_category_list = []
+                    for (let item of res.data) {
+                        this.company_category_list.push({
+                            label: item.company_category,
+                            value: item.company_category
+                        })
+                    }
+
+                    this.companies = this.company_category_list
+                }
+            })
+        },
         selectCategory(categoryId) {
-            if(categoryId===this.selectedCategory) return;
+            if (categoryId === this.selectedCategory) return;
             this.selectedCategory = categoryId
             this.initData(this.selectedCategory)
         },
         init_product_category(product_category) {
-            reqGetProductCategorySearch({ userid: '9KVhsVCJsW_29q3hRhMAr' }).then(res => {
+            reqGetProductCategorySearch({ url_link: window.location.href, to_page: 'publish' }).then(res => {
                 if (res.status) {
-                    let list = []   
-                    for(let item of res.data){
-                        if(item.parentid === null){
+                    let list = []
+                    for (let item of res.data) {
+                        if (item.parentid === null) {
                             list.push({
-                            label:item.product_category,
-                            value:item.id
-                        })
+                                label: item.product_category,
+                                value: item.id
+                            })
                         }
-                    
+
                     }
-                    this.selectedCategory = list[0].value
+                    // this.selectedCategory = list[0].value
                     this.typeList = list
-                    this.initData(this.selectedCategory)
-                    console.log("2@@", this.typeList);
 
                 }
             })
@@ -143,21 +151,38 @@ export default {
             console.log('切换到:', this.selectedType)
             // 这里可以根据类型重新加载数据
         },
-        initData(product_category) {
-            reqGetSupplyAndDemandSquareList({product_category,to_page:"square",url_link:window.location.href}).then(res => {
+        initData() {
+            let ploay = {
+                product_category: this.selectedCategory,
+                to_page: "square",
+                url_link: window.location.href,
+                page_size: this.page_size,
+                current_page: this.current_page,
+                company_type: this.selectedCompanies.length > 0 ? this.selectedCompanies.join(",") : ""
+            }
+            reqGetSupplyAndDemandSquareList(ploay).then(res => {
                 if (res.status) {
-                    if(res.data.length===0){
+                    if (res.data.length === 0) {
                         this.productList = []
-                    }else{
+                    } else {
                         this.productList = res.data[0].product_list
                     }
-                 
+
                 }
             })
 
         },
         selectCompany(companyId) {
-            this.selectedCompany = companyId
+            const index = this.selectedCompanies.indexOf(companyId)
+            if (index > -1) {
+                // 如果已选中，则取消选中
+                this.selectedCompanies.splice(index, 1)
+            } else {
+                // 如果未选中，则添加到选中列表
+                this.selectedCompanies.push(companyId)
+            }
+            console.log("this.selectedCompanies", this.selectedCompanies);
+            this.initData()
         },
         getProductList() {
             this.productList = [
@@ -219,7 +244,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.back-btn{
+.back-btn {
     width: 100%;
     height: 40px;
     line-height: 40px;
@@ -229,14 +254,16 @@ export default {
     margin-top: 20px;
     font-size: 16px;
     color: #666;
-        &:hover{
+
+    &:hover {
         cursor: pointer;
         color: #275AFF;
     }
 }
+
 /* 新增的radio按钮组样式 */
 .radio-group-container {
-    width: 100%!important;
+    width: 100% !important;
     display: flex;
     justify-content: flex-start;
     // margin: 20px 0;
@@ -299,7 +326,7 @@ export default {
 }
 
 .title {
-    color: #666!important;
+    color: #666 !important;
     font-size: 36px;
     margin: 25px;
 
@@ -423,7 +450,8 @@ export default {
         }
     }
 }
-.no-data{
+
+.no-data {
     min-height: 500px;
     display: flex;
     justify-content: center;