bugfix

f/web-kboss/src/views/customer/approveMangement/approvedPro.vue

@@ -14,7 +14,8 @@ export default {
         return {
             role:{
                 role_type:'customer',
-                audit_status:'approved'
+                audit_status:'approved,rejected',
+                type:'user'
             }
         }
     },

f/web-kboss/src/views/customer/productMangement/commonBox/index.vue

@@ -22,9 +22,15 @@
         </div>
         <div class="table-box">
             <div style="margin-bottom: 10px;">
+                    <el-radio-group v-if="role.type == 'user'" v-model="searchData.radioType" class="radio-group"
+                    size="mini" @change="handleRadioChange">
+                    <el-radio-button v-for="item in  radioOptions" :key="item.value" :label="item.value">
+                        {{ item.label }}
+                    </el-radio-button>
+                </el-radio-group>
                 <el-radio-group v-if="role.type == 'app'" v-model="searchData.radioType" class="radio-group"
                     size="mini" @change="handleRadioChange">
-                    <el-radio-button v-for="item in radioOptions" :key="item.value" :label="item.value">
+                    <el-radio-button v-for="item in  userMap" :key="item.value" :label="item.value">
                         {{ item.label }}
                     </el-radio-button>
                 </el-radio-group>
@@ -39,7 +45,7 @@
             <el-table size="large" border height="calc(100vh - 210px)" v-loading="loading" :data="tableData"
                 style="width: 100%;border:1px solid #ccc;" element-loading-text="加载中..."
                 element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.8)">
-                <el-table-column  prop="date" label="图片" width="180">
+                <el-table-column v-if="searchData.radioType!='1'&&searchData.radioType!='3'"  prop="date" label="图片" width="180">
                     <template slot-scope="scope">
                         <el-image v-if="scope.row.img" :src="scope.row.img || 'https://www.kaiyuancloud.cn/idfile?path=logo_ncmatch.png'"
                             style="width: 80px; height: 60px;border: 1px solid #ccc;border-radius: 6px;"
@@ -86,11 +92,11 @@
                         <el-button v-if="role.role_type == 'customer'" type="text" size="large"
                             @click="openDetail(scope.row, 2)">审核</el-button>
                         <el-button
-                            :disabled="scope.row.audit_status=='rejected'||scope.row.audit_status === 'approved' && scope.row.listing_status === 'listing'"
+                            :disabled="scope.row.audit_status !== 'approved' || scope.row.listing_status === 'listing'"
                             @click="grounding(scope.row, 'listing')" type="text" style="color: #67C23A;"
                                 size="large">上架</el-button>
                         <el-button
-                            :disabled="scope.row.audit_status=='rejected'||scope.row.audit_status === 'approved' && scope.row.listing_status === 'delisting'"
+                            :disabled="scope.row.audit_status !== 'approved' || scope.row.listing_status === 'delisting'"
                             @click="grounding(scope.row, 'delisting')" type="text" size="large">下架</el-button>
                         <el-button type="text" size="large" @click="exportData(scope.row)">导出</el-button>
                         <el-popconfirm v-if="role.role_type == 'customer'" title="确定删除该条目吗？"
@@ -160,6 +166,20 @@ export default {
                 current_page: 1,
                 page_size: 8,
             },
