提交

jydocs-pc/src/App.vue

@@ -63,7 +63,6 @@ export default {
     background-color: #fff;
   }
 }
-<<<<<<< HEAD
 .in-app.docs-app{
   width: 100%;
   min-width: 1012px !important;
@@ -72,7 +71,7 @@ export default {
     width: auto !important;
     min-width: auto !important;
   }
-=======
+}
 ::-webkit-scrollbar {
   /*滚动条整体样式*/
   width: 8px;
@@ -82,6 +81,5 @@ export default {
   /*滚动条里面小方块*/
   border-radius: 3px;
   background-color: #e0e0e0;
->>>>>>> master
 }
 </style>

jydocs-pc/src/views/Home.vue

@@ -16,36 +16,12 @@
             <h5 style="font-size: 24px;line-height: 36px;">热门文档</h5>
             <!-- <i class="el-icon-jy-Frame"></i> -->
           </div>
-<<<<<<< HEAD
         </div>
           <div class="word-model">
             <div class="word-model-content" :class="{ 'launch-alone': !launchActive }">
               <div class="word-model-list" @click="onSetWordModel(item)" :class="{ 'active': item.active }"
                 v-for="(item, index) in wordModel" :key="index">
                 {{ item.value }}
-=======
-
-          <div class="new-list-group must-bottom">
-            <div class="word-model">
-              <div class="word-model-content" :class="{'launch-alone': !launchActive}">
-                <div class="word-model-list" @click="onSetWordModel(item)" :class="{'active': item.active}" v-for="(item, index) in wordModel" :key="index">
-                  {{item.value}}
-                </div>
-              </div>
-              <div class="word-model-more" @click="launchActive = !launchActive" v-if="canFold">
-                <span>{{ launchActive ? '收起' : '展开'}}</span>
-                <i :class="`el-icon-arrow-${launchActive ? 'up' : 'down'}`"></i>
-              </div>
-            </div>
-            <div class="word-file-main">
-              <div class="word-file-list" @click="goContent(item)" v-for="(item, index) in wordFileList" :key="index">
-                <div class="mini-img-group">
-                  <img :src="item.img" alt="" @error="handleError">
-                  <i class="word-type" :class="'el-icon-jy-' + item.type" ></i>
-                  <span class="type-tag" :class="item.productType === 2 ? 'boutique' : 'free'">{{item.productType === 2 ? '付费精品' : '会员免费'}}</span>
-                </div>
-                <div class="word-file-name">{{ item.title }}</div>
->>>>>>> master
               </div>
             </div>
             <div class="word-model-more" @click="launchActive = !launchActive">
@@ -205,11 +181,7 @@ export default {
       jyPcDocMember: [], // 文库会员广告位
       docsWordList: [],
       launchActive: false,
-<<<<<<< HEAD
       in_Iframe: false
-=======
-      canFold: false
->>>>>>> master
     }
   },
   created () {
@@ -256,22 +228,6 @@ export default {
     }
   },
   methods: {
-    // 热门文档的tag是否有多行
-    checkIsOneRow () {
-      const container = document.querySelector('.word-model-content')
-      if (!container) return
-      const items = container.querySelectorAll('.word-model-list')
-      // 获取所有子元素的top值,如果所有子元素的top值相同,则说明只有一行
-      const firstItemTop = items[0].offsetTop
-      let isOneRow = true
-      for (let i = 1; i < items.length; i++) {
-        if (items[i].offsetTop !== firstItemTop) {
-          isOneRow = false
-          break
-        }
-      }
-      this.canFold = !isOneRow
-    },
     handleError (img) {
       img.target.src = require('../assets/images/error.png')
     },
@@ -375,14 +331,7 @@ export default {
       getSearchTag().then(data => {
         const res = data.data
         if (res && res.error_code === 0) {
-<<<<<<< HEAD
           this.wordModel = res.data.map((item, index) => ({ value: item, active: index === 0 }))
-=======
-          this.wordModel = res.data.map((item, index) => ({ value: item, active: index === 0 ? true : false }))
-          this.$nextTick(() => {
-            this.checkIsOneRow()
-          })
->>>>>>> master
           const localList = this.getLocalData(this.wordModel[0].value)
           if (localList && localList.length) {
             this.wordFileList = localList.map((v) => formatData(v))
@@ -851,7 +800,6 @@ export default {
   }
 }
 
-<<<<<<< HEAD
 .in-app {
   .word-file-list{
    height: auto;
@@ -880,131 +828,6 @@ export default {
         .search-input .el-input__inner{
           border-radius: 8px 0 0 8px;
           border: none;
-=======
-    .new-list-group {
-      .word-file-main{
-        display: flex;
-        justify-content: flex-start;
-        margin-top: 10px;
-        .word-file-list{
-          margin-left: 16px;
-          width: 136px;
-          height: 240px;
-          cursor: pointer;
-          &:first-child {
-            margin-left: 0;
-          }
-          .mini-img-group{
-            position: relative;
-            .word-type {
-              position: absolute;
-              right: 4px;
-              bottom: 2px;
-            }
-            &>img{
-              width: 100%;
-              height: 184px;
-              border: 1px solid #ECECEC;
-              border-radius: 4px;
-            }
-            .type-tag {
-              position: absolute;
-              left: 0;
-              top: 0;
-              padding: 2px 5px;
-              border-radius: 4px 0px 9px 0px;
-              font-size: 11px;
-              line-height: 14px;
-
-              &.free {
-                background: linear-gradient(to right, #FF7C32 0%, #F33838 100%);
-                color: #fff;
-              }
-              &.boutique{
-                background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%);
-                color: #B1700E;
-              }
-            }
-          }
-          .word-file-name{
-            display: -webkit-box;
-            -webkit-line-clamp: 2; /* 控制显示的行数 */
-            -webkit-box-orient: vertical;
-            margin-top: 8px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            word-break: break-all;
-            font-size: 16px;
-            line-height: 24px;
-            color: #1D1D1D;
-          }
-        }
-      }
-      .word-file-ad {
-        margin-top: 20px;
-        height: 80px;
-        border-radius: 8px;
-        overflow: hidden;
-        cursor: pointer;
-        .el-carousel{
-          img{
-            width: 100%;
-            height: 100%;
-          }
-          ::v-deep{
-            .el-carousel__indicator {
-              padding: 10px;
-            }
-            .el-carousel__button{
-              width: 6px;
-              height: 6px;
-            }
-          }
-        }
-      }
-      .word-recommend-ad{
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-top: 20px;
-        height: 160px;
-        .word-recommend-ad-list{
-          width: 285px;
-          height: 100%;
-          border-radius: 8px;
-          overflow: hidden;
-          cursor: pointer;
-          &>img{
-            width: 100%;
-            height: 100%;
-          }
-        }
-      }
-      .word-model {
-        display: flex;
-        justify-content: space-between;
-        .word-model-content {
-          flex: 1;
-          display: flex;
-          flex-wrap: wrap;
-          .word-model-list {
-            margin:0 10px 10px 0;
-            padding: 2px 8px;
-            color: #686868;
-            font-size: 14px;
-            border-radius: 4px;
-            line-height: 22px;
-            cursor: pointer;
-            &.active{
-              background: #2ABED1;
-              color: #fff;
-            }
-          }
-          &.launch-alone{
-            height: 26px;
-            overflow: hidden;
-          }
->>>>>>> master
         }
         .search-input .el-input-group__append{
           border-radius: 0 8px 8px 0;