From 7a6823be70bba4e138be2343955dac68a49b4ab6 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 6 Jun 2024 14:03:44 +0800
Subject: [PATCH] fix

---
 src/i18n/index.js              |  24 ++--
 src/pages/article/activity.vue | 235 +++++++++++++++++----------------
 src/pages/publish/show.vue     | 217 ++++++++++++++++--------------
 3 files changed, 258 insertions(+), 218 deletions(-)

diff --git a/src/i18n/index.js b/src/i18n/index.js
index 751e594..6c96bb5 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -22,7 +22,7 @@ export const messages = {
       series: '演讲系列',
       all: '全部',
       readDetail: '阅读详情',
-      offline:'线下',
+      offline: '线下',
       more: '更多',
       author: '作者',
       quote: '引用',
@@ -57,20 +57,22 @@ export const messages = {
       seeMore: '查看更多',
       inventionpatent: '发明专利',
       practicalAppearance: '实用外观',
-      patent:'专利',
+      patent: '专利',
       monograph: '专著',
       paper: '论文',
       scientificResearch: '科学研究',
       sfeLintroduce: 'S³FEL介绍',
-      develHistory:'发展历程',
+      develHistory: '发展历程',
       sfeltrailer: 'S³FEL宣传片',
       geographicLocation: '地理位置',
       organization: '机构设置',
       introduce: '介绍',
       ActivityIntroduction: '活动简介',
       back: '返回',
-			comming: '暂无更多信息，敬请期待。',
-			nothing: '没有找到您搜索的内容，您可尝试搜索其他关键词。',
+      comming: '暂无更多信息，敬请期待。',
+      nothing: '没有找到您搜索的内容，您可尝试搜索其他关键词。',
+      source: '来源',
+      keyword: '关键字',
     }
   },
   'en': {
@@ -117,7 +119,7 @@ export const messages = {
       pleaseEnterPatentOfficer: 'Please enter the patent name/inventor name/application number',
       patentName: 'Patent title',
       patentClassification: 'Patent classification',
-      ApplicationNumber:'Application number',
+      ApplicationNumber: 'Application number',
       ApplicationDate: 'Application date',
       AuthorizationDate: 'Authorization Date',
       inventor: 'Inventor',
@@ -129,21 +131,23 @@ export const messages = {
       authorPersion: 'Author',
       seeMore: 'See more',
       inventionpatent: 'Invention Patent',
-      practicalAppearance:'Practical appearance',
+      practicalAppearance: 'Practical appearance',
       patent: 'Patent',
       monograph: 'Monograph',
       paper: 'Paper',
       scientificResearch: 'Scientific research',
       sfeLintroduce: 'Sfe lintroduce',
-      develHistory:'Development history',
+      develHistory: 'Development history',
       sfeltrailer: 'Sfel trailer',
       geographicLocation: 'geographic location',
       organization: 'Organization',
       introduce: 'Introduce',
       ActivityIntroduction: 'Activity Introduction',
       back: 'Back',
-			comming: 'coming soone',
-			nothing: `We couldn't find the content you were searching for. You can try searching for other keywords.`,
+      comming: 'coming soone',
+      nothing: `We couldn't find the content you were searching for. You can try searching for other keywords.`,
+      source: 'Source',
+      keyword: 'Keyword',
     }
   }
 };
\ No newline at end of file
diff --git a/src/pages/article/activity.vue b/src/pages/article/activity.vue
index 768bceb..dd52e23 100644
--- a/src/pages/article/activity.vue
+++ b/src/pages/article/activity.vue
@@ -1,42 +1,33 @@
 <template>
   <div class="wrap">
-    <div v-if="form.bannerImg"
-         class="banner"
-         :style="{backgroundImage: form.bannerImg ? ('url(' + form.bannerImg + ')') : ''}">
+    <div v-if="form.bannerImg" class="banner"
+      :style="{ backgroundImage: form.bannerImg ? ('url(' + form.bannerImg + ')') : '' }">
       {{ form.columnName }}
     </div>
     <div class="content">
-      <Breadcrumb ref="breadcrumb"
-                  :data.sync="routes" />
+      <Breadcrumb ref="breadcrumb" :data.sync="routes" />
       <div class="article">
         <div class="left">
           <h2>{{ form.title }}</h2>