+                         userMap: [
+                 {
+                     label: '用户需求',
+                     value: '1',
+                     publish_type: '2',
+                     manager_self: null,
+                 },
+                 {
+                     label: '用户商品',
+                     value: '2',
+                     publish_type: '1',
+                     manager_self: null,
+                 },  
+             ],
             radioMap: {
                 '1': {
                     label: '用户需求',
@@ -245,9 +265,17 @@ export default {
 
             this.searchData.audit_status = this.role.audit_status;
         }
-        if (this.role && this.role.publish_type) {
+                 if (this.role && this.role.publish_type) {
-            this.searchData.publish_type = this.role.publish_type;
+             if (this.role.type === 'app') {
-        }
+                 this.searchData.publish_type = this.role.publish_type;
+             } else if (this.role.type === 'user') {
+                 const selectedItem = this.userMap.find(item => item.value === this.role.publish_type);
+                 if (selectedItem) {
+                     this.searchData.publish_type = selectedItem.publish_type;
+                     this.searchData.manager_self = selectedItem.manager_self;
+                 }
+             }
+         }
         this.getTableData();
     },
     watch: {
@@ -320,13 +348,27 @@ export default {
             this.sendProductVisible = true;
             this.sendProductData = item;
         },
-        handleRadioChange(value) {
+                 handleRadioChange(value) {
-            this.searchData.publish_type = this.radioMap[value].publish_type;
+             // 根据角色类型选择对应的映射
-            this.searchData.manager_self = this.radioMap[value].manager_self;
+             if (this.role.type === 'user') {
-            // 切换类型后重新获取数据
+                 // 对于 user 类型，在数组中查找对应的项
-            this.searchData.current_page = 1;
+                 const selectedItem = this.userMap.find(item => item.value === value);
-            this.getTableData();
+                 if (selectedItem) {
-        },
+                     this.searchData.publish_type = selectedItem.publish_type;
+                     this.searchData.manager_self = selectedItem.manager_self;
+                 }
+             } else {
+                 // 对于 app 类型，使用 radioMap
+                 if (this.radioMap[value]) {
+                     this.searchData.publish_type = this.radioMap[value].publish_type;
+                     this.searchData.manager_self = this.radioMap[value].manager_self;
+                 }
+             }
+             
+             // 切换类型后重新获取数据
+             this.searchData.current_page = 1;
+             this.getTableData();
+         },
         resetSearch() {
             this.searchDate = [];
             this.searchData.keyword = "";
@@ -403,7 +445,12 @@ export default {
             this.loading = true;
             if(to_excel==='1'){
                 this.searchData.to_excel=to_excel
-                reqSearchByMangement({url_link:window.location.href,to_excel:to_excel,publish_type:this.searchData.publish_type}).then(res => {
+                                reqSearchByMangement({
+                    url_link: window.location.href,
+                    to_excel: to_excel,
+                    publish_type: this.searchData.publish_type,
+                    manager_self: this.searchData.radioType=='4'||this.searchData.radioType=='3'?'single':null
+                }).then(res => {
                 console.log(res);
                 if (res.status) {
                     // 创建一个Workbook对象
@@ -420,7 +467,34 @@ export default {
                 this.loading = false;
             })
             }else{
-                reqSearchByMangement(this.searchData).then(res => {
+                // 根据角色类型获取对应的 manager_self 值
+                let manager_self = null;
+                let publish_type = null;
+                
+                                 if (this.role.type === 'user') {
+                     const selectedItem = this.userMap.find(item => item.value === this.searchData.radioType);
+                     if (selectedItem) {
+                         publish_type = selectedItem.publish_type;
+                         manager_self = this.searchData.radioType=='4'||this.searchData.radioType=='3'?'single':null;
+                     }
+                                  } else if (this.role.type === 'app') {
+                     if (this.radioMap[this.searchData.radioType]) {
+                         publish_type = this.radioMap[this.searchData.radioType].publish_type;
+                         manager_self = this.searchData.radioType=='4'||this.searchData.radioType=='3'?'single':null;
+                     }
+                 }
+                
+                                 // 构建请求参数，确保传递映射中的值
+                 const requestData = {
+                     ...this.searchData,
+                     publish_type: publish_type,
+                     manager_self: manager_self
+                 };
+                 
+                 console.log('请求参数:', requestData);
+                 requestData.manager_self=this.searchData.radioType=='4'||this.searchData.radioType=='3'?'single':null
+                 requestData.publish_type = this.searchData.radioType=='1'||this.searchData.radioType=='3'?'2':'1'
+                reqSearchByMangement(requestData).then(res => {
                 console.log(res);
                 if (res.status) {
                     this.tableData = res.data.product_list;

f/web-kboss/src/views/customer/qualificationReview/apprvedInfo/index.vue

@@ -19,7 +19,7 @@ export default {
         }
     },
     created(){
-        this.initData()
+        // this.initData()
     },
 }
 </script>

f/web-kboss/src/views/homePage/ncmatch/mainPage/index.vue

@@ -274,11 +274,11 @@ export default Vue.extend({
                 <span class="leftText">
                   NCMatch &nbsp;&nbsp;
                 </span>
-                <span class="rightText" style="margin-left: 10px;"> 您身边的AI管家</span>
+                <span class="rightText" style="margin-left: 10px;"> 算力供需对接平台</span>
               </span>
               <!--        <span class="description">支持模型训练、推理和数据处理，灵活配置，助您高效释放AI潜能</span>-->
               <ul style="margin-top: 50px" class="tagUl">
-                <li>全 球 领 先 的 AI 服 务 运 营 商</li>
+                <li>海量资源 <span style="display: inline-block;margin: 0 15px;"></span> 物美价廉</li>
               </ul>
             </div>
           </div>