优化

src/components/UploadFileFormData/index.vue

@@ -40,7 +40,7 @@ export default {
         // 文件类型
         fileType: {
             type: Array,
-            default: [],
+            default: ['doc', 'docx', 'ppt', 'pptx', 'mp4', 'pdf'],
         },
         // 文件大小
         fileSize: {

src/views/dataManage/pro-materials/components/addAndEditForm.vue

@@ -46,7 +46,6 @@
                         <UploadFileFormData
                             :limit="1"
                             :file-size="500"
-                            :file-type="[]"
                             :file-list.sync="addAndEditForm.file"
                             :is-uploaded="addAndEditForm.file.length >= 1"
                             @onSelectDeleteFileId="handleSelectDeleteFileId"

src/views/dataManage/pro-materials/index.vue

@@ -31,6 +31,22 @@
                     />
                 </el-select>
             </el-form-item>
+            <el-form-item prop="status">
+                <el-select
+                    clearable
+                    filterable
+                    style="width: 100%"
+                    placeholder="请选择归属产品"
+                    v-model="queryParams.productId"
+                >
+                    <el-option
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                        v-for="item in productList"
+                    />
+                </el-select>
+            </el-form-item>
             <el-form-item>
                 <el-button
                     type="primary"
@@ -117,9 +133,18 @@
                         <span v-else> / </span>
                     </template>
                     <template v-if="column.prop === 'fileType'">
-                        <el-tag size="mini" type="primary">
+                        <el-tag
-                            {{ scope.row.typeId === 1 ? '物料' : '视频' }}
+                            size="mini"
+                            type="primary"
+                            v-if="scope.row.files && scope.row.files.length > 0"
+                        >
+                            {{
+                                scope.row.files[0].fileType === 1
+                                    ? '物料'
+                                    : '视频'
+                            }}
                         </el-tag>
+                        <span v-else> / </span>
                     </template>
 
                     <template v-if="column.prop === 'cover'">
@@ -197,6 +222,7 @@
 import {
     getProMaterialsListAPI,
     deleteProductCenterAPI,
+    getProductListAPI,
 } from '@/api/dataManage/pro-materials'
 import { encryptCBCTime } from '@/utils/aes'
 import useBase64 from '@/utils/base64Utils.js'
@@ -215,9 +241,11 @@ export default {
             formType: 1,
             detailsId: null,
             tableData: [],
+            productList: [],
             queryParams: {
                 name: undefined,
                 typeId: undefined,
+                productId: undefined,
                 pageNum: 1,
                 pageSize: 10,
             },
@@ -230,6 +258,10 @@ export default {
                     prop: 'typeName',
                     label: '类型',
                 },
+                {
+                    prop: 'productName',
+                    label: '归属产品',
+                },
                 {
                     prop: 'version',
                     label: '版本',
@@ -280,6 +312,7 @@ export default {
     },
     created() {
         this.getProMaterialsListFun()
+        this.getProductList()
     },
     methods: {
         // 获取列表数据
@@ -362,6 +395,8 @@ export default {
                   )
             filePreviewPath = `${this.lookFile}${encodedPath}&token=${time}`
 
+            console.log('filePreviewPath', filePreviewPath)
+
             const isEdgeOrOther = /Edg|Chrome|Firefox|Safari/.test(
                 navigator.userAgent,
             )
@@ -372,8 +407,17 @@ export default {
             }
 
             this.iframeUrl = filePreviewPath
+
+            console.log('this.iframeUrl', this.iframeUrl)
             this.previewDialogConfig.outerVisible = true
         },
+
+        // 获取归属产品下拉选
+        async getProductList() {
+            const res = await getProductListAPI({ typeId: '' })
+
+            this.productList = res.data
+        },
     },
 }
 </script>

src/views/publicService/components/navBar.vue

@@ -4,7 +4,7 @@
             <div class="header-left">
                 <div class="logo-section" @click="handleLogoClick">
                     <img
-                        src="../../../assets/images/productCenter/logo.png"
+                        src="../../../assets/logo/logo.png"
                         alt="Logo"
                         class="logo"
                     />

src/views/publicService/productCenter/components/card-container.vue

@@ -174,7 +174,7 @@ export default {
         getItemWidth() {
             if (this.$refs.cardWrapper) {
                 // 无论有多少个盒子，都按照4个盒子计算宽度
-                this.itemWidth = (this.$refs.cardWrapper.clientWidth - 30) / 4
+                this.itemWidth = (this.$refs.cardWrapper.clientWidth - 260) / 4
             }
         },
 
@@ -444,7 +444,8 @@ export default {
     }
 
     .card-item-image {
-        width: 100%;
+        // width: 100%;
+        height: 190px;
         position: relative;
 
         .video-mask {

src/views/publicService/productCenter/index.vue

@@ -302,7 +302,7 @@ export default {
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
     transition: all 0.2s ease;
     font-family: 'PingFang SC', sans-serif;
-    // font-weight: 600;
+    text-align: center;
 }
 
 .category-item:hover {

src/views/publicService/productCenter/product-detail.vue

@@ -847,7 +847,7 @@ export default {
     gap: 24px;
 
     .product-image {
-        border-bottom: 1px solid #000;
+        // border-bottom: 1px solid #000;
     }
 
     .product-info {