Merge remote-tracking branch 'origin/developer' into developerB

src/main/resources/static/js/document/beauty-archive-detail.js

@@ -12,6 +12,8 @@ var beautyArchiveDetail = new Vue({
         // 获取路由hash标识，设置默认展开tab
         this.archiveId = CAIMEI.getUrlParam('id');
         this.getProdcutArchiveDetails();
+        this.cmSysParams.pageType = 20;
+        this.cmSysParams.pageLabel =  this.relatedLabels;
     },
 });
 

src/main/resources/static/js/document/beautyArchiveDetailMixin.js

@@ -18,7 +18,8 @@ var beautyArchiveDetailMixin = {
         fileArchiveList: [], // 文件资料列表
         defaultImage: 'https://static.caimei365.com/app/img/icon2/PC-default.png',  // 默认图片
         videoCover: 'https://static.caimei365.com/app/img/icon2/video-cover.png', //默认视频封面
-        archiveProductInfo: {}
+        archiveProductInfo: {},
+        relatedLabels:''
     },
     filters: {
         // 时间格式化
@@ -237,8 +238,7 @@ var beautyArchiveDetailMixin = {
                 _self.archiveProductInfo.productType = res.data.productType;
                 _self.archiveProductInfo.shopName = res.data.shopName;
                 _self.listLoading = false;
-                _self.cmSysParams.pageLabel =  res.data.relatedLabels;
-                _self.cmSysParams.pageType = 20;
+                _self.relatedLabels =  res.data.relatedLabels;
                 // 只有当前用户权限为0时初始化图片预览
                 if (_self.permission === 0) {
                     setTimeout(function () {

src/main/resources/static/js/supplier-center/mixins/noticeMixin.js

@@ -29,11 +29,7 @@ var noticeMixin = function () {// 通知消息
                     2: `恭喜您（微信昵称：${cell.content}）成功成为【${cell.shopName}】的运营人员。`,
                     3: `商品”${cell.productName}“,上架审核未通过，暂时不能上架采美商城，请重新${linkMap[cell.shopMessType]}进行提交。`,
                     4: `商品”${cell.productName}“,新品展示审核未通过，未能展示在采美商城新品橱窗。`,
-                    5: `商品”${cell.productName}“,该商品的资质证书将于${cell.content}后失效，请及时${linkMap[cell.shopMessType]}新证书。`,
-                    6: `恭喜您发布的采美百科词条“${cell.content}”审核已通过。`,
-                    7: `很遗憾！您发布的采美百科词条“${cell.content}”审核未通过，原因是“${cell.reasonContent}”，可前往电脑端“我的词条”进行修改后，重新提交审核。`,
-                    8: `恭喜您发布的采美文章“${cell.content}”审核已通过。`,
-                    9: `很遗憾！您发布的采美文章“${cell.content}”审核未通过，原因是“${cell.reasonContent}”，可前往电脑端“文章管理”进行修改后，重新提交审核。`
+                    5: `商品”${cell.productName}“,该商品的资质证书将于${cell.content}后失效，请及时${linkMap[cell.shopMessType]}新证书。`
                 }
                 return map[cell.shopMessType]
             },