采美百科、采美文章小版本修改

src/main/resources/static/css/encyclopedia/detail.css

@@ -42,6 +42,12 @@ img{cursor: pointer;}
 .article .section.question .content .collapse dt .icon{position:absolute;right:0;top:2px;cursor:pointer}
 .article .section.question .content .collapse dd{padding-right:0;margin-top:4px;}
 .article .section.question .content .collapse dd span{background:#34cc8c}
+.article .section.publish-info{display: flex;justify-content: space-between;align-items: center;font-size: 12px;color: #666}
+.article .section.some-link .group{ display: flex;justify-content: space-between;align-items: center; }
+.article .section.some-link .group .link{flex: 1; display: flex; align-items: center;margin-top: 24px}
+.article .section.some-link .group .link .name{ font-size: 16px; margin-left: 16px;max-width: 300px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap }
+.article .section.some-link .group .link .image{ width: 60px;height: 60px; }
+
 .contact-popup{display: none; position:fixed;top: 50%;left: 50%;z-index: 99999; transform: translate(-50%,-50%); width:314px;height:418px;overflow:hidden;background:url(/img/encyclopedia/contact.png) no-repeat center}
 .contact-popup .close{position:absolute;display:block;width:30px;height:30px;text-align:center;line-height:30px;top:10px;right:20px;font-size:28px;color:#2c3038;cursor:pointer}
 .contact-popup .content{margin-top:130px}

src/main/resources/static/css/supplier-center/article/article-list.css

@@ -2,7 +2,7 @@
 @media screen and (min-width: 768px){
 .top-row{width:968px;padding:12px 0 12px 236px;margin:0 auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}
 .top-row .crumbs{width:auto;padding:0;margin:0}
-.top-row .hot-tip{font-size:12px;color:#E15616}
+.hot-tip{font-size:12px;color:#E15616;margin-bottom: 16px;}
 .form-section{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap}
 .form-section .form-item{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;padding-bottom:18px}
 .form-section .form-item .form-label{margin-right:8px;font-size:14px;color:#627386}
@@ -28,7 +28,7 @@
 .article-list .table .title,.article-list .table .time,.article-list .table .option{width:100px}
 .article-list .table .title{white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}
 .article-list .table .reason{display:inline-block;width:14px;height:14px;background:#FF2A2A;color:#fff;border-radius:50%;vertical-align:middle;line-height:14px;text-align:center;margin-left:2px;cursor: help;}
-.article-list .table .option .form-button{width:40px;height:22px;margin:2px 0;line-height:22px;text-align:center;background:#FFE6DC;border:1px solid #E15616;border-radius:2px;font-size:12px;color:#E15616;cursor:pointer}
+.article-list .table .option .form-button{padding: 0 2px; height:22px;margin:2px 0;line-height:22px;text-align:center;background:#FFE6DC;border:1px solid #E15616;border-radius:2px;font-size:12px;color:#E15616;cursor:pointer}
 .article-list .table .cover{display:inline-block;width:48px;height:48px;border:1px dashed #E2E7EF}
 .article-list .state{color:#22272E}
 .article-list .state.success{color:#34CC8C}
@@ -41,7 +41,7 @@
 @media screen and (max-width: 768px){
 /*.top-row{width:968px;padding:12px 0 12px 236px;margin:0 auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}*/
 .top-row .crumbs{width:auto;padding:0;margin:0}
-.top-row .hot-tip{font-size:2.8vw;color:#E15616}
+.hot-tip{font-size:2.8vw;color:#E15616;margin-bottom: 3.2vw}
 .form-section .form-item{padding-bottom:18px}
 .form-section .form-item .form-label{font-size:3.4vw;color:#627386;margin-bottom: 2.8vw;display: block}
 .form-section .form-item:nth-child(1) .form-label,
@@ -69,7 +69,7 @@
 .article-list .table .title,.article-list .table .time,.article-list .table .option{width:100px}
 .article-list .table .title{white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}
 .article-list .table .reason{display:inline-block;width:14px;height:14px;background:#FF2A2A;color:#fff;border-radius:50%;vertical-align:middle;line-height:14px;text-align:center;margin-left:2px;cursor: help;}
-.article-list .table .option .form-button{width:40px;height:22px;margin:2px 0;line-height:22px;text-align:center;background:#FFE6DC;border:1px solid #E15616;border-radius:2px;font-size:2.8vw;color:#E15616;cursor:pointer}
+.article-list .table .option .form-button{padding: 0 2px;height:22px;margin:2px 0;line-height:22px;text-align:center;background:#FFE6DC;border:1px solid #E15616;border-radius:2px;font-size:2.8vw;color:#E15616;cursor:pointer}
 .article-list .table .cover{display:inline-block;width:48px;height:48px;border:1px dashed #E2E7EF}
 .article-list .state{color:#22272E}
 .article-list .state.success{color:#34CC8C}

src/main/resources/static/css/supplier-center/encyclopedia/article-list.css

@@ -2,7 +2,7 @@
 @media screen and (min-width: 768px){
 .top-row{width:968px;padding:12px 0 12px 236px;margin:0 auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}
 .top-row .crumbs{width:auto;padding:0;margin:0}
-.top-row .hot-tip{font-size:12px;color:#E15616}
+.hot-tip{font-size:12px;color:#E15616;margin-bottom: 16px}
 .form-section{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap}
 .form-section .form-item{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;padding-bottom:18px}
 .form-section .form-item .form-label{margin-right:8px;font-size:14px;color:#627386}
@@ -28,7 +28,7 @@
 .article-list .table .title,.article-list .table .time,.article-list .table .option{width:100px}
 .article-list .table .title{white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}
 .article-list .table .reason{display:inline-block;width:14px;height:14px;background:#FF2A2A;color:#fff;border-radius:50%;vertical-align:middle;line-height:14px;text-align:center;margin-left:2px;cursor: help;}
-.article-list .table .option .form-button{width:40px;height:22px;margin:2px 0;line-height:22px;text-align:center;background:#FFE6DC;border:1px solid #E15616;border-radius:2px;font-size:12px;color:#E15616;cursor:pointer}
+.article-list .table .option .form-button{padding: 0 2px; height:22px;margin:2px 0;line-height:22px;text-align:center;background:#FFE6DC;border:1px solid #E15616;border-radius:2px;font-size:12px;color:#E15616;cursor:pointer}
 .article-list .table .cover{display:inline-block;width:48px;height:48px;border:1px dashed #E2E7EF}
 .article-list .state{color:#22272E}
 .article-list .state.success{color:#34CC8C}
@@ -41,7 +41,7 @@
 @media screen and (max-width: 768px){
 /*.top-row{width:968px;padding:12px 0 12px 236px;margin:0 auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}*/
 .top-row .crumbs{width:auto;padding:0;margin:0}
-.top-row .hot-tip{font-size:2.8vw;color:#E15616}
+.hot-tip{font-size:2.8vw;color:#E15616}
 .form-section .form-item{padding-bottom:18px}
 .form-section .form-item .form-label{font-size:3.4vw;color:#627386;margin-bottom: 2.8vw;display: block}
 .form-section .form-item:nth-child(1) .form-label,
@@ -69,7 +69,7 @@
 .article-list .table .title,.article-list .table .time,.article-list .table .option{width:100px}
 .article-list .table .title{white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}
 .article-list .table .reason{display:inline-block;width:14px;height:14px;background:#FF2A2A;color:#fff;border-radius:50%;vertical-align:middle;line-height:14px;text-align:center;margin-left:2px;cursor: help;}
-.article-list .table .option .form-button{width:40px;height:22px;margin:2px 0;line-height:22px;text-align:center;background:#FFE6DC;border:1px solid #E15616;border-radius:2px;font-size:2.8vw;color:#E15616;cursor:pointer}
+.article-list .table .option .form-button{padding: 0 2px;height:22px;margin:2px 0;line-height:22px;text-align:center;background:#FFE6DC;border:1px solid #E15616;border-radius:2px;font-size:2.8vw;color:#E15616;cursor:pointer}
 .article-list .table .cover{display:inline-block;width:48px;height:48px;border:1px dashed #E2E7EF}
 .article-list .state{color:#22272E}
 .article-list .state.success{color:#34CC8C}

src/main/resources/static/js/supplier-center/article/article-list.js

@@ -111,7 +111,8 @@ var articleList = new Vue({
                 if (res.code === 0) {
                     // 不刷新数据更新
                     article.status = newStatus;
-                    CAIMEI.dialog('修改文章状态成功!');
+                    const tip = newStatus ? '文章已发布' : '文章已存入草稿箱';
+                    CAIMEI.dialog(tip);
                 } else {
                     CAIMEI.dialog('修改文章状态失败!');
                 }

src/main/resources/static/js/supplier-center/encyclopedia/instrument-edit.js

@@ -61,17 +61,17 @@ const app = new Vue({
                 producePlace: '',
                 // 上市时间
                 marketTime: '',
-                // 公司/厂商
+                // 供应商
                 company: '',
                 // NMPA认证时间
                 nmpaTime: '',
                 // 仪器认证
                 authImageList: '',
-                // 适应人群
+                // 适应证
                 adaptiveMan: '',
                 // 不适应人群
                 unAdaptiveMan: '',
-                // 术前术后
+                // 注意事项
                 aroundOperation: '',
                 // 效果展示图片列表
                 displayImageList: '',
@@ -81,6 +81,10 @@ const app = new Vue({
                 typeId: '',
                 // 仪器状态
                 status: 1,
+                // seo关键词
+                seo: '',
+                // 仪器链接
+                link: ''
             },
             rules: {
                 // 仪器名称
@@ -91,44 +95,46 @@ const app = new Vue({
                 discription: [{required: true, message: '仪器概述不能为空', trigger: ['change', 'blur']}],
                 // 仪器图片
                 image: [{required: true, message: '请上传仪器图片', trigger: 'change'}],
-                // 认证链接
-                authLink: [{required: true, message: '请输入认证链接', trigger: ['change', 'blur']}],
-                // 认证二维码
-                authQrCode: [{required: true, message: '请上传证二维码', trigger: 'change'}],
+                // 产品链接
+                link: [{required: true, message: '产品链接不能为空', trigger: ['change', 'blur']}],
                 // 产仪器参数
                 paramList: [{required: true, validator: validateParamList, trigger: 'change'}],
-                // 仪器优点
-                advantage: [{required: true, message: '仪器优点不能为空', trigger: 'change'}],
-                // 仪器缺点
-                disadvantage: [{required: true, message: '仪器缺点不能为空', trigger: 'change'}],
-                // 仪器原理
-                principle: [{required: true, message: '仪器原理不能为空', trigger: 'change'}],
-                // 品牌
-                brand: [{required: true, message: '请输入仪器品牌', trigger: ['change', 'blur']}],
-                // 产地
-                producePlace: [{required: true, message: '仪器产地不能为空', trigger: ['change', 'blur']}],
-                // 上市时间
-                marketTime: [{required: true, message: '请填写上市时间', trigger: 'change'}],
-                // 公司/厂商
-                company: [{required: true, message: '公司/厂商不能为空', trigger: ['change', 'blur']}],
-                // NMPA认证时间
-                nmpaTime: [{required: true, message: '请填写NMPA认证时间', trigger: 'change'}],
-                // 仪器认证
-                authImageList: [{required: true, message: '请上传仪器认证图片', trigger: 'change'}],
-                // 适应人群
-                adaptiveMan: [{required: true, message: '适应人群不能为空', trigger: 'change'}],
-                // 不适应人群
-                unAdaptiveMan: [{required: true, message: '不适应人群不能为空', trigger: 'change'}],
-                // 术前术后
-                aroundOperation: [{required: true, message: '术前术后不能为空', trigger: 'change'}],
-                // 效果展示图片列表
-                displayImageList: [{required: true, message: '请上传效果展示图片', trigger: 'change'}],
-                // 常见问题
-                questionList: [{required: true, validator: validateQuestionList, trigger: 'change'}],
-                // 仪器类别
-                typeId: [{required: true, message: '请选择仪器类别', trigger: 'change'}],
-                // 仪器状态
-                status: [{required: true, message: '请选择仪器状态', trigger: 'change'}],
+                // // 认证链接
+                // authLink: [{required: true, message: '请输入认证链接', trigger: ['change', 'blur']}],
+                // // 认证二维码
+                // authQrCode: [{required: true, message: '请上传证二维码', trigger: 'change'}],
+                // // 仪器优点
+                // advantage: [{required: true, message: '仪器优点不能为空', trigger: 'change'}],
+                // // 仪器缺点
+                // disadvantage: [{required: true, message: '仪器缺点不能为空', trigger: 'change'}],
+                // // 仪器原理
+                // principle: [{required: true, message: '仪器原理不能为空', trigger: 'change'}],
+                // // 品牌
+                // brand: [{required: true, message: '请输入仪器品牌', trigger: ['change', 'blur']}],
+                // // 产地
+                // producePlace: [{required: true, message: '仪器产地不能为空', trigger: ['change', 'blur']}],
+                // // 上市时间
+                // marketTime: [{required: true, message: '请填写上市时间', trigger: 'change'}],
+                // // 供应商
+                // company: [{required: true, message: '公司/厂商不能为空', trigger: ['change', 'blur']}],
+                // // NMPA认证时间
+                // nmpaTime: [{required: true, message: '请填写NMPA认证时间', trigger: 'change'}],
+                // // 仪器认证
+                // authImageList: [{required: true, message: '请上传仪器认证图片', trigger: 'change'}],
+                // // 适应证
+                // adaptiveMan: [{required: true, message: '适应人群不能为空', trigger: 'change'}],
+                // // 不适应人群
+                // unAdaptiveMan: [{required: true, message: '不适应人群不能为空', trigger: 'change'}],
+                // // 术前术后
+                // aroundOperation: [{required: true, message: '术前术后不能为空', trigger: 'change'}],
+                // // 效果展示图片列表
+                // displayImageList: [{required: true, message: '请上传效果展示图片', trigger: 'change'}],
+                // // 常见问题
+                // questionList: [{required: true, validator: validateQuestionList, trigger: 'change'}],
+                // // 仪器类别
+                // typeId: [{required: true, message: '请选择仪器类别', trigger: 'change'}],
+                // // 仪器状态
+                // status: [{required: true, message: '请选择仪器状态', trigger: 'change'}],
             },
 
             // 仪器类别列表
@@ -147,6 +153,9 @@ const app = new Vue({
             displayImageList: [],  // 初始化列表
             dialogVisible: false,
             dialogImageUrl: '',
+            // 日期选择格式
+            marketTimeType: 'year',
+            nmpaTimeType: 'year'
         }
     },
     computed: {

src/main/resources/static/js/supplier-center/encyclopedia/instrument-list.js

@@ -134,7 +134,8 @@ var productList = new Vue({
                 if (res.code === 0) {
                     // 不刷新数据更新
                     product.status = newStatus;
-                    CAIMEI.dialog('修改状态成功!');
+                    const tip = newStatus ? '文章已发布' : '文章已存入草稿箱';
+                    CAIMEI.dialog(tip);
                 } else {
                     CAIMEI.dialog('修改状态失败!');
                 }

src/main/resources/static/js/supplier-center/encyclopedia/product-edit.js

@@ -57,13 +57,13 @@ const app = new Vue({
                 producePlace: '',
                 // 上市时间
                 marketTime: '',
-                // 公司/厂商
+                // 供应商
                 company: '',
                 // NMPA认证时间
                 nmpaTime: '',
                 // 产品认证
                 authImageList: '',
-                // 适应人群
+                // 适应证
                 adaptiveMan: '',
                 // 不适应人群
                 unAdaptiveMan: '',
@@ -77,6 +77,10 @@ const app = new Vue({
                 typeId: '',
                 // 产品状态
                 status: 1,
+                // seo关键词
+                seo: '',
+                // 产品链接
+                link: ''
             },
             rules: {
                 // 产品名称
@@ -89,38 +93,40 @@ const app = new Vue({
                 image: [{required: true, message: '请上传产品图片', trigger: 'change'}],
                 // 产品参数
                 paramList: [{required: true, validator: validateParamList, trigger: 'change'}],
-                // 产品优点
-                advantage: [{required: true, message: '产品优点不能为空', trigger: 'change'}],
-                // 产品缺点
-                disadvantage: [{required: true, message: '产品缺点不能为空', trigger: 'change'}],
-                // 产品原理
-                principle: [{required: true, message: '产品原理不能为空', trigger: 'change'}],
-                // 品牌
-                brand: [{required: true, message: '请输入产品品牌', trigger: ['change', 'blur']}],
-                // 产地
-                producePlace: [{required: true, message: '产品产地不能为空', trigger: ['change', 'blur']}],
-                // 上市时间
-                marketTime: [{required: true, message: '请填写上市时间', trigger: 'change'}],
-                // 公司/厂商
-                company: [{required: true, message: '公司/厂商不能为空', trigger: ['change', 'blur']}],
-                // NMPA认证时间
-                nmpaTime: [{required: true, message: '请填写NMPA认证时间', trigger: 'change'}],
-                // 产品认证
-                authImageList: [{required: true, message: '请上传产品认证图片', trigger: 'change'}],
-                // 适应人群
-                adaptiveMan: [{required: true, message: '适应人群不能为空', trigger: 'change'}],
-                // 不适应人群
-                unAdaptiveMan: [{required: true, message: '不适应人群不能为空', trigger: 'change'}],
-                // 术前术后
-                aroundOperation: [{required: true, message: '术前术后不能为空', trigger: 'change'}],
-                // 效果展示图片列表
-                displayImageList: [{required: true, message: '请上传效果展示图片', trigger: 'change'}],
-                // 常见问题
-                questionList: [{required: true, validator: validateQuestionList, trigger: 'change'}],
-                // 产品类别
-                typeId: [{required: true, message: '请选择产品类别', trigger: 'change'}],
-                // 产品状态
-                status: [{required: true, message: '请选择产品状态', trigger: 'change'}],
+                // 产品链接
+                link: [{required: true, message: '产品链接不能为空', trigger: ['change', 'blur']}]
+                // // 产品优点
+                // advantage: [{required: true, message: '产品优点不能为空', trigger: 'change'}],
+                // // 产品缺点
+                // disadvantage: [{required: true, message: '产品缺点不能为空', trigger: 'change'}],
+                // // 产品原理
+                // principle: [{required: true, message: '产品原理不能为空', trigger: 'change'}],
+                // // 品牌
+                // brand: [{required: true, message: '请输入产品品牌', trigger: ['change', 'blur']}],
+                // // 产地
+                // producePlace: [{required: true, message: '产品产地不能为空', trigger: ['change', 'blur']}],
+                // // 上市时间
+                // marketTime: [{required: true, message: '请填写上市时间', trigger: 'change'}],
+                // // 供应商
+                // company: [{required: true, message: '公司/厂商不能为空', trigger: ['change', 'blur']}],
+                // // NMPA认证时间
+                // nmpaTime: [{required: true, message: '请填写NMPA认证时间', trigger: 'change'}],
+                // // 产品认证
+                // authImageList: [{required: true, message: '请上传产品认证图片', trigger: 'change'}],
+                // // 适应证
+                // adaptiveMan: [{required: true, message: '适应人群不能为空', trigger: 'change'}],
+                // // 不适应人群
+                // unAdaptiveMan: [{required: true, message: '不适应人群不能为空', trigger: 'change'}],
+                // // 术前术后
+                // aroundOperation: [{required: true, message: '术前术后不能为空', trigger: 'change'}],
+                // // 效果展示图片列表
+                // displayImageList: [{required: true, message: '请上传效果展示图片', trigger: 'change'}],
+                // // 常见问题
+                // questionList: [{required: true, validator: validateQuestionList, trigger: 'change'}],
+                // // 产品类别
+                // typeId: [{required: true, message: '请选择产品类别', trigger: 'change'}],
+                // // 产品状态
+                // status: [{required: true, message: '请选择产品状态', trigger: 'change'}],
             },
 
             // 产品类别列表
@@ -139,6 +145,9 @@ const app = new Vue({
             displayImageList: [],  // 初始化列表
             dialogVisible: false,
             dialogImageUrl: '',
+            // 日期选择格式
+            marketTimeType: 'year',
+            nmpaTimeType: 'year'
         }
     },
     computed: {

src/main/resources/static/js/supplier-center/encyclopedia/product-list.js

@@ -134,7 +134,8 @@ var productList = new Vue({
                 if (res.code === 0) {
                     // 不刷新数据更新
                     product.status = newStatus;
-                    CAIMEI.dialog('修改状态成功!');
+                    const tip = newStatus ? '文章已发布' : '文章已存入草稿箱';
+                    CAIMEI.dialog(tip);
                 } else {
                     CAIMEI.dialog('修改状态失败!');
                 }

src/main/resources/templates/encyclopedia/instrument-detail.html

@@ -200,6 +200,31 @@
             </dl>
         </div>
     </section>
+
+    <!-- 日期 && 浏览量 -->
+    <section class="section publish-info">
+        <div class="publish-date"><span>日   期：</span><span>2021-10-27 17:23</span></div>
+        <div class="review"><span>浏览量：</span><span>35</span></div>
+    </section>
+
+    <!--  相关链接 -->
+    <section class="section some-link">
+        <div class="title">
+            <h2>相关链接</h2>
+            <div class="line"></div>
+        </div>
+        <div class="group">
+            <a href="/" target="_blank" class="link">
+                <img th:src="*{image}" th:alt="*{name}" class="image"/>
+                <span th:text="*{name}" class="name"></span>
+            </a>
+            <a href="/" target="_blank" class="link">
+                <img th:src="*{image}" th:alt="*{name}" class="image"/>
+                <span th:text="*{name}" class="name"></span>
+            </a>
+        </div>
+    </section>
+
 </article>
 <!-- 侧边楼层导航 -->
 <aside class="navigate" id="category"></aside>

src/main/resources/templates/encyclopedia/product-detail.html

@@ -100,7 +100,7 @@
                     <div class="td" th:text="*{#dates.format(marketTime,'yyyy年MM月dd日')}"></div>
                 </div>
                 <div class="group">
-                    <div class="th">公司/厂商</div>
+                    <div class="th">供应商</div>
                     <div class="td" th:text="*{company}"></div>
                 </div>
             </div>
@@ -132,7 +132,7 @@
     <!-- 适应人群 -->
     <section class="section">
         <div class="title">
-            <h2>适应人群</h2>
+            <h2>适应症</h2>
             <div class="line"></div>
         </div>
         <div class="content" th:utext="*{adaptiveMan}"></div>
@@ -148,12 +148,12 @@
     <!-- 术前术后 -->
     <section class="section">
         <div class="title">
-            <h2>术前术后</h2>
+            <h2>注意事项</h2>
             <div class="line"></div>
         </div>
         <div class="content" th:utext="*{aroundOperation}"></div>
     </section>
-    <!-- 效果展示 -->
+    <!-- 效果展示
     <section class="section effect">
         <div class="title">
             <h2>效果展示</h2>
@@ -163,6 +163,7 @@
             <img th:src="${img}" th:each="img: *{displayImageList}"/>
         </div>
     </section>
+    -->
     <!-- 常见问题 -->
     <section class="section question">
         <div class="title">
@@ -182,6 +183,31 @@
             </dl>
         </div>
     </section>
+
+    <!-- 日期 && 浏览量 -->
+    <section class="section publish-info">
+        <div class="publish-date"><span>日   期：</span><span>2021-10-27 17:23</span></div>
+        <div class="review"><span>浏览量：</span><span>35</span></div>
+    </section>
+
+    <!--  相关链接 -->
+    <section class="section some-link">
+        <div class="title">
+            <h2>相关链接</h2>
+            <div class="line"></div>
+        </div>
+        <div class="group">
+            <a href="/" target="_blank" class="link">
+                <img th:src="*{image}" th:alt="*{name}" class="image"/>
+                <span th:text="*{name}" class="name"></span>
+            </a>
+            <a href="/" target="_blank" class="link">
+                <img th:src="*{image}" th:alt="*{name}" class="image"/>
+                <span th:text="*{name}" class="name"></span>
+            </a>
+        </div>
+    </section>
+
 </article>
 <!-- 侧边楼层导航 -->
 <aside class="navigate" id="category"></aside>

src/main/resources/templates/supplier-center/article/article-edit.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网-文章管理-编辑文章</title>
+    <title>采美365网-采美文章-编辑文章</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
@@ -21,16 +21,16 @@
         <div class="crumbs" v-if="isPC">
             <span>我的采美</span>
             <span>&gt;</span>
-            <span>文章管理</span>
+            <span>采美文章</span>
             <span>&gt;</span>
-            <span>编辑文章</span>
+            <span>文章管理</span>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->
             <template th:replace="supplier-center/components/tableft"></template>
             <div class="right-box right">
                 <div class="row">
-                    <div class="top-tip">温馨提示：多发布文章，有利于曝光您的产品以及提高您产品的销售量，文章发布并且审核通过后<br/>可在信息中心搜索您的文章</div>
+                    <div class="top-tip">温馨提示：发布采美文章有利于曝光您的店铺商品，提高成交量（发布并且审核通过后，可在信息中心搜索您的文章）</div>
                     <form class="form">
                         <!-- 标题 -->
                         <div class="form-item" required prop="title">
@@ -141,11 +141,11 @@
                             <div class="form-label"><em>*</em>状态:</div>
                             <div class="radio-control">
                                 <input id="on" type="radio" value="1" name="status" v-model="formData.status"/>
-                                <label for="on" class="radio">启用</label>
+                                <label for="on" class="radio">发布</label>
                             </div>
                             <div class="radio-control">
                                 <input id="off" type="radio" value="0" name="status" v-model="formData.status"/>
-                                <label for="off" class="radio">停用</label>
+                                <label for="off" class="radio">保存草稿箱</label>
                             </div>
                         </div>
                         <div class="form-item btns">

src/main/resources/templates/supplier-center/article/article-list.html

@@ -21,11 +21,10 @@
             <div class="crumbs">
                 <span>我的采美</span>
                 <span>&gt;</span>
-                <span>文章管理</span>
+                <span>采美文章</span>
                 <span>&gt;</span>
-                <span>文章列表</span>
+                <span>文章管理</span>
             </div>
-            <div class="hot-tip">温馨提示：多发布文章，有利于曝光您的店铺商品，提高成交量（发布并且审核通过后，可在信息中心搜索您的文章）</div>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->
@@ -33,6 +32,7 @@
             <div class="right">
                 <!--筛选-->
                 <div class="row">
+                    <div class="hot-tip">温馨提示：发布采美文章有利于曝光您的店铺商品，提高成交量（发布并且审核通过后，可在信息中心搜索您的文章）</div>
                     <div class="form-section">
                         <div class="form-item">
                             <label for="articleId" class="form-label">文章ID:</label>
@@ -112,13 +112,13 @@
                                     <div class="time">{{ articleInfo.createDate | formatDate}}</div>
                                 </td>
                                 <td>
-                                    <span class="state primary" v-if="articleInfo.status === 1">已启用</span>
-                                    <span class="state default" v-else>未启用</span>
+                                    <span class="state primary" v-if="articleInfo.status === 1">已发布</span>
+                                    <span class="state danger" v-else>保存草<br>稿箱</span>
                                 </td>
                                 <td class="option">
                                     <div class="option">
-                                        <button class="form-button edit" @click="clickOption(articleInfo, 1)">编辑</button>
-                                        <button class="form-button stop" @click="clickOption(articleInfo, 2)">{{ articleInfo.status === 1 ? '停用':'启用' }}</button>
+                                        <button class="form-button stop" @click="clickOption(articleInfo, 2)">{{ articleInfo.status === 1 ? '保存草稿箱':'发布' }}</button>
+                                        <button class="form-button edit" @click="clickOption(articleInfo, 1)">编辑</button><br>
                                         <button class="form-button search" @click="clickOption(articleInfo, 3)">查看</button>
                                         <button class="form-button delete" @click="clickOption(articleInfo, 4)">删除</button>
                                     </div>

src/main/resources/templates/supplier-center/components/tableft.html

@@ -20,13 +20,13 @@
         </div>
     </div>
     <div class="navList">
-        <span class="tab">文章管理</span>
+        <span class="tab">采美文章</span>
         <div class="con" style="display:none">
-            <a href="/supplier/article/list.html">文章列表</a>
+            <a href="/supplier/article/list.html">文章管理</a>
         </div>
     </div>
     <div class="navList">
-        <span class="tab">百科文库</span>
+        <span class="tab">采美百科</span>
         <div class="con" style="display:none">
             <a href="/supplier/encyclopedia/product-list.html">产品</a>
             <a href="/supplier/encyclopedia/instrument-list.html">仪器</a>

src/main/resources/templates/supplier-center/encyclopedia/instrument-edit.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网-百科文库-添加仪器百科</title>
+    <title>采美365网-采美百科-仪器</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
@@ -23,32 +23,35 @@
         <div class="crumbs" v-if="isPC">
             <span>我的采美</span>
             <span>&gt;</span>
-            <span>百科文库</span>
+            <span>采美百科</span>
             <span>&gt;</span>
-            <span>添加仪器百科</span>
+            <span>仪器</span>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->
             <template th:replace="supplier-center/components/tableft"></template>
             <div class="right-box right">
                 <div class="row">
-                    <div class="top-tip">温馨提示：发布百科文章有利于曝光您的店铺商品，更有利于客户对产品与仪器有更深的认识度，提高成交率<br />发布并且审核通过后，可在采美百科搜索您的百科文章</div>
+                    <div class="top-tip">温馨提示：发布采美百科有利于曝光您的店铺商品，更有利于客户对产品与仪器有更深的认识度，提高成交率。<br>（注意：发布并且审核通过后，可在采美百科搜索您的仪器）</div>
                     <!-- 带验证的表单 -->
                     <div class="valide-form">
                         <el-form :model="formData" :rules="rules" ref="ruleForm" label-position="top">
                             <!-- 仪器简述 -->
                             <div class="cm-big-label"><span class="cm-label">仪器简述</span></div>
-                            <el-form-item label="仪器名称" prop="name">
+                            <el-form-item label="仪器名称（必填）" prop="name">
                                 <el-input v-model="formData.name" placeholder="请输入仪器名称"></el-input>
                             </el-form-item>
-                            <el-form-item label="仪器别名" prop="alias">
+                            <el-form-item label="仪器别名（必填）" prop="alias">
                                 <el-input v-model="formData.alias" placeholder="请输入英文名或其他名称"></el-input>
                             </el-form-item>
-                            <el-form-item label="仪器概述" prop="discription">
+                            <el-form-item label="仪器概述（必填）" prop="discription">
                                 <el-input v-model="formData.discription" type="textarea" placeholder="请输入仪器概述"
                                           :rows="5"></el-input>
                             </el-form-item>
-                            <el-form-item label="仪器图片" prop="image">
+                            <el-form-item label="仪器链接（必填）" prop="link">
+                                <el-input v-model="formData.link" placeholder="输入您采美商城的商品链接详情，便于用户精准找到"></el-input>
+                            </el-form-item>
+                            <el-form-item label="仪器图片（必传）" prop="image">
                                 <el-input v-model="formData.image" v-show="false"></el-input>
                                 <el-upload
                                         class="cover-uploader"
@@ -61,9 +64,30 @@
                                 >
                                     <img v-if="formData.image" :src="formData.image" class="cover"/>
                                     <i v-else class="el-icon-plus cover-uploader-icon"></i>
+                                    <div slot="tip" class="el-upload__tip">建议图片尺寸210px*210px，并上传白底图片</div>
                                 </el-upload>
                             </el-form-item>
 
+                            <!-- 仪器参数 -->
+                            <el-form-item label="仪器参数（必填，至少两项）" prop="paramList" class="cm-big-label-el">
+                                <el-input v-model="formData.paramList" v-show="false"></el-input>
+                                <div class="form-params-group">
+                                    <span class="add-one" @click="addParam">添加参数</span>
+                                    <el-row class="form-params-group-row" :gutter="8"
+                                            v-for="(param, index) in paramEmptyList" :key="index">
+                                        <el-col :span="8">
+                                            <el-input v-model="param.name" :placeholder="param.p1"></el-input>
+                                        </el-col>
+                                        <el-col :span="16">
+                                            <el-input v-model="param.content" :placeholder="param.p2"></el-input>
+                                        </el-col>
+                                        <span class="remove" v-if="paramEmptyList.length > minLimitParams"
+                                              @click="removeParam(index)"
+                                        >&times;</span>
+                                    </el-row>
+                                </div>
+                            </el-form-item>
+
                             <!-- 正品识别 -->
                             <div class="cm-big-label"><span class="cm-label">正品识别</span></div>
                             <el-form-item label="认证链接" prop="authLink">
@@ -82,30 +106,10 @@
                                 >
                                     <img v-if="formData.authQrCode" :src="formData.authQrCode" class="cover"/>
                                     <i v-else class="el-icon-plus cover-uploader-icon"></i>
+                                    <div slot="tip" class="el-upload__tip">建议图片尺寸210px*210px，并上传白底图片</div>
                                 </el-upload>
                             </el-form-item>
 
-                            <!-- 仪器参数 -->
-                            <el-form-item label="仪器参数" prop="paramList" class="cm-big-label-el">
-                                <el-input v-model="formData.paramList" v-show="false"></el-input>
-                                <div class="form-params-group">
-                                    <span class="add-one" @click="addParam">添加参数</span>
-                                    <el-row class="form-params-group-row" :gutter="8"
-                                            v-for="(param, index) in paramEmptyList" :key="index">
-                                        <el-col :span="8">
-                                            <el-input v-model="param.name" :placeholder="param.p1"></el-input>
-                                        </el-col>
-                                        <el-col :span="16">
-                                            <el-input v-model="param.content" :placeholder="param.p2"></el-input>
-                                        </el-col>
-                                        <span class="remove" v-if="paramEmptyList.length > minLimitParams"
-                                              @click="removeParam(index)"
-                                        >&times;</span
-                                        >
-                                    </el-row>
-                                </div>
-                            </el-form-item>
-
                             <!-- 仪器优点 -->
                             <el-form-item label="仪器优点" prop="advantage" class="cm-big-label-el">
                                 <el-input v-model="formData.advantage" v-show="false"></el-input>
@@ -124,6 +128,11 @@
                                 <editor v-model="formData.principle" placeholder="请输入仪器原理"></editor>
                             </el-form-item>
 
+                            <!-- SEO关键词 -->
+                            <el-form-item label="SEO关键字" prop="seo">
+                                <el-input v-model="formData.seo" placeholder="例如：名称,名称"></el-input>
+                            </el-form-item>
+
                             <!-- 仪器档案 -->
                             <div class="cm-big-label"><span class="cm-label">仪器档案</span></div>
                             <el-form-item label="品牌" prop="brand">
@@ -133,17 +142,27 @@
                                 <el-input v-model="formData.producePlace" placeholder="请输入仪器产地"></el-input>
                             </el-form-item>
                             <el-form-item label="上市时间" prop="marketTime">
-                                <el-date-picker class="max-width" v-model="formData.marketTime" type="date"
+                                <el-date-picker class="max-width" v-model="formData.marketTime" :type="marketTimeType"
                                                 placeholder="上市时间">
                                 </el-date-picker>
+                                <el-radio-group v-model="marketTimeType" class="max-width">
+                                    <el-radio label="year">年</el-radio>
+                                    <el-radio label="month">年/月</el-radio>
+                                    <el-radio label="date">年/月/日</el-radio>
+                                </el-radio-group>
                             </el-form-item>
-                            <el-form-item label="公司/厂商" prop="company">
-                                <el-input v-model="formData.company" placeholder="请输入公司/厂商"></el-input>
+                            <el-form-item label="供应商" prop="company">
+                                <el-input v-model="formData.company" placeholder="请输入供应商"></el-input>
                             </el-form-item>
                             <el-form-item label="NMPA认证时间" prop="nmpaTime">
-                                <el-date-picker class="max-width" v-model="formData.nmpaTime" type="date"
+                                <el-date-picker class="max-width" v-model="formData.nmpaTime" :type="nmpaTimeType"
                                                 placeholder="NMPA认证时间">
                                 </el-date-picker>
+                                <el-radio-group v-model="nmpaTimeType" class="max-width">
+                                    <el-radio label="year">年</el-radio>
+                                    <el-radio label="month">年/月</el-radio>
+                                    <el-radio label="date">年/月/日</el-radio>
+                                </el-radio-group>
                             </el-form-item>
                             <el-form-item label="仪器认证" prop="authImageList">
                                 <el-input v-model="formData.authImageList" v-show="false"></el-input>
@@ -158,13 +177,14 @@
                                         :limit="4"
                                 >
                                     <i class="el-icon-plus"></i>
+                                    <div slot="tip" class="el-upload__tip">建议图片尺寸210px*210px，并上传白底图片</div>
                                 </el-upload>
                             </el-form-item>
 
                             <!-- 适应人群 -->
-                            <el-form-item label="适应人群" prop="adaptiveMan" class="cm-big-label-el">
+                            <el-form-item label="适应症" prop="adaptiveMan" class="cm-big-label-el">
                                 <el-input v-model="formData.adaptiveMan" v-show="false"></el-input>
-                                <editor v-model="formData.adaptiveMan" placeholder="请输入适应人群"></editor>
+                                <editor v-model="formData.adaptiveMan" placeholder="请输入适应症"></editor>
                             </el-form-item>
 
                             <!-- 不适应人群 -->
@@ -173,13 +193,13 @@
                                 <editor v-model="formData.unAdaptiveMan" placeholder="请输入不适应人群"></editor>
                             </el-form-item>
 
-                            <!-- 术前术后 -->
-                            <el-form-item label="术前术后" prop="aroundOperation" class="cm-big-label-el">
+                            <!-- 注意事项 -->
+                            <el-form-item label="注意事项" prop="aroundOperation" class="cm-big-label-el">
                                 <el-input v-model="formData.aroundOperation" v-show="false"></el-input>
-                                <editor v-model="formData.aroundOperation" placeholder="请输入术前术后"></editor>
+                                <editor v-model="formData.aroundOperation" placeholder="请输入注意事项"></editor>
                             </el-form-item>
 
-                            <!-- 效果展示 -->
+                            <!-- 效果展示
                             <el-form-item label="效果展示" prop="displayImageList" class="cm-big-label-el">
                                 <el-input v-model="formData.displayImageList" v-show="false"></el-input>
                                 <el-upload
@@ -195,6 +215,7 @@
                                     <i class="el-icon-plus"></i>
                                 </el-upload>
                             </el-form-item>
+                            -->
 
                             <!-- 常见问题 -->
                             <el-form-item label="常见问题" prop="questionList" class="cm-big-label-el">
@@ -202,9 +223,9 @@
                                 <div class="form-question-group">
                                     <span class="add-one" @click="addQuestion">添加问答</span>
                                     <div class="form-question-group-row" v-for="(item, index) in questionEmptyList">
-                                        <div class="cm-label"><em>*</em>问题{{ index + 1}}:</div>
+                                        <div class="cm-label"><!--<em>*</em>-->问题{{ index + 1}}:</div>
                                         <el-input placeholder="请输入问题内容" v-model="item.question"></el-input>
-                                        <div class="cm-label"><em>*</em>答:</div>
+                                        <div class="cm-label"><!--<em>*</em>-->答:</div>
                                         <el-input type="textarea" v-model="item.answer" placeholder="请输入问题解答内容"
                                                   :rows="4"></el-input>
                                         <span class="remove" v-if="questionEmptyList.length > minLimitQuestions"
@@ -223,10 +244,10 @@
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="" prop="status" label-position="left">
-                                <span class="cm-label"><em>*</em>仪器状态:</span>
+                                <span class="cm-label"><!--<em>*</em>-->仪器状态:</span>
                                 <el-radio-group v-model="formData.status">
-                                    <el-radio :label="1">启用</el-radio>
-                                    <el-radio :label="0">停用</el-radio>
+                                    <el-radio :label="1">发布</el-radio>
+                                    <el-radio :label="0">保存草稿箱</el-radio>
                                 </el-radio-group>
                             </el-form-item>
                         </el-form>

src/main/resources/templates/supplier-center/encyclopedia/instrument-list.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网-百科文库-仪器百科列表</title>
+    <title>采美365网-采美百科-仪器</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
@@ -20,11 +20,10 @@
             <div class="crumbs">
                 <span>我的采美</span>
                 <span>&gt;</span>
-                <span>百科文库</span>
+                <span>采美百科</span>
                 <span>&gt;</span>
-                <span>仪器百科列表</span>
+                <span>仪器</span>
             </div>
-            <div class="hot-tip">温馨提示：多发布文章，有利于曝光您的店铺仪器，提高成交量（发布并且审核通过后，可在信息中心搜索您的文章）</div>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->
@@ -32,6 +31,7 @@
             <div class="right">
                 <!--筛选-->
                 <div class="row">
+                    <div class="hot-tip">温馨提示：发布采美百科有利于曝光您的店铺商品，更有利于客户对产品与仪器有更深的认识度，提高成交率。（注意：发布并且审核通过后，可在采美百科搜索您的仪器）</div>
                     <div class="form-section">
                         <div class="form-item">
                             <label for="productId" class="form-label">仪器ID:</label>
@@ -101,13 +101,13 @@
                                     <div class="time">{{ productInfo.addTime | formatDate}}</div>
                                 </td>
                                 <td>
-                                    <span class="state primary" v-if="productInfo.status === 1">已启用</span>
-                                    <span class="state default" v-else>未启用</span>
+                                    <span class="state primary" v-if="productInfo.status === 1">已发布</span>
+                                    <span class="state danger" v-else>保存草稿箱</span>
                                 </td>
                                 <td class="option">
                                     <div class="option">
-                                        <button class="form-button edit" @click="clickOption(productInfo, 1)">编辑</button>
-                                        <button class="form-button stop" @click="clickOption(productInfo, 2)">{{ productInfo.status === 1 ? '停用':'启用' }}</button>
+                                        <button class="form-button stop" @click="clickOption(productInfo, 2)">{{ productInfo.status === 1 ? '保存草稿箱':'发布' }}</button>
+                                        <button class="form-button edit" @click="clickOption(productInfo, 1)">编辑</button><br>
                                         <button class="form-button search" @click="clickOption(productInfo, 3)">查看</button>
                                         <button class="form-button delete" @click="clickOption(productInfo, 4)">删除</button>
                                     </div>

src/main/resources/templates/supplier-center/encyclopedia/product-edit.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网-百科文库-添加产品百科</title>
+    <title>采美365网-采美百科-产品</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
@@ -23,32 +23,35 @@
         <div class="crumbs" v-if="isPC">
             <span>我的采美</span>
             <span>&gt;</span>
-            <span>百科文库</span>
+            <span>采美百科</span>
             <span>&gt;</span>
-            <span>添加产品百科</span>
+            <span>产品</span>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->
             <template th:replace="supplier-center/components/tableft"></template>
             <div class="right-box right">
                 <div class="row">
-                    <div class="top-tip">温馨提示：发布百科文章有利于曝光您的店铺商品，更有利于客户对产品与仪器有更深的认识度，提高成交率<br />发布并且审核通过后，可在采美百科搜索您的百科文章</div>
+                    <div class="top-tip">温馨提示：发布采美百科有利于曝光您的店铺商品，更有利于客户对产品与仪器有更深的认识度，提高成交率。<br>（注意：发布并且审核通过后，可在采美百科搜索您的产品）</div>
                     <!-- 带验证的表单 -->
                     <div class="valide-form">
                         <el-form :model="formData" :rules="rules" ref="ruleForm" label-position="top">
                             <!-- 产品简述 -->
                             <div class="cm-big-label"><span class="cm-label">产品简述</span></div>
-                            <el-form-item label="产品名称" prop="name">
+                            <el-form-item label="产品名称（必填）" prop="name">
                                 <el-input v-model="formData.name" placeholder="请输入产品名称"></el-input>
                             </el-form-item>
-                            <el-form-item label="产品别名" prop="alias">
+                            <el-form-item label="产品别名（必填）" prop="alias">
                                 <el-input v-model="formData.alias" placeholder="请输入英文名或其他名称"></el-input>
                             </el-form-item>
-                            <el-form-item label="产品概述" prop="discription">
+                            <el-form-item label="产品概述（必填）" prop="discription">
                                 <el-input v-model="formData.discription" type="textarea" placeholder="请输入产品概述"
                                           :rows="5"></el-input>
                             </el-form-item>
-                            <el-form-item label="产品图片" prop="image">
+                            <el-form-item label="产品链接（必填）" prop="link">
+                                <el-input v-model="formData.link" placeholder="输入您采美商城的商品链接详情，便于用户精准找到"></el-input>
+                            </el-form-item>
+                            <el-form-item label="产品图片（必传）" prop="image">
                                 <el-input v-model="formData.image" v-show="false"></el-input>
                                 <el-upload
                                         class="cover-uploader"
@@ -61,11 +64,12 @@
                                 >
                                     <img v-if="formData.image" :src="formData.image" class="cover"/>
                                     <i v-else class="el-icon-plus cover-uploader-icon"></i>
+                                    <div slot="tip" class="el-upload__tip">建议图片尺寸210px*210px，并上传白底图片</div>
                                 </el-upload>
                             </el-form-item>
 
                             <!-- 产品参数 -->
-                            <el-form-item label="产品参数" prop="paramList" class="cm-big-label-el">
+                            <el-form-item label="产品参数（必填，至少两项）" prop="paramList" class="cm-big-label-el">
                                 <el-input v-model="formData.paramList" v-show="false"></el-input>
                                 <div class="form-params-group">
                                     <span class="add-one" @click="addParam">添加参数</span>
@@ -103,6 +107,11 @@
                                 <editor v-model="formData.principle" placeholder="请输入产品原理"></editor>
                             </el-form-item>
 
+                            <!-- SEO关键词 -->
+                            <el-form-item label="SEO关键字" prop="seo">
+                                <el-input v-model="formData.seo" placeholder="例如：名称,名称"></el-input>
+                            </el-form-item>
+
                             <!-- 产品档案 -->
                             <div class="cm-big-label"><span class="cm-label">产品档案</span></div>
                             <el-form-item label="品牌" prop="brand">
@@ -112,17 +121,27 @@
                                 <el-input v-model="formData.producePlace" placeholder="请输入产品产地"></el-input>
                             </el-form-item>
                             <el-form-item label="上市时间" prop="marketTime">
-                                <el-date-picker class="max-width" v-model="formData.marketTime" type="date"
+                                <el-date-picker class="max-width" v-model="formData.marketTime" :type="marketTimeType"
                                                 placeholder="上市时间">
                                 </el-date-picker>
+                                <el-radio-group v-model="marketTimeType" class="max-width">
+                                    <el-radio label="year">年</el-radio>
+                                    <el-radio label="month">年/月</el-radio>
+                                    <el-radio label="date">年/月/日</el-radio>
+                                </el-radio-group>
                             </el-form-item>
-                            <el-form-item label="公司/厂商" prop="company">
-                                <el-input v-model="formData.company" placeholder="请输入公司/厂商"></el-input>
+                            <el-form-item label="供应商" prop="company">
+                                <el-input v-model="formData.company" placeholder="请输入供应商"></el-input>
                             </el-form-item>
                             <el-form-item label="NMPA认证时间" prop="nmpaTime">
-                                <el-date-picker class="max-width" v-model="formData.nmpaTime" type="date"
+                                <el-date-picker class="max-width" v-model="formData.nmpaTime" :type="nmpaTimeType"
                                                 placeholder="NMPA认证时间">
                                 </el-date-picker>
+                                <el-radio-group v-model="nmpaTimeType" class="max-width">
+                                    <el-radio label="year">年</el-radio>
+                                    <el-radio label="month">年/月</el-radio>
+                                    <el-radio label="date">年/月/日</el-radio>
+                                </el-radio-group>
                             </el-form-item>
                             <el-form-item label="产品认证" prop="authImageList">
                                 <el-input v-model="formData.authImageList" v-show="false"></el-input>
@@ -137,13 +156,14 @@
                                         :limit="4"
                                 >
                                     <i class="el-icon-plus"></i>
+                                    <div slot="tip" class="el-upload__tip">建议图片尺寸210px*210px，并上传白底图片</div>
                                 </el-upload>
                             </el-form-item>
 
-                            <!-- 适应人群 -->
-                            <el-form-item label="适应人群" prop="adaptiveMan" class="cm-big-label-el">
+                            <!-- 适应证 -->
+                            <el-form-item label="适应证" prop="adaptiveMan" class="cm-big-label-el">
                                 <el-input v-model="formData.adaptiveMan" v-show="false"></el-input>
-                                <editor v-model="formData.adaptiveMan" placeholder="请输入适应人群"></editor>
+                                <editor v-model="formData.adaptiveMan" placeholder="请输入适应证"></editor>
                             </el-form-item>
 
                             <!-- 不适应人群 -->
@@ -152,27 +172,10 @@
                                 <editor v-model="formData.unAdaptiveMan" placeholder="请输入不适应人群"></editor>
                             </el-form-item>
 
-                            <!-- 术前术后 -->
-                            <el-form-item label="术前术后" prop="aroundOperation" class="cm-big-label-el">
+                            <!-- 注意事项 -->
+                            <el-form-item label="注意事项" prop="aroundOperation" class="cm-big-label-el">
                                 <el-input v-model="formData.aroundOperation" v-show="false"></el-input>
-                                <editor v-model="formData.aroundOperation" placeholder="请输入术前术后"></editor>
-                            </el-form-item>
-
-                            <!-- 效果展示 -->
-                            <el-form-item label="效果展示" prop="displayImageList" class="cm-big-label-el">
-                                <el-input v-model="formData.displayImageList" v-show="false"></el-input>
-                                <el-upload
-                                        :class="{ 'hide-upload': displayImageList.length >= 8 }"
-                                        :action="action"
-                                        list-type="picture-card"
-                                        :on-preview="handlePictureCardPreview"
-                                        :on-remove="handleDisplayImageRemove"
-                                        :on-success="handleDisplayImageSuccess"
-                                        :file-list="displayImageList"
-                                        :limit="8"
-                                >
-                                    <i class="el-icon-plus"></i>
-                                </el-upload>
+                                <editor v-model="formData.aroundOperation" placeholder="请输入注意事项"></editor>
                             </el-form-item>
 
                             <!-- 常见问题 -->
@@ -181,9 +184,9 @@
                                 <div class="form-question-group">
                                     <span class="add-one" @click="addQuestion">添加问答</span>
                                     <div class="form-question-group-row" v-for="(item, index) in questionEmptyList">
-                                        <div class="cm-label"><em>*</em>问题{{ index + 1}}:</div>
+                                        <div class="cm-label"><!--<em>*</em>-->问题{{ index + 1}}:</div>
                                         <el-input placeholder="请输入问题内容" v-model="item.question"></el-input>
-                                        <div class="cm-label"><em>*</em>答:</div>
+                                        <div class="cm-label"><!--<em>*</em>-->答:</div>
                                         <el-input type="textarea" v-model="item.answer" placeholder="请输入问题解答内容"
                                                   :rows="4"></el-input>
                                         <span class="remove" v-if="questionEmptyList.length > minLimitQuestions"
@@ -202,10 +205,10 @@
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="" prop="status" label-position="left">
-                                <span class="cm-label"><em>*</em>产品状态:</span>
+                                <span class="cm-label"><!--<em>*</em>-->产品状态:</span>
                                 <el-radio-group v-model="formData.status">
-                                    <el-radio :label="1">启用</el-radio>
-                                    <el-radio :label="0">停用</el-radio>
+                                    <el-radio :label="1">发布</el-radio>
+                                    <el-radio :label="0">保存草稿箱</el-radio>
                                 </el-radio-group>
                             </el-form-item>
                         </el-form>

src/main/resources/templates/supplier-center/encyclopedia/product-list.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网-百科文库-产品百科列表</title>
+    <title>采美365网-采美百科-产品</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
@@ -20,11 +20,10 @@
             <div class="crumbs">
                 <span>我的采美</span>
                 <span>&gt;</span>
-                <span>百科文库</span>
+                <span>采美百科</span>
                 <span>&gt;</span>
-                <span>产品百科列表</span>
+                <span>产品</span>
             </div>
-            <div class="hot-tip">温馨提示：多发布文章，有利于曝光您的店铺产品，提高成交量（发布并且审核通过后，可在信息中心搜索您的文章）</div>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->
@@ -32,6 +31,7 @@
             <div class="right">
                 <!--筛选-->
                 <div class="row">
+                    <div class="hot-tip">温馨提示：发布采美百科有利于曝光您的店铺商品，更有利于客户对产品与仪器有更深的认识度，提高成交率。（注意：发布并且审核通过后，可在采美百科搜索您的产品）</div>
                     <div class="form-section">
                         <div class="form-item">
                             <label for="productId" class="form-label">产品ID:</label>
@@ -101,13 +101,13 @@
                                     <div class="time">{{ productInfo.addTime | formatDate}}</div>
                                 </td>
                                 <td>
-                                    <span class="state primary" v-if="productInfo.status === 1">已启用</span>
-                                    <span class="state default" v-else>未启用</span>
+                                    <span class="state primary" v-if="productInfo.status === 1">已发布</span>
+                                    <span class="state danger" v-else>保存草稿箱</span>
                                 </td>
                                 <td class="option">
                                     <div class="option">
-                                        <button class="form-button edit" @click="clickOption(productInfo, 1)">编辑</button>
-                                        <button class="form-button stop" @click="clickOption(productInfo, 2)">{{ productInfo.status === 1 ? '停用':'启用' }}</button>
+                                        <button class="form-button stop" @click="clickOption(productInfo, 2)">{{ productInfo.status === 1 ? '保存草稿箱':'发布' }}</button>
+                                        <button class="form-button edit" @click="clickOption(productInfo, 1)">编辑</button><br>
                                         <button class="form-button search" @click="clickOption(productInfo, 3)">查看</button>
                                         <button class="form-button delete" @click="clickOption(productInfo, 4)">删除</button>
                                     </div>