fix

src/i18n/index.js

@@ -71,6 +71,8 @@ export const messages = {
       back: '返回',
       comming: '暂无更多信息，敬请期待。',
       nothing: '没有找到您搜索的内容，您可尝试搜索其他关键词。',
+      source: '来源',
+      keyword: '关键字',
     }
   },
   'en': {
@@ -144,6 +146,8 @@ export const messages = {
       back: 'Back',
       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',
     }
   }
 };

src/pages/article/activity.vue

@@ -1,42 +1,33 @@
 <template>
   <div class="wrap">
-    <div v-if="form.bannerImg"
+    <div v-if="form.bannerImg" class="banner"
-         class="banner"
       :style="{ backgroundImage: form.bannerImg ? ('url(' + form.bannerImg + ')') : '' }">
       {{ form.columnName }}
     </div>
     <div class="content">
-      <Breadcrumb ref="breadcrumb"
+      <Breadcrumb ref="breadcrumb" :data.sync="routes" />
-                  :data.sync="routes" />
       <div class="article">
         <div class="left">
           <h2>{{ form.title }}</h2>
-          <div class="meta">{{$t('column.time')}}：{{ form.activityStartTime }}</div>
+          <div class="meta">{{ $t('column.time') }}：{{ form.activityStartTime }} ~ {{ form.activityEndTime }}</div>
-          <div v-if="form.offlineLocation"
+          <div v-if="form.offlineLocation" class="meta">{{ $t('column.address') }}：{{ form.offlineLocation }}</div>
-               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.onlineLocation"
+          <div v-if="form.offlineLocation" class="meta">{{ $t('column.offline') }}：{{ form.offlineLocation }}</div>
-               class="meta">{{$t('column.online')}}：{{ form.onlineLocation }}</div>
+          <div v-if="form.keynoteSpeaker" class="meta">{{ $t('column.speaker') }}：{{ form.keynoteSpeaker }}</div>
-          <div v-if="form.offlineLocation"
+          <div v-if="form.lectureSeries" class="meta">{{ $t('column.series') }}：{{ form.lectureSeries }}</div>
-               class="meta">{{$t('column.offline')}}：{{ form.offlineLocation }}</div>
+          <div v-if="form.source" class="meta">{{ $t('column.source') }}：{{ form.source }}</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> {{ form.eventProfile }}</div>
 
           <h6>{{ $t('column.content') }}</h6>
           <div v-html="form.mainBody"></div>
-          <div v-if="form.fileList && form.fileList.length"
+          <div v-if="form.fileList && form.fileList.length" class="annex">
-               class="annex">
             <h6>{{ $t('column.attachmentDownload') }}</h6>
             <ul class="files">
-              <li v-for="(file, i) in form.fileList"
+              <li v-for="(file, i) in form.fileList" :key="i">
-                  :key="i">
                 <span class="name">{{ file.fileName }}</span>
-                <span class="download"
+                <span class="download" @click="download(file)">{{ $t('column.download') }}</span>
-                      @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,9 +134,11 @@ export default {
 
 <style lang="scss" scoped>
 @import './editor.css';
+
 .content {
   width: 1200px;
 }
+
 .banner {
   height: 280px;
   padding: 123px 0 0 243px;
@@ -155,34 +147,42 @@ export default {
   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%;
   }
+
   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;
     }
+
     img {
       max-width: 100%;
     }
   }
+
   .annex {
     margin-top: 30px;
+
     h6 {
       padding-left: 8px;
       margin-bottom: 20px;
@@ -193,20 +193,24 @@ export default {
       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;
     }
   }
+
   h6 {
     margin: 30px 0 10px;
     font-size: 18px;
@@ -218,6 +222,7 @@ export default {
     width: 98%;
   }
 }
+
 @media (max-width: 1200px) {
   .article {
     /deep/.des {
@@ -227,18 +232,23 @@ export default {
       }
     }
   }
+
   .banner {
     font-size: 1.5rem;
   }
+
   .article {
     flex-direction: column;
+
     .left {
       width: 100%;
+
       h2 {
         font-size: 1.5rem;
       }
     }
   }
+
   .article {
     .des {
       img {
@@ -246,6 +256,7 @@ export default {
       }
     }
   }
+
   .right {
     width: 100%;
   }

src/pages/publish/show.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="wrap">
     <div class="content">
-      <Breadcrumb ref="breadcrumb"
+      <Breadcrumb ref="breadcrumb" :data.sync="routes" />
-                  :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"
+            <div class="des" v-html="form.mainBody"></div>
-                 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"
+          <img class="pic" src="@/assets/images/publish3.png" alt="">
-               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"
+              <div v-if="form.reel" class="m-r-20">
-                   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>
@@ -156,22 +160,27 @@ export default {
 .wrap {
   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;
 }
+
 .breadcrumb {
   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;
@@ -179,17 +188,20 @@ export default {
       color: #333333;
       line-height: 33px;
     }
+
     .val {
       margin-bottom: 38px;
       font-size: 16px;
       color: #333;
       line-height: 30px;
     }
+
     .des {
       width: 100%;
       // margin-right: 49px;
     }
   }
+
   h2 {
     padding-bottom: 27px;
     margin-bottom: 40px;
@@ -199,18 +211,22 @@ export default {
     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;
@@ -220,36 +236,45 @@ export default {
       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%;
   }
+
   .article {
     flex-direction: column;
+
     .left,
     .right {
       width: 100%;
     }
+
     .right {
       margin: 20px 0 0;
     }