feat: 广告位调整

src/components/article-item/ArticleItem.vue

@@ -10,7 +10,9 @@
       </div>
       <div class="time-container">
         <span class="el-icon-jy-time"></span>
-        <span class="time-text">{{ dateFromNow(article.publishtime * 1000) }}</span>
+        <span class="time-text">
+          <slot name="right-time">{{ dateFromNow(article.publishtime * 1000) }}</slot>
+        </span>
       </div>
     </div>
   </div>

src/components/common/ContentLayout.vue

@@ -27,6 +27,10 @@ import { getAdList } from '@/api/modules/'
 export default {
   name: 'content-layout',
   props: {
+    needAd: {
+      type: String,
+      default: true
+    },
     adCode: {
       type: String,
       default: ''
@@ -52,7 +56,9 @@ export default {
     }
   },
   created () {
-    this.getAdvertisementList()
+    if (this.needAd) {
+      this.getAdvertisementList()
+    }
   },
   methods: {
     async getAdvertisementList () {
@@ -99,6 +105,7 @@ export default {
       overflow: hidden;
       border-radius: 4px;
       // background-color: #C4C4C4;
+      background-color: #D2F6FC;
       &:not(:last-of-type) {
         margin-bottom: 16px;
       }

src/components/push-list/ProjectList.vue

@@ -13,8 +13,9 @@
         :key="index"
         :index="(listState.pageSize * (listState.pageNum - 1)) +  index + 1"
         :article="item"
-        @onClick="toDetail(item)"
-      />
+        @onClick="toDetail(item)">
+        <span slot="right-time">{{ dateFromNow(item.l_lastpushtime * 1000) }}</span>
+      </article-item>
       <empty v-show="showEmpty">
         <div class="flex-c-c center">
           <span>您还没有关注的项目</span>
@@ -41,6 +42,7 @@
 import { Pagination, Card, Button } from 'element-ui'
 import Empty from '@/components/common/Empty.vue'
 import ArticleItem from '@/components/article-item/ArticleItem.vue'
+import { dateFromNow } from '@/utils/'
 import { getFollowProjectList, setFollowRemove30Day } from '@/api/modules/'
 
 export default {
@@ -92,6 +94,7 @@ export default {
     this.doQuery()
   },
   methods: {
+    dateFromNow,
     goManage () {
       setFollowRemove30Day().then(res => {
         if (res && res.error_code === 0) {
@@ -158,8 +161,8 @@ export default {
       }
     },
     toDetail (item) {
-      const { _id } = item
-      window.open(`/article/content/${_id}.html`)
+      const { sid } = item
+      window.open(`/article/content/${sid}.html`)
     },
     onPageChange (p) {
       this.listState.pageNum = p