-          <div class="meta">{{$t('column.time')}}：{{ form.activityStartTime }}</div>
-          <div v-if="form.offlineLocation"
-               class="meta">{{$t('column.address')}}：{{ form.offlineLocation }}</div>
-          <div v-if="form.onlineLocation"
-               class="meta">{{$t('column.online')}}：{{ form.onlineLocation }}</div>
-          <div v-if="form.offlineLocation"
-               class="meta">{{$t('column.offline')}}：{{ form.offlineLocation }}</div>
-          <div v-if="form.keynoteSpeaker"
-               class="meta">{{$t('column.speaker')}}：{{ form.keynoteSpeaker }}</div>
-          <div v-if="form.lectureSeries"
-               class="meta">{{$t('column.series')}}：{{ form.lectureSeries }}</div>
-
-          <h6>{{$t('column.ActivityIntroduction')}}</h6>
+          <div class="meta">{{ $t('column.time') }}：{{ form.activityStartTime }} ~ {{ form.activityEndTime }}</div>
+          <div v-if="form.offlineLocation" class="meta">{{ $t('column.address') }}：{{ form.offlineLocation }}</div>
+          <div v-if="form.onlineLocation" class="meta">{{ $t('column.online') }}：{{ form.onlineLocation }}</div>
+          <div v-if="form.offlineLocation" class="meta">{{ $t('column.offline') }}：{{ form.offlineLocation }}</div>
+          <div v-if="form.keynoteSpeaker" class="meta">{{ $t('column.speaker') }}：{{ form.keynoteSpeaker }}</div>
+          <div v-if="form.lectureSeries" class="meta">{{ $t('column.series') }}：{{ form.lectureSeries }}</div>
+          <div v-if="form.source" class="meta">{{ $t('column.source') }}：{{ form.source }}</div>
+
+          <h6>{{ $t('column.ActivityIntroduction') }}</h6>
           <div> {{ form.eventProfile }}</div>
 
-          <h6>{{$t('column.content')}}</h6>
+          <h6>{{ $t('column.content') }}</h6>
           <div v-html="form.mainBody"></div>
-          <div v-if="form.fileList && form.fileList.length"
-               class="annex">
-            <h6>{{$t('column.attachmentDownload')}}</h6>
+          <div v-if="form.fileList && form.fileList.length" class="annex">
+            <h6>{{ $t('column.attachmentDownload') }}</h6>
             <ul class="files">
-              <li v-for="(file, i) in form.fileList"
-                  :key="i">
+              <li v-for="(file, i) in form.fileList" :key="i">
                 <span class="name">{{ file.fileName }}</span>
-                <span class="download"
-                      @click="download(file)">{{$t('column.download')}}</span>
+                <span class="download" @click="download(file)">{{ $t('column.download') }}</span>
               </li>
             </ul>
           </div>
@@ -48,7 +39,6 @@
 </template>
 
 <script>
-import Setting from '@/setting'
 import Util from '@/libs/util'
 import Breadcrumb from '@/components/breadcrumb'
 import RightColumns from '@/components/rightColumns'
