.

src/main/zhi-rong-web/src/components/Banner.vue

@@ -383,7 +383,7 @@ export default {
         }
         .banner_top_title_con_content:hover {
             background: #ffe54f;
-            font-size: 20px;
+            font-size: 18px;
             font-weight: bold;
             color: #000000;
         }

src/main/zhi-rong-web/src/components/BannerNav.vue

@@ -1,13 +1,13 @@
 <template>
     <div class="banner_navigation">
-        <div class="banner_navigation_con">
+        <!-- <div class="banner_navigation_con">
             <div class="banner_navigation_con_one">特色知识产权运营公共服务</div>
             <div class="banner_navigation_con_two">打造知识产权融合全链条生态服务</div>
             <div class="banner_navigation_con_three">
                 <div>了解更多</div>
                 <img src="../assets/iconarrowright@3x.png" alt="" class="banner_navigation_con_three_img" />
             </div>
-        </div>
+        </div> -->
     </div>
 </template>
 <script>

src/main/zhi-rong-web/src/components/DividerTitle.vue

@@ -74,11 +74,11 @@ export default {
         vertical-align: middle;
         line-height: 32px;
         &:last-child {
-            font-size: 22px;
+            font-size: 24px;
             font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
             font-weight: bold;
             color: #313233;
-            margin-bottom: 10px;
+            margin-bottom: 5px;
         }
 
         img {
@@ -123,7 +123,7 @@ export default {
         content: '';
         width: 30px;
         height: 1px;
-        background: @info;
+        background: #BCC1CC;
         margin: 0 10px;
         transition: width ease-in-out 0.3s;
     }

src/main/zhi-rong-web/src/components/home/ServiceBox.vue

@@ -82,7 +82,7 @@ export default {
     width: 190px;
     height: 160px;
     background: #f2f3f7;
-    box-shadow: 0px 0px 6px 0px #d2dbf0;
+    // box-shadow: 0px 0px 6px 0px #d2dbf0;
     display: flex;
     align-items: center;
     justify-content: flex-end;

src/main/zhi-rong-web/src/components/list/ManageGride.vue

@@ -13,8 +13,7 @@
                 </div>
             </div>
             <div class="bottom">
-                <div style="margin-bottom: 10px">联系方式：{{ info.phone }}</div>
-                <div>任职单位：{{ info.work }}</div>
+                <div>发布时间：{{ formatTime(info.createdAt, 'YYYY-MM-DD') }}</div>
             </div>
             <!-- <div class="content"> -->
             <!-- <div class="tags">
@@ -124,7 +123,7 @@ export default {
 }
 .manage {
     // width: 460px;
-    height: 210px;
+    height: 185px;
     background: #ffffff;
     border: 1px solid rgba(56, 85, 142, 0.04);
     padding: 24px 20px 0;
@@ -258,3 +257,4 @@ export default {
     }
 }
 </style>
+

src/main/zhi-rong-web/src/components/newsField.vue

@@ -124,6 +124,7 @@ export default {
 }
 .science_list {
     padding: 20px;
+    padding-top: 10px;
     .science_list_con {
         margin-bottom: 20px;
         .patent {

src/main/zhi-rong-web/src/components/page/FilterList.vue

@@ -364,8 +364,8 @@ export default {
 
 .main {
     background: #FFFFFF;
+    box-shadow: 0px 0px 6px 0px #D2DBF0;
     flex-grow: 1;
-    padding-top: 20px;
     .flex-col();
 }
 .list {
@@ -508,7 +508,8 @@ export default {
 .filter {
     background-color: #fff;
     padding: 20px 20px 9px 20px;
-    // box-shadow: 0px 0px 6px 0px #D2DBF0;
+    box-shadow: 0px 0px 6px 0px #D2DBF0;
+    margin-bottom: 20px;
     .filter-item {
         .flex();
         align-items: flex-start;

src/main/zhi-rong-web/src/components/page/SortList.vue

@@ -292,8 +292,11 @@ export default {
 }
 .filter-top {
     background-color: #fff;
+    padding: 20px;
+    padding-bottom: 10px;
+    box-shadow: 0px 0px 6px 0px #d2dbf0;
+    margin-bottom: 20px;
     .flex();
-    padding: 0px 10px 0 20px;
 
     /deep/.el-input-group__prepend {
         background-color: transparent;
@@ -331,13 +334,14 @@ export default {
 .main {
     // background-color: #fff;
     flex-grow: 1;
+    background: #ffffff;
+    box-shadow: 0px 0px 6px 0px #d2dbf0;
     .flex-col();
 }
 .list {
     background-color: #fff;
     flex-grow: 1;
     min-height: 740px;
-    margin-top: 15px;
 }
 .footer {
     align-self: center;
@@ -466,3 +470,4 @@ export default {
     width: 100%;
 }
 </style>
+

src/main/zhi-rong-web/src/components/popup/CopyrightAdd.vue

@@ -223,40 +223,40 @@ export default {
                         required: true,
                         message: `请输入${this.types === 'COPY' ? '版本' : '软著'}登记号`
                     }
-                ]
-                // workType: [{ required: true, message: `请选择${this.types === 'COPY' ? '作品' : '软著'}类型` }],
-                // author: [{ required: true, message: '请输入作者，按回车分割' }],
-                // owner: [{ required: true, message: '请输入著作权人' }],
-                // img: [
-                //     {
-                //         required: true,
-                //         message: `请上传${this.types === 'COPY' ? '作品' : '软著'}附图`
-                //     }
-                // ],
-                // tradingMethodId: [{ required: true, message: '请选择交易方式' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择期望价方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
-                // contact: [{ required: true, message: '请输入联系人' }],
-                // phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
-                // commissionType: [{ required: true, message: '请选择佣金类型' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区' }]
+                ],
+                workType: [{ required: true, message: `请选择${this.types === 'COPY' ? '作品' : '软著'}类型` }],
+                author: [{ required: true, message: '请输入作者，按回车分割' }],
+                owner: [{ required: true, message: '请输入著作权人' }],
+                img: [
+                    {
+                        required: true,
+                        message: `请上传${this.types === 'COPY' ? '作品' : '软著'}附图`
+                    }
+                ],
+                tradingMethodId: [{ required: true, message: '请选择交易方式' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择期望价方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
+                contact: [{ required: true, message: '请输入联系人' }],
+                phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
+                commissionType: [{ required: true, message: '请选择佣金类型' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区' }]
             };
         }
     },

src/main/zhi-rong-web/src/components/popup/CopyrightDemandAdd.vue

@@ -116,30 +116,30 @@ export default {
                         required: true,
                         message: `请输入需求${this.type === 'COPY' ? '作品' : '软著'}名称`
                     }
-                ]
-                // workType: [{ required: true, message: `请选择需求${this.type === 'COPY' ? '作品' : '软著'}类型` }],
-                // description: [{ required: true, message: '请填写需求描述' }],
-                // modeId: [{ required: true, message: '请选择交易方式' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择预算方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区' }]
+                ],
+                workType: [{ required: true, message: `请选择需求${this.type === 'COPY' ? '作品' : '软著'}类型` }],
+                description: [{ required: true, message: '请填写需求描述' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择预算方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区' }]
             };
         }
     },

src/main/zhi-rong-web/src/components/popup/LogoAdd.vue

@@ -223,21 +223,21 @@ export default {
             },
             rules: {
                 name: [{ required: true, message: '请输入商标名称' }],
-                code: [{ required: true, message: '请输入商标申请号' }]
-                // logoType: [{ required: true, message: '请选择商标类型' }],
-                // category: [{ required: true, message: '请选择所属分类' }],
-                // servicesItem: [{ required: true, message: '请输入使用商品/服务项目' }],
-                // owner: [{ required: true, message: '请输入商标注册人' }],
-                // img: [{ required: true, message: '请上传商标图样' }],
-                // tradingMethodId: [{ required: true, message: '请选择交易方式' }],
-                // expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
-                // basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
-                // contact: [{ required: true, message: '请输入联系人' }],
-                // phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
-                // commissionType: [{ required: true, message: '请选择佣金类型' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区' }]
+                code: [{ required: true, message: '请输入商标申请号' }],
+                logoType: [{ required: true, message: '请选择商标类型' }],
+                category: [{ required: true, message: '请选择所属分类' }],
+                servicesItem: [{ required: true, message: '请输入使用商品/服务项目' }],
+                owner: [{ required: true, message: '请输入商标注册人' }],
+                img: [{ required: true, message: '请上传商标图样' }],
+                tradingMethodId: [{ required: true, message: '请选择交易方式' }],
+                expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
+                basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
+                contact: [{ required: true, message: '请输入联系人' }],
+                phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
+                commissionType: [{ required: true, message: '请选择佣金类型' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区' }]
             },
             logoTypeOptions,
             categoryOptions: [],

src/main/zhi-rong-web/src/components/popup/LogoDemandAdd.vue

@@ -125,17 +125,17 @@ export default {
             saving: false,
             formData: {},
             rules: {
-                containText: [{ required: true, message: '请输入需求商标包含文字' }]
-                // containLetter: [{ required: true, message: '请输入需求商标包含字母' }],
-                // containGraphic: [{ required: true, message: '请输入需求商标包含图形元素' }],
-                // category: [{ required: true, message: '请选择商标所属分类' }],
-                // description: [{ required: true, message: '请填写需求描述' }],
-                // modeId: [{ required: true, message: '请选择交易方式' }],
-                // expectedPrice: [{ required: true, validator: validatePrice, message: '请选择预算方式' }],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区' }]
+                containText: [{ required: true, message: '请输入需求商标包含文字' }],
+                containLetter: [{ required: true, message: '请输入需求商标包含字母' }],
+                containGraphic: [{ required: true, message: '请输入需求商标包含图形元素' }],
+                category: [{ required: true, message: '请选择商标所属分类' }],
+                description: [{ required: true, message: '请填写需求描述' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
+                expectedPrice: [{ required: true, validator: validatePrice, message: '请选择预算方式' }],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区' }]
             },
             categoryOptions: [],
             tradingMethodOption

src/main/zhi-rong-web/src/components/popup/PatentAdd.vue

@@ -391,26 +391,26 @@ export default {
             },
             rules: {
                 name: [{ required: true, message: '请输入专利名称' }],
-                code: [{ required: true, message: '请输入专利申请号' }]
-                // patentTypeId: [{ required: true, message: '请选择专利类型' }],
-                // ownerType: [{ required: true, message: '请输入专利权人类型', trigger: 'blur' }],
-                // industryClass: [{ required: true, message: '请选择所属领域' }],
-                // lawStatusId: [{ required: true, message: '请选择法律状态' }],
-                // applicant: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
-                // owner: [{ required: true, message: '请输入专利权人' }],
-                // inventor: [{ required: true, message: '请输入发明人' }],
-                // img: [{ required: true, message: '请上传专利附图' }],
-                // digest: [{ required: true, message: '请填写专利摘要' }],
-                // manual: [{ required: true, message: '请输入权利要求书' }],
-                // expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
-                // tradingMethodId: [{ required: true, message: '请选择交易方式' }],
-                // contact: [{ required: true, message: '请输入联系人' }],
-                // basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
-                // phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
-                // commissionType: [{ required: true, message: '请选择佣金类型' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区' }]
+                code: [{ required: true, message: '请输入专利申请号' }],
+                patentTypeId: [{ required: true, message: '请选择专利类型' }],
+                ownerType: [{ required: true, message: '请输入专利权人类型', trigger: 'blur' }],
+                industryClass: [{ required: true, message: '请选择行业分类' }],
+                lawStatusId: [{ required: true, message: '请选择法律状态' }],
+                applicant: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
+                owner: [{ required: true, message: '请输入专利权人' }],
+                inventor: [{ required: true, message: '请输入发明人' }],
+                img: [{ required: true, message: '请上传专利附图' }],
+                digest: [{ required: true, message: '请填写专利摘要' }],
+                manual: [{ required: true, message: '请输入权利要求书' }],
+                expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
+                tradingMethodId: [{ required: true, message: '请选择交易方式' }],
+                contact: [{ required: true, message: '请输入联系人' }],
+                basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
+                phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
+                commissionType: [{ required: true, message: '请选择佣金类型' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区' }]
             },
             industryOptions: [],
             industryOption: [],

src/main/zhi-rong-web/src/components/popup/PatentDemandAdd.vue

@@ -212,38 +212,38 @@ export default {
                         required: true,
                         message: `请输入需求${this.types === 'DECLASSIFICATION' ? '脱密专利' : '专利'}名称`
                     }
-                ]
-                // keyword: [
-                //     {
-                //         required: true,
-                //         message: `请输入需求${this.types === 'DECLASSIFICATION' ? '脱密专利' : '专利'}包含关键字`
-                //     }
-                // ],
-                // patentTypeId: [{ required: true, message: '请选择专利类型' }],
-                // patentStatusId: [{ required: true, message: '请选择法律状态' }],
-                // industryClass: [{ required: true, message: '请选择所属领域' }],
-                // description: [{ required: true, message: '请填写需求描述' }],
-                // modeId: [{ required: true, message: '请选择交易方式' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择预算方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区' }]
+                ],
+                keyword: [
+                    {
+                        required: true,
+                        message: `请输入需求${this.types === 'DECLASSIFICATION' ? '脱密专利' : '专利'}包含关键字`
+                    }
+                ],
+                patentTypeId: [{ required: true, message: '请选择专利类型' }],
+                patentStatusId: [{ required: true, message: '请选择法律状态' }],
+                industryClass: [{ required: true, message: '请选择所属领域' }],
+                description: [{ required: true, message: '请填写需求描述' }],
+                modeId: [{ required: true, message: '请选择交易方式' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择预算方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区' }]
             };
         }
     },

src/main/zhi-rong-web/src/components/popup/TechProductDemandAdd.vue

@@ -182,39 +182,39 @@ export default {
                         required: true,
                         message: `请输入需求${this.types === 'TECHNOLOGY' ? '技术成果' : '产品'}名称`
                     }
-                ]
-                // industry: [{ required: true, message: '请选择所属领域' }],
-                // stage: [{ required: true, message: '请选择所处阶段' }],
-                // patentType: [{ required: true, message: '请选择专利类型', trigger: 'blur' }],
-                // description: [{ required: true, message: '请填写需求描述' }],
-                // isPatented: [
-                //     {
-                //         required: true,
-                //         message: `请选择是否需要专利${this.types === 'TECHNOLOGY' ? '技术' : '产品'}`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // modeId: [{ required: true, message: '请选择交易方式' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择预算方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区' }]
+                ],
+                industry: [{ required: true, message: '请选择所属领域' }],
+                stage: [{ required: true, message: '请选择所处阶段' }],
+                patentType: [{ required: true, message: '请选择专利类型', trigger: 'blur' }],
+                description: [{ required: true, message: '请填写需求描述' }],
+                isPatented: [
+                    {
+                        required: true,
+                        message: `请选择是否需要专利${this.types === 'TECHNOLOGY' ? '技术' : '产品'}`,
+                        trigger: 'blur'
+                    }
+                ],
+                modeId: [{ required: true, message: '请选择交易方式' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择预算方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区' }]
             };
         }
     },

src/main/zhi-rong-web/src/components/popup/TechnologyProductAdd.vue

@@ -242,50 +242,50 @@ export default {
         },
         rules() {
             return {
-                name: [{ required: true, message: `请输入${this.types === 'TECHNOLOGY' ? '成果' : '产品'}名称` }]
-                // field: [{ required: true, message: '请选择所属领域' }],
-                // owner: [
-                //     {
-                //         required: true,
-                //         message: `请输入${this.types === 'TECHNOLOGY' ? '成果所属人' : '产品持有人'}`
-                //     }
-                // ],
-                // stage: [{ required: true, message: '请选择所处阶段' }],
-                // img: [{ required: true, message: `请上传${this.types === 'TECHNOLOGY' ? '技术' : '产品'}附图` }],
-                // digest: [{ required: true, message: `请填写${this.types === 'TECHNOLOGY' ? '摘要' : '产品概述'}` }],
-                // manual: [{ required: true, message: `请输入${this.types === 'TECHNOLOGY' ? '成果' : '产品'}说明` }],
-                // patented: [
-                //     {
-                //         required: true,
-                //         message: `请选择是否专利${this.types === 'TECHNOLOGY' ? '技术' : '产品'}`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // patentNo: [{ required: true, message: '请输入包含专利号' }],
-                // tradingMethodId: [{ required: true, message: '请选择交易方式' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择期望价方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
-                // contact: [{ required: true, message: '请输入联系人' }],
-                // phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
-                // commissionType: [{ required: true, message: '请选择佣金类型' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区' }]
+                name: [{ required: true, message: `请输入${this.types === 'TECHNOLOGY' ? '成果' : '产品'}名称` }],
+                field: [{ required: true, message: '请选择所属领域' }],
+                owner: [
+                    {
+                        required: true,
+                        message: `请输入${this.types === 'TECHNOLOGY' ? '成果所属人' : '产品持有人'}`
+                    }
+                ],
+                stage: [{ required: true, message: '请选择所处阶段' }],
+                img: [{ required: true, message: `请上传${this.types === 'TECHNOLOGY' ? '技术' : '产品'}附图` }],
+                digest: [{ required: true, message: `请填写${this.types === 'TECHNOLOGY' ? '摘要' : '产品概述'}` }],
+                manual: [{ required: true, message: `请输入${this.types === 'TECHNOLOGY' ? '成果' : '产品'}说明` }],
+                patented: [
+                    {
+                        required: true,
+                        message: `请选择是否专利${this.types === 'TECHNOLOGY' ? '技术' : '产品'}`,
+                        trigger: 'blur'
+                    }
+                ],
+                patentNo: [{ required: true, message: '请输入包含专利号' }],
+                tradingMethodId: [{ required: true, message: '请选择交易方式' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择期望价方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
+                contact: [{ required: true, message: '请输入联系人' }],
+                phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
+                commissionType: [{ required: true, message: '请选择佣金类型' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区' }]
             };
         }
     },

src/main/zhi-rong-web/src/styles/theme/aside.css

@@ -139,7 +139,7 @@
 /* BEM
  -------------------------- */
 .el-aside {
-  overflow: auto;
+  overflow-x: visible;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   -ms-flex-negative: 0;

src/main/zhi-rong-web/src/styles/theme/index.css

@@ -52945,7 +52945,7 @@
 /* BEM
  -------------------------- */
 .el-aside {
-  overflow: auto;
+  overflow-x: visible;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   -ms-flex-negative: 0;
@@ -53228,7 +53228,7 @@
   flex: 1;
   -ms-flex-preferred-size: auto;
   flex-basis: auto;
-  overflow: auto;
+  /* overflow: auto; */
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   padding: 20px; }

src/main/zhi-rong-web/src/styles/theme/main.css

@@ -275,7 +275,7 @@
   flex: 1;
   -ms-flex-preferred-size: auto;
   flex-basis: auto;
-  overflow: auto;
+  /* overflow: auto; */
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   padding: 20px; }

src/main/zhi-rong-web/src/views/About.vue

@@ -33,8 +33,8 @@
         <div class="history" ref="history" id="history">
             <div class="history_con">
                 <divider-title>
-                    <template>发展</template>
-                    <template #prim>历程</template>
+                    <!-- <template></template> -->
+                    <template #prim>发展历程</template>
                     <template #sub>Development process</template>
                 </divider-title>
                 <swiper ref="imgSwiper" class="content" :options="imgOptions">

src/main/zhi-rong-web/src/views/Home.vue

@@ -151,14 +151,19 @@
                     <div class="banner_con_titleOne_con banner_con_titleOne_con_one" @click="supplySide">
                         <img src="../assets/png-gongjice-bg@3x.png" alt="" class="banner_con_titleOne_img" />
                         <div class="supply_side_supply supply_side">
-                            <div class="supply_side_supply_one supply_side_one">供给侧</div>
-                            <div class="supply_side_supply_two supply_side_two">丰富的行业交流、政企交流活动</div>
-                            <div class="supply_side_supply_three">
+                            <div class="supply_side_demand_one supply_side_one">供给侧</div>
+                            <div class="supply_side_demand_two supply_side_two">丰富的行业交流、政企交流活动</div>
+                            <div class="supply_side_demand_three">
                                 去发布
+                                <img
+                                    src="../assets/nav_icon_bianjirigth@3x.png"
+                                    alt=""
+                                    class="supply_side_demand_three_img supply_side_demand_three_img_one"
+                                />
                                 <img
                                     src="../assets/nav_icon_bianji@3x.png"
                                     alt=""
-                                    class="supply_side_supply_three_img"
+                                    class="supply_side_demand_three_img supply_side_demand_three_img_two"
                                 />
                             </div>
                         </div>
@@ -1172,7 +1177,7 @@ export default {
 .tab {
     height: 360px;
     background: #ffffff;
-    box-shadow: 0px 2px 10px 0px #f5f7fa;
+    box-shadow: 0px 0px 6px 0px #d2dbf0;
     padding: 16px 16px 10px;
     box-sizing: border-box;
     position: relative;
@@ -1445,7 +1450,7 @@ export default {
     }
 }
 .banner_con_titleOne_con_one {
-    background: #2167eb;
+    background: #e0eeff;
     border-radius: 2px 0px 2px 2px;
     border: 1px solid rgba(56, 85, 142, 0.04);
 }
@@ -1482,7 +1487,7 @@ export default {
         width: 52px;
         height: 28px;
         font-size: 16px;
-        font-weight: bold;
+        // font-weight: bold;
         color: #818999;
         line-height: 28px;
         text-align: center;
@@ -1742,6 +1747,27 @@ export default {
                 }
             }
         }
+        .banner_con_titleOne_con_one:hover {
+            background: #2167eb;
+            border-radius: 2px 0px 2px 2px;
+            border: 1px solid rgba(56, 85, 142, 0.04);
+            .supply_side_demand_one {
+                color: #ffffff;
+            }
+            .supply_side_demand_two {
+                color: #ffffff;
+            }
+            .supply_side_demand_three {
+                background: #ffe54f;
+                color: #000000;
+                .supply_side_demand_three_img_one {
+                    display: none;
+                }
+                .supply_side_demand_three_img_two {
+                    display: block;
+                }
+            }
+        }
     }
     .banner_con_titleTwo {
         width: 1200px;

src/main/zhi-rong-web/src/views/agent/Index.vue

@@ -117,11 +117,11 @@ export default {
     methods: {
         scrollTo(isFirst = false) {
             this.$nextTick(() => {
-                let top = window.innerWidth * 0.2625 > 341 ? window.innerWidth * 0.2625 : 341;
+                let top = window.innerHeight * 0.2625 > 341 ? window.innerHeight * 0.2625 : 341;
                 setTimeout(
                     () => {
                         window.scrollTo({
-                            top: top + 60
+                            top: top + 180
                         });
                     },
                     isFirst ? 500 : 0
@@ -179,6 +179,7 @@ export default {
     color: #ffffff;
     .menu-left-con_title {
         font-size: 16px;
+        font-weight: bold;
     }
     img {
         width: 24px;
@@ -189,11 +190,13 @@ export default {
 .main {
     min-height: 980px;
     flex-grow: 1;
+    background: #ffffff;
+    box-shadow: 0px 0px 6px 0px #d2dbf0;
     .flex-col();
 }
 
 .menu-content {
-    min-height: 420px;
+    height: 370px;
     background-color: #fff;
     box-shadow: 0px 0px 6px 0px #d2dbf0;
 }
@@ -278,6 +281,7 @@ export default {
     &.is-active {
         background: linear-gradient(90deg, rgba(64, 92, 255, 0.1) 0%, rgba(255, 255, 255, 0.1) 100%);
         color: #405cff;
+        font-weight: bold;
     }
 }
 &.is-active::after {
@@ -290,3 +294,4 @@ export default {
     background-color: #405cff;
 }
 </style>
+

src/main/zhi-rong-web/src/views/legal/Index.vue

@@ -84,6 +84,7 @@ export default {
     color: #ffffff;
     .menu-left-con_title {
         font-size: 16px;
+        font-weight: bold;
     }
     img {
         width: 24px;
@@ -92,9 +93,9 @@ export default {
     }
 }
 .menu-content {
-    min-height: 800px;
+    min-height: 370px;
     background-color: #fff;
-    // box-shadow: 0px 0px 6px 0px #D2DBF0;
+    box-shadow: 0px 0px 6px 0px #D2DBF0;
 }
 
 .menu-center {
@@ -106,6 +107,7 @@ export default {
 }
 /deep/ .el-menu > .el-menu-item {
     &.is-active {
+        font-weight: bold;
         background: linear-gradient(90deg, rgba(64, 92, 255, 0.1) 0%, rgba(255, 255, 255, 0.1) 100%);
         color: #405cff;
     }

src/main/zhi-rong-web/src/views/legal/IntellectualProperty.vue

@@ -28,7 +28,7 @@ export default {
             industryClassOptions: [],
             list: [],
             defaultQuery: {
-                category: 'IntellectualProperty'
+                // category: 'IntellectualProperty'
             },
             defaultSort: {
                 sort: 'id,desc'

src/main/zhi-rong-web/src/views/market/Index.vue

@@ -96,6 +96,7 @@ export default {
     color: #ffffff;
     .menu-left-con_title {
         font-size: 16px;
+        font-weight: bold;
     }
     img {
         width: 24px;
@@ -119,14 +120,15 @@ export default {
     margin-top: 10px;
 }
 .menu-content {
-    min-height: 800px;
+    min-height: 720px;
     background-color: #fff;
-    // box-shadow: 0px 0px 6px 0px #D2DBF0;
+    box-shadow: 0px 0px 6px 0px #D2DBF0;
 }
 /deep/ .el-menu > .el-menu-item {
     &.is-active {
-        background: linear-gradient(90deg, #405cff 0%, #ffffff 100%);
+        background: linear-gradient(90deg, rgba(64, 92, 255, 0.1) 0%, rgba(255, 255, 255, 0.1) 100%);
         color: #405cff;
+        font-weight: bold;
     }
     // &.is-active::after {
     //     content: '';

src/main/zhi-rong-web/src/views/news/List.vue

@@ -41,8 +41,10 @@ import BannerNav from '../../components/BannerNav.vue';
 import newsDynamic from '../../components/newsDynamic.vue';
 import newsField from '../../components/newsField.vue';
 import newsDynamics from '../../components/newsDynamics.vue';
+import menu from '../../mixins/menu';
 export default {
     components: { MenuPage, newsField, newsDynamic, newsDynamics, Banner, BannerNav },
+    mixins: [menu],
     data() {
         return {
             flag: 1
@@ -59,10 +61,16 @@ export default {
                 }
             },
             immediate: true
+        },
+        watch: {
+            $route() {
+                this.scrollTo();
+            }
         }
     },
     methods: {
         handleSelect(key) {
+            this.scrollTo(true);
             this.flag = key;
             this.$router.push('/newsList?flag=' + key);
         }
@@ -71,6 +79,7 @@ export default {
         if (this.$route.query.flag) {
             this.handleSelect(this.$route.query.flag);
         }
+        this.scrollTo(true);
     }
 };
 </script>
@@ -90,14 +99,17 @@ export default {
     background-repeat: no-repeat;
 }
 .appContainer {
-    background: #FFFFFF;
+    background: #ffffff;
 }
 .menu-left {
     // min-height: 600px;
-    background-color: #fff;
+    width: 200px;
+    height: 280px;
+    background: #ffffff;
+    box-shadow: 0px 0px 6px 0px #d2dbf0;
     .menu-left-con {
         height: 60px;
-        background: #405CFF;
+        background: #405cff;
         display: flex;
         padding-left: 34px;
         align-items: center;
@@ -107,6 +119,7 @@ export default {
         color: #ffffff;
         .menu-left-con-title {
             font-size: 16px;
+            font-weight: bold;
         }
         img {
             width: 24px;
@@ -131,6 +144,7 @@ export default {
         background: linear-gradient(90deg, rgba(64, 92, 255, 0.1) 0%, rgba(255, 255, 255, 0.1) 100%);
         color: #405cff;
         position: relative;
+        font-weight: bold;
     }
     &.is-active::after {
         content: '';
@@ -143,3 +157,4 @@ export default {
     }
 }
 </style>
+

src/main/zhi-rong-web/src/views/user/Security.vue

@@ -38,12 +38,9 @@
                         </el-form-item>
                         <el-form-item label="验证码" prop="code">
                             <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
-                                <span
-                                    @click="send"
-                                    style="cursor: pointer; font-size: 13px"
-                                    slot="suffix"
-                                    >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
-                                >
+                                <span @click="send" style="cursor: pointer; font-size: 13px" slot="suffix">{{
+                                    time === 0 ? '发送验证码' : `重新发送${time}s`
+                                }}</span>
                             </el-input>
                         </el-form-item>
                     </el-form>
@@ -208,7 +205,7 @@ export default {
 <style lang="less" scoped>
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
-        background: #405CFF;
+        background: #405cff;
         color: #ffffff;
         border: 0;
     }
@@ -221,7 +218,7 @@ export default {
     }
 }
 /deep/ .el-step__title.is-finish {
-    color: #405CFF;
+    color: #405cff;
 }
 /deep/.el-step:nth-child(3) {
     .el-step__icon {
@@ -231,7 +228,7 @@ export default {
     }
 }
 /deep/ .el-input__suffix-inner {
-    color: #405CFF !important;
+    color: #405cff !important;
 }
 /deep/ .el-input__inner {
     height: 36px;
@@ -248,6 +245,9 @@ export default {
     color: #939599;
 }
 .container {
+    min-height: 560px;
+    background: #ffffff;
+    // box-shadow: 0px 0px 6px 0px #d2dbf0;
     .btn {
         text-align: center;
     }
@@ -280,9 +280,9 @@ export default {
         margin: 17px 20px 0;
     }
     /deep/ .el-button--primary {
-        background: #405CFF;
+        background: #405cff;
         border-radius: 4px;
-        border-color: #405CFF;
+        border-color: #405cff;
         box-sizing: border-box;
     }
     .box {
@@ -310,7 +310,7 @@ export default {
             .text3 {
                 font-size: 13px;
                 font-weight: 400;
-                color: #405CFF;
+                color: #405cff;
                 line-height: 18px;
                 cursor: pointer;
             }
@@ -318,7 +318,8 @@ export default {
     }
 }
 /deep/ .is-finish {
-    border-color: #405CFF !important;
-    color: #405CFF !important;
+    border-color: #405cff !important;
+    color: #405cff !important;
 }
 </style>
+

src/main/zhi-rong-web/src/views/user/UserEdit.vue

@@ -3,8 +3,7 @@
         <div class="main_con" v-if="personalData === 1">
             <div class="title">个人资料</div>
             <div class="top">
-                <single-upload class="img" v-model="sizeForm.avatar" :modifyAvatar = true>
-                </single-upload>
+                <single-upload class="img" v-model="sizeForm.avatar" :modifyAvatar="true"> </single-upload>
                 <!-- <input id="uploadFile" @change="upload" type="file" accept="jpg,png,gif,jpeg" v-show="false" /> -->
                 <el-form :model="form" ref="form" label-width="0">
                     <el-form-item style="margin-left: -60px; margin-top: 80px; width: 400px" class="form_con">
@@ -60,11 +59,7 @@
             <mechanism-info @change-type="onChangeType"></mechanism-info>
         </div>
         <el-dialog center :visible.sync="authentications" width="610px">
-            <img
-            src="../../assets/icon_renzheng@3x.png"
-                alt=""
-                class="authentication_img"
-            />
+            <img src="../../assets/icon_renzheng@3x.png" alt="" class="authentication_img" />
             <div class="authentication_tip">当前为普通用户，请进行用户认证！</div>
             <div class="authentication_btn">
                 <div class="authentication_btn_one" @click="personalCertificationButton">个人认证</div>
@@ -257,9 +252,12 @@ export default {
 
 <style lang="less" scoped>
 .main {
-    background-color: #fff;
-    margin: 17px 20px 0;
-    margin-bottom: 40px;
+    min-height: 681px !important;
+    background: #ffffff;
+    .main_con {
+        margin: 17px 20px 0;
+        margin-bottom: 40px;
+    }
     .title {
         font-size: 16px;
         font-weight: bold;
@@ -272,7 +270,7 @@ export default {
         margin-left: 300px;
         margin-top: 30px;
         .img {
-            /deep/ .el-upload{
+            /deep/ .el-upload {
                 width: 148px;
                 height: 148px;
                 display: block;
@@ -333,17 +331,17 @@ export default {
     .authentication_btn_one {
         width: 110px;
         height: 36px;
-        background: rgba(64,92,255,0.1);
+        background: rgba(64, 92, 255, 0.1);
         border-radius: 4px;
-        border: 1px solid #405CFF;
+        border: 1px solid #405cff;
         margin-right: 20px;
-        color: #405CFF;
+        color: #405cff;
         line-height: 36px;
     }
     .authentication_btn_two {
         width: 110px;
         height: 36px;
-        background: #405CFF;
+        background: #405cff;
         border-radius: 4px;
         color: #ffffff;
         line-height: 36px;
@@ -370,7 +368,7 @@ export default {
 .real_name_con {
     display: flex;
 }
-.form_con{
+.form_con {
     border-bottom: 1px solid @bg;
 }
 .real_name {
@@ -420,7 +418,7 @@ export default {
         cursor: pointer;
         font-size: 13px;
         font-weight: 400;
-        color: #405CFF;
+        color: #405cff;
         line-height: 24px;
     }
     .real_name_three_con {
@@ -434,7 +432,7 @@ export default {
 .modify_account_number {
     font-size: 13px;
     font-weight: 400;
-    color: #405CFF;
+    color: #405cff;
     line-height: 24px;
     cursor: pointer;
     margin-left: 10px;
@@ -451,7 +449,7 @@ export default {
     margin-left: 15px;
     width: 221px;
     height: 36px;
-    background: #405CFF;
+    background: #405cff;
     border-radius: 4px;
     font-size: 13px;
     font-weight: bold;
@@ -460,3 +458,4 @@ export default {
     text-align: center;
 }
 </style>
+

src/main/zhi-rong-web/src/views/user/UserMain.vue

@@ -89,7 +89,7 @@ export default {
     background: #ffffff;
 }
 .menu-left {
-    min-height: 600px;
+    min-height: 350px;
     background-color: #fff;
     box-shadow: 0px 0px 6px 0px #d2dbf0;
 }
@@ -115,8 +115,9 @@ export default {
 .main {
     .flex-col();
     background-color: #fff;
+    box-shadow: 0px 0px 6px 0px #D2DBF0;
     flex-grow: 1;
-    min-height: 1100px;
+    // min-height: 1100px;
 }
 /deep/ .el-menu-item {
     // text-align: center;

src/main/zhi-rong-web/src/views/user/publish/CopyrightDemandEdit.vue

@@ -158,36 +158,36 @@ export default {
                         message: `请输入需求${this.type === 'COPY' ? '作品' : '软著'}名称`,
                         trigger: 'blur'
                     }
-                ]
-                // workType: [
-                //     {
-                //         required: true,
-                //         message: `请选择需求${this.type === 'COPY' ? '作品' : '软著'}类型`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
-                // modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择预算方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
+                ],
+                workType: [
+                    {
+                        required: true,
+                        message: `请选择需求${this.type === 'COPY' ? '作品' : '软著'}类型`,
+                        trigger: 'blur'
+                    }
+                ],
+                description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
+                modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择预算方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
             };
         }
     },

src/main/zhi-rong-web/src/views/user/publish/CopyrightEdit.vue

@@ -188,43 +188,43 @@ export default {
                         message: `请输入${this.type === 'COPY' ? '版本' : '软著'}登记号`,
                         trigger: 'blur'
                     }
-                ]
-                // workType: [
-                //     { required: true, message: `请选择${this.type === 'COPY' ? '作品' : '软著'}类型`, trigger: 'blur' }
-                // ],
-                // author: [{ required: true, message: '请输入作者，按回车分割', trigger: 'blur' }],
-                // owner: [{ required: true, message: '请输入著作权人', trigger: 'blur' }],
-                // img: [
-                //     {
-                //         required: true,
-                //         message: `请上传${this.type === 'COPY' ? '作品' : '软著'}附图`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // tradingMethod: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择期望价方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
-                // contact: [{ required: true, message: '请输入联系人' }],
-                // phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
-                // commissionType: [{ required: true, message: '请选择佣金类型', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
+                ],
+                workType: [
+                    { required: true, message: `请选择${this.type === 'COPY' ? '作品' : '软著'}类型`, trigger: 'blur' }
+                ],
+                author: [{ required: true, message: '请输入作者，按回车分割', trigger: 'blur' }],
+                owner: [{ required: true, message: '请输入著作权人', trigger: 'blur' }],
+                img: [
+                    {
+                        required: true,
+                        message: `请上传${this.type === 'COPY' ? '作品' : '软著'}附图`,
+                        trigger: 'blur'
+                    }
+                ],
+                tradingMethod: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择期望价方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
+                contact: [{ required: true, message: '请输入联系人' }],
+                phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
+                commissionType: [{ required: true, message: '请选择佣金类型', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
             };
         }
     },

src/main/zhi-rong-web/src/views/user/publish/LogoEdit.vue

@@ -211,21 +211,21 @@ export default {
             },
             rules: {
                 name: [{ required: true, message: '请输入商标名称', trigger: 'blur' }],
-                code: [{ required: true, message: '请输入商标申请号', trigger: 'blur' }]
-                // logoType: [{ required: true, message: '请选择商标类型', trigger: 'blur' }],
-                // category: [{ required: true, message: '请选择所属分类', trigger: 'blur' }],
-                // servicesItem: [{ required: true, message: '请输入使用商品/服务项目', trigger: 'blur' }],
-                // owner: [{ required: true, message: '请输入商标注册人', trigger: 'blur' }],
-                // img: [{ required: true, message: '请上传商标附图', trigger: 'blur' }],
-                // tradingMethod: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
-                // expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
-                // basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
-                // commissionType: [{ required: true, message: '请选择佣金类型', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
+                code: [{ required: true, message: '请输入商标申请号', trigger: 'blur' }],
+                logoType: [{ required: true, message: '请选择商标类型', trigger: 'blur' }],
+                category: [{ required: true, message: '请选择所属分类', trigger: 'blur' }],
+                servicesItem: [{ required: true, message: '请输入使用商品/服务项目', trigger: 'blur' }],
+                owner: [{ required: true, message: '请输入商标注册人', trigger: 'blur' }],
+                img: [{ required: true, message: '请上传商标附图', trigger: 'blur' }],
+                tradingMethod: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
+                basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
+                commissionType: [{ required: true, message: '请选择佣金类型', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
             },
             logoTypeOptions: [
                 { label: '普通商标', value: 'GENERAL' },

src/main/zhi-rong-web/src/views/user/publish/Patent.vue

@@ -77,6 +77,7 @@ export default {
 
 <style lang="less" scoped>
 .contaniner {
+    min-height: 1100px;
     .flex-col();
 }
 .list {

src/main/zhi-rong-web/src/views/user/publish/PatentEdit.vue

@@ -292,26 +292,26 @@ export default {
             },
             rules: {
                 name: [{ required: true, message: '请输入专利名称', trigger: 'blur' }],
-                code: [{ required: true, message: '请输入专利申请号', trigger: 'blur' }]
-                // patentTypeId: [{ required: true, message: '请选择专利类型', trigger: 'blur' }],
-                // industryClass: [{ required: true, message: '请选择所属领域', trigger: 'blur' }],
-                // lawStatusId: [{ required: true, message: '请选择法律状态', trigger: 'blur' }],
-                // ownerType: [{ required: true, message: '请输入专利权人类型', trigger: 'blur' }],
-                // owner: [{ required: true, message: '请输入专利权人', trigger: 'blur' }],
-                // inventor: [{ required: true, message: '请输入发明人', trigger: 'blur' }],
-                // img: [{ required: true, message: '请上传专利附图', trigger: 'blur' }],
-                // applicant: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
-                // digest: [{ required: true, message: '请填写专利摘要', trigger: 'blur' }],
-                // manual: [{ required: true, message: '请输入专利说明', trigger: 'blur' }],
-                // tradingMethodId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
-                // expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
-                // phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
-                // commissionType: [{ required: true, message: '请选择佣金类型', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
+                code: [{ required: true, message: '请输入专利申请号', trigger: 'blur' }],
+                patentTypeId: [{ required: true, message: '请选择专利类型', trigger: 'blur' }],
+                industryClass: [{ required: true, message: '请选择所属领域', trigger: 'blur' }],
+                lawStatusId: [{ required: true, message: '请选择法律状态', trigger: 'blur' }],
+                ownerType: [{ required: true, message: '请输入专利权人类型', trigger: 'blur' }],
+                owner: [{ required: true, message: '请输入专利权人', trigger: 'blur' }],
+                inventor: [{ required: true, message: '请输入发明人', trigger: 'blur' }],
+                img: [{ required: true, message: '请上传专利附图', trigger: 'blur' }],
+                applicant: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
+                digest: [{ required: true, message: '请填写专利摘要', trigger: 'blur' }],
+                manual: [{ required: true, message: '请输入专利说明', trigger: 'blur' }],
+                tradingMethodId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                expectedPrice: [{ required: true, validator: validatePrice, message: '请选择期望价方式' }],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
+                phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
+                commissionType: [{ required: true, message: '请选择佣金类型', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
             },
             industryOptions: [],
             industryOption: [],

src/main/zhi-rong-web/src/views/user/publish/TechProductDemandEdit.vue

@@ -210,39 +210,39 @@ export default {
                         message: `请输入需求${this.tpType === 'TECHNOLOGY' ? '技术成果' : '产品'}名称`,
                         trigger: 'blur'
                     }
-                ]
-                // industry: [{ required: true, message: '请选择所属领域', trigger: 'blur' }],
-                // stage: [{ required: true, message: '请选择所处阶段', trigger: 'blur' }],
-                // patentType: [{ required: true, message: '请选择专利类型', trigger: 'blur' }],
-                // description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
-                // isPatented: [
-                //     {
-                //         required: true,
-                //         message: `请选择是否需要专利${this.tpType === 'TECHNOLOGY' ? '技术' : '产品'}`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择预算方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
+                ],
+                industry: [{ required: true, message: '请选择所属领域', trigger: 'blur' }],
+                stage: [{ required: true, message: '请选择所处阶段', trigger: 'blur' }],
+                patentType: [{ required: true, message: '请选择专利类型', trigger: 'blur' }],
+                description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
+                isPatented: [
+                    {
+                        required: true,
+                        message: `请选择是否需要专利${this.tpType === 'TECHNOLOGY' ? '技术' : '产品'}`,
+                        trigger: 'blur'
+                    }
+                ],
+                modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择预算方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
             };
         },
         title() {

src/main/zhi-rong-web/src/views/user/publish/TechnologyProductEdit.vue

@@ -240,69 +240,69 @@ export default {
                         message: `请输入${this.tpType === 'TECHNOLOGY' ? '成果' : '产品'}名称`,
                         trigger: 'blur'
                     }
-                ]
-                // field: [{ required: true, message: '请选择所属领域', trigger: 'blur' }],
-                // owner: [
-                //     {
-                //         required: true,
-                //         message: `请输入${this.tpType === 'TECHNOLOGY' ? '成果所属人' : '产品持有人'}`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // stage: [{ required: true, message: '请选择所处阶段', trigger: 'blur' }],
-                // img: [
-                //     {
-                //         required: true,
-                //         message: `请上传${this.tpType === 'TECHNOLOGY' ? '技术' : '产品'}附图`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // digest: [
-                //     {
-                //         required: true,
-                //         message: `请填写${this.tpType === 'TECHNOLOGY' ? '摘要' : '产品概述'}`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // manual: [
-                //     {
-                //         required: true,
-                //         message: `请输入${this.tpType === 'TECHNOLOGY' ? '成果' : '产品'}说明`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // patented: [
-                //     {
-                //         required: true,
-                //         message: `请选择是否专利${this.tpType === 'TECHNOLOGY' ? '技术' : '产品'}`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // patentNo: [{ required: true, message: '请输入包含专利号', trigger: 'blur' }],
-                // tradingMethod: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择期望价方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
-                // commissionType: [{ required: true, message: '请选择佣金类型', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
+                ],
+                field: [{ required: true, message: '请选择所属领域', trigger: 'blur' }],
+                owner: [
+                    {
+                        required: true,
+                        message: `请输入${this.tpType === 'TECHNOLOGY' ? '成果所属人' : '产品持有人'}`,
+                        trigger: 'blur'
+                    }
+                ],
+                stage: [{ required: true, message: '请选择所处阶段', trigger: 'blur' }],
+                img: [
+                    {
+                        required: true,
+                        message: `请上传${this.tpType === 'TECHNOLOGY' ? '技术' : '产品'}附图`,
+                        trigger: 'blur'
+                    }
+                ],
+                digest: [
+                    {
+                        required: true,
+                        message: `请填写${this.tpType === 'TECHNOLOGY' ? '摘要' : '产品概述'}`,
+                        trigger: 'blur'
+                    }
+                ],
+                manual: [
+                    {
+                        required: true,
+                        message: `请输入${this.tpType === 'TECHNOLOGY' ? '成果' : '产品'}说明`,
+                        trigger: 'blur'
+                    }
+                ],
+                patented: [
+                    {
+                        required: true,
+                        message: `请选择是否专利${this.tpType === 'TECHNOLOGY' ? '技术' : '产品'}`,
+                        trigger: 'blur'
+                    }
+                ],
+                patentNo: [{ required: true, message: '请输入包含专利号', trigger: 'blur' }],
+                tradingMethod: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择期望价方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                basePrice: [{ required: true, message: '请输入底价', trigger: 'blur' }],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
+                commissionType: [{ required: true, message: '请选择佣金类型', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
             };
         }
     },

src/main/zhi-rong-web/src/views/user/publish/logoDemandEdit.vue

@@ -145,17 +145,17 @@ export default {
             needChange: true,
             formData: {},
             rules: {
-                containText: [{ required: true, message: '请输入需求商标包含文字', trigger: 'blur' }]
-                // containLetter: [{ required: true, message: '请输入需求商标包含字母', trigger: 'blur' }],
-                // containGraphic: [{ required: true, message: '请输入需求商标包含图形元素', trigger: 'blur' }],
-                // category: [{ required: true, message: '请选择商标所属分类', trigger: 'blur' }],
-                // description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
-                // modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
-                // expectedPrice: [{ required: true, validator: validatePrice, message: '请选择预算方式' }],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
+                containText: [{ required: true, message: '请输入需求商标包含文字', trigger: 'blur' }],
+                containLetter: [{ required: true, message: '请输入需求商标包含字母', trigger: 'blur' }],
+                containGraphic: [{ required: true, message: '请输入需求商标包含图形元素', trigger: 'blur' }],
+                category: [{ required: true, message: '请选择商标所属分类', trigger: 'blur' }],
+                description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
+                modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                expectedPrice: [{ required: true, validator: validatePrice, message: '请选择预算方式' }],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
             },
             categoryOptions: [],
             tradingMethodOption

src/main/zhi-rong-web/src/views/user/publish/patentDemandEdit.vue

@@ -224,39 +224,39 @@ export default {
                         message: `请输入需求${this.caseType === 'DECLASSIFICATION' ? '脱密专利' : '专利'}名称`,
                         trigger: 'blur'
                     }
-                ]
-                // keyword: [
-                //     {
-                //         required: true,
-                //         message: `请输入需求${this.caseType === 'DECLASSIFICATION' ? '脱密专利' : '专利'}包含关键字`,
-                //         trigger: 'blur'
-                //     }
-                // ],
-                // patentTypeId: [{ required: true, message: '请选择专利类型', trigger: 'blur' }],
-                // patentStatusId: [{ required: true, message: '请选择法律状态', trigger: 'blur' }],
-                // industryClass: [{ required: true, message: '请选择所属领域', trigger: 'blur' }],
-                // description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
-                // modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
-                // expectedPrice: [
-                //     {
-                //         required: true,
-                //         validator: (rule, value, callback) => {
-                //             if (!this.formData.negotiateDirectly) {
-                //                 if (!this.formData.expectedPrice) {
-                //                     callback(new Error('请选择预算方式'));
-                //                 } else {
-                //                     callback();
-                //                 }
-                //             } else {
-                //                 callback();
-                //             }
-                //         }
-                //     }
-                // ],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
+                ],
+                keyword: [
+                    {
+                        required: true,
+                        message: `请输入需求${this.caseType === 'DECLASSIFICATION' ? '脱密专利' : '专利'}包含关键字`,
+                        trigger: 'blur'
+                    }
+                ],
+                patentTypeId: [{ required: true, message: '请选择专利类型', trigger: 'blur' }],
+                patentStatusId: [{ required: true, message: '请选择法律状态', trigger: 'blur' }],
+                industryClass: [{ required: true, message: '请选择所属领域', trigger: 'blur' }],
+                description: [{ required: true, message: '请填写需求描述', trigger: 'blur' }],
+                modeId: [{ required: true, message: '请选择交易方式', trigger: 'blur' }],
+                expectedPrice: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (!this.formData.negotiateDirectly) {
+                                if (!this.formData.expectedPrice) {
+                                    callback(new Error('请选择预算方式'));
+                                } else {
+                                    callback();
+                                }
+                            } else {
+                                callback();
+                            }
+                        }
+                    }
+                ],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: [{ required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                address: [{ required: true, message: '请输入所在地区', trigger: 'blur' }]
             };
         }
     },

src/main/zhi-rong-web/src/views/user/publish/technicalEdit.vue

@@ -125,17 +125,17 @@ export default {
             saving: false,
             formData: {},
             rules: {
-                name: [{ required: true, message: '请输入姓名', trigger: 'blur' }]
-                // sex: [{ required: true, message: '请选择性别', trigger: 'blur' }],
-                // qualification: [{ required: true, message: '请添加资质图片', trigger: 'blur' }],
-                // content: [{ required: true, message: '服务内容列表', trigger: 'blur' }],
-                // field: [{ required: true, message: '请选择专业领域', trigger: 'blur' }],
-                // contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                // phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
-                // selfIntroduction: [{ required: true, message: '请填写主要业绩', trigger: 'blur' }],
-                // email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
-                // commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
-                // work: [{ required: true, message: '请输入所在单位', trigger: 'blur' }]
+                name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+                sex: [{ required: true, message: '请选择性别', trigger: 'blur' }],
+                qualification: [{ required: true, message: '请添加资质图片', trigger: 'blur' }],
+                content: [{ required: true, message: '服务内容列表', trigger: 'blur' }],
+                field: [{ required: true, message: '请选择专业领域', trigger: 'blur' }],
+                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                phone: { required: true, pattern: phonePattern, message: '请输入联系电话', trigger: 'blur' },
+                selfIntroduction: [{ required: true, message: '请填写主要业绩', trigger: 'blur' }],
+                email: [{ type: 'email', required: true, message: '请输入邮箱', trigger: 'blur' }],
+                commission: [{ required: true, message: '请输入佣金', trigger: 'blur' }],
+                work: [{ required: true, message: '请输入所在单位', trigger: 'blur' }]
             },
             fieldOptions: [],
             sexOptions: [