@@ -144,110 +134,131 @@ export default {
 
 <style lang="scss" scoped>
 @import './editor.css';
+
 .content {
-    width: 1200px;
+  width: 1200px;
 }
+
 .banner {
-    height: 280px;
-    padding: 123px 0 0 243px;
-    font-size: 48px;
-    color: #fff;
-    background: url(../../assets/images/intro-bg.png) 0 0/100% 100% no-repeat;
-    object-fit: cover;
+  height: 280px;
+  padding: 123px 0 0 243px;
+  font-size: 48px;
+  color: #fff;
+  background: url(../../assets/images/intro-bg.png) 0 0/100% 100% no-repeat;
+  object-fit: cover;
 }
+
 .article {
-    display: flex;
-    justify-content: space-between;
-    .left {
-        width: 66%;
+  display: flex;
+  justify-content: space-between;
+
+  .left {
+    width: 66%;
+  }
+
+  h2 {
+    margin-bottom: 20px;
+    font-size: 36px;
+    color: #1c1c1c;
+  }
+
+  .meta {
+    margin: 10px 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333;
+  }
+
+  /deep/.des {
+    a {
+      color: rgb(0, 0, 238);
+      word-wrap: break-word;
     }
-    h2 {
-        margin-bottom: 20px;
-        font-size: 36px;
-        color: #1c1c1c;
+
+    img {
+      max-width: 100%;
     }
-    .meta {
-        margin: 10px 0;
-        font-size: 18px;
-        font-weight: 600;
-        color: #333;
+  }
+
+  .annex {
+    margin-top: 30px;
+
+    h6 {
+      padding-left: 8px;
+      margin-bottom: 20px;
+      font-size: 16px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      line-height: 1;
+      color: #333;
+      border-left: 4px solid #1583ff;
     }
-    /deep/.des {
-        a {
-            color: rgb(0, 0, 238);
-            word-wrap: break-word;
-        }
-        img {
-            max-width: 100%;
-        }
+
+    li {
+      display: flex;
+      align-items: center;
+      margin-bottom: 10px;
     }
-    .annex {
-        margin-top: 30px;
-        h6 {
-            padding-left: 8px;
-            margin-bottom: 20px;
-            font-size: 16px;
-            font-family: PingFangSC-Medium, PingFang SC;
-            font-weight: 500;
-            line-height: 1;
-            color: #333;
-            border-left: 4px solid #1583ff;
-        }
-        li {
-            display: flex;
-            align-items: center;
-            margin-bottom: 10px;
-        }
-        .name {
-            margin-right: 8px;
-            font-size: 14px;
-        }
-        .download {
-            color: #1583ff;
-            cursor: pointer;
-        }
+
+    .name {
+      margin-right: 8px;
+      font-size: 14px;
     }
-    h6 {
-        margin: 30px 0 10px;
-        font-size: 18px;
+
+    .download {
+      color: #1583ff;
+      cursor: pointer;
     }
+  }
+
+  h6 {
+    margin: 30px 0 10px;
+    font-size: 18px;
+  }
 }
 
 @media (max-width: 1420px) {
-    .content {
-        width: 98%;
-    }
+  .content {
+    width: 98%;
+  }
 }
+
 @media (max-width: 1200px) {
-    .article {
-        /deep/.des {
-            img {
-                max-width: 100%;
-                height: 15rem;
-            }
-        }
+  .article {
+    /deep/.des {
+      img {
+        max-width: 100%;
+        height: 15rem;
+      }
     }
-    .banner {
+  }
+
+  .banner {
+    font-size: 1.5rem;
+  }
+
+  .article {
+    flex-direction: column;
+
+    .left {
+      width: 100%;
+
+      h2 {
         font-size: 1.5rem;
+      }
     }
-    .article {
-        flex-direction: column;
-        .left {
-            width: 100%;
-            h2 {
-                font-size: 1.5rem;
-            }
-        }
-    }
-    .article {
-        .des {
-            img {
-                height: 15rem !important;
-            }
-        }
-    }
-    .right {
-        width: 100%;
+  }
+
+  .article {
+    .des {
+      img {
+        height: 15rem !important;
+      }
     }
+  }
+
+  .right {
+    width: 100%;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/publish/show.vue b/src/pages/publish/show.vue
index 791a46f..0e68957 100644
--- a/src/pages/publish/show.vue
+++ b/src/pages/publish/show.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="wrap">
     <div class="content">
-      <Breadcrumb ref="breadcrumb"
-                  :data.sync="routes" />
+      <Breadcrumb ref="breadcrumb" :data.sync="routes" />
       <div class="article">
         <div class="left">
           <h2>{{ form.title }}</h2>
@@ -10,21 +9,26 @@
             <p class="name">{{ $t('column.author') }}</p>
             <p class="val">{{ form.author }}</p>
           </template>
+          <template v-if="form.source">
+            <p class="name">{{ $t('column.source') }}</p>
+            <p class="val">{{ form.source }}</p>
+          </template>
           <template v-if="form.quote">
             <p class="name">{{ $t('column.quote') }}</p>
             <p class="val">{{ form.quote }}</p>
           </template>
+          <template v-if="form.keyword">
+            <p class="name">{{ $t('column.keyword') }}</p>
+            <p class="val">{{ form.keyword }}</p>
+          </template>
           <p class="name">{{ $t('column.introduce') }}</p>
           <div class="flex">
-            <div class="des"
-                 v-html="form.mainBody"></div>
+            <div class="des" v-html="form.mainBody"></div>
             <!-- <img v-if="form.titleImg" width="222" height="222" :src="form.titleImg" alt=""> -->
           </div>
         </div>
         <div class="right">
-          <img class="pic"
-               src="@/assets/images/publish3.png"
-               alt="">
+          <img class="pic" src="@/assets/images/publish3.png" alt="">
           <div class="texts">
             <template v-if="form.periodicalName">
               <p class="name">{{ $t('column.publicationName') }}</p>
@@ -33,8 +37,7 @@
             <p class="name">{{ $t('column.yearOfPublication') }}</p>
             <p class="val">{{ form.publicationYear }}{{ $t('column.year') }}</p>
             <div class="flex">
-              <div v-if="form.reel"
-                   class="m-r-20">
+              <div v-if="form.reel" class="m-r-20">
                 <p class="name">{{ $t('column.rollUp') }}</p>
                 <p class="val">{{ form.reel }}</p>
               </div>
@@ -45,7 +48,8 @@
             </div>
             <template v-if="form.publicationTypeId">
               <p class="name">{{ $t('column.publicationType') }}</p>
-              <p class="val">{{ form.publicationTypeId && publicationTypes.find(e => e.id == form.publicationTypeId).name }}</p>
+              <p class="val">{{ form.publicationTypeId && publicationTypes.find(e => e.id ==
+                form.publicationTypeId).name }}</p>
             </template>
             <template v-if="form.doi">
               <p class="name">DOI</p>
@@ -154,105 +158,126 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-    background: url(../../assets/images/publish1.png) no-repeat;
+  background: url(../../assets/images/publish1.png) no-repeat;
 }
+
 .content {
-    width: 1084px;
-    padding-top: 25px;
-    background: url(../../assets/images/publish2.png) bottom right/auto no-repeat;
+  width: 1084px;
+  padding-top: 25px;
+  background: url(../../assets/images/publish2.png) bottom right/auto no-repeat;
 }
+
 .breadcrumb {
-    margin-bottom: 25px;
+  margin-bottom: 25px;
 }
+
 .article {
-    display: flex;
-    justify-content: space-between;
-    .left {
-        width: 846px;
-        padding: 30px;
-        margin-right: 16px;
-        background: #fff;
-        .name {
-            font-size: 24px;
-            font-family: PingFangSC-Medium, PingFang SC;
-            font-weight: 500;
-            color: #333333;
-            line-height: 33px;
-        }
-        .val {
-            margin-bottom: 38px;
-            font-size: 16px;
-            color: #333;
-            line-height: 30px;
-        }
-        .des {
-            width: 100%;
-            // margin-right: 49px;
-        }
+  display: flex;
+  justify-content: space-between;
+
+  .left {
+    width: 846px;
+    padding: 30px;
+    margin-right: 16px;
+    background: #fff;
+
+    .name {
+      font-size: 24px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333333;
+      line-height: 33px;
     }
-    h2 {
-        padding-bottom: 27px;
-        margin-bottom: 40px;
-        font-size: 36px;
-        font-family: PingFangSC-Medium, PingFang SC;
-        color: #333;
-        line-height: 50px;
-        border-bottom: 1px solid #ddd;
+
+    .val {
+      margin-bottom: 38px;
+      font-size: 16px;
+      color: #333;
+      line-height: 30px;
     }
-    .right {
-        width: 222px;
-        background: #fff;
-        .texts {
-            padding: 15px;
-        }
-        .name {
-            font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            line-height: 20px;
-            color: #666666;
-        }
-        .val {
-            margin: 5px 0 36px;
-            font-size: 14px;
-            font-family: PingFangSC-Medium, PingFang SC;
-            font-weight: 500;
-            color: #333333;
-            line-height: 20px;
-        }
+
+    .des {
+      width: 100%;
+      // margin-right: 49px;
     }
-    .list {
-        margin-bottom: 20px;
-        li {
-            padding: 16px 0;
-            border-bottom: 1px solid #d8d8d8;
-        }
-        .text {
-            margin-bottom: 5px;
-            font-size: 14px;
-            cursor: pointer;
-            &:hover {
-                color: $main-color;
-            }
-        }
-        .date {
-            font-size: 12px;
-            color: #999;
-        }
+  }
+
+  h2 {
+    padding-bottom: 27px;
+    margin-bottom: 40px;
+    font-size: 36px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    color: #333;
+    line-height: 50px;
+    border-bottom: 1px solid #ddd;
+  }
+
+  .right {
+    width: 222px;
+    background: #fff;
+
+    .texts {
+      padding: 15px;
     }
+
+    .name {
+      font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      line-height: 20px;
+      color: #666666;
+    }
+
+    .val {
+      margin: 5px 0 36px;
+      font-size: 14px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333333;
+      line-height: 20px;
+    }
+  }
+
+  .list {
+    margin-bottom: 20px;
+
+    li {
+      padding: 16px 0;
+      border-bottom: 1px solid #d8d8d8;
+    }
+
+    .text {
+      margin-bottom: 5px;
+      font-size: 14px;
+      cursor: pointer;
+
+      &:hover {
+        color: $main-color;
+      }
+    }
+
+    .date {
+      font-size: 12px;
+      color: #999;
+    }
+  }
 }
+
 @media (max-width: 1084px) {
-    .content {
-        width: 95%;
+  .content {
+    width: 95%;
+  }
+
+  .article {
+    flex-direction: column;
+
+    .left,
+    .right {
+      width: 100%;
     }
-    .article {
-        flex-direction: column;
-        .left,
-        .right {
-            width: 100%;
-        }
-        .right {
-            margin: 20px 0 0;
-        }
+
+    .right {
+      margin: 20px 0 0;
     }
+  }
 }
 </style>
\ No newline at end of file