content keyWords

src/libs/axios.js

@@ -43,7 +43,7 @@ axiosUtil.interceptors.response.use(function (response) {
    return Promise.resolve(response)
  }
}, error => {
  Message.error('请求错误2，请重试')
  Message.error('服务器请求错误，请重试')
  return Promise.reject(error)
})

src/libs/axiosk.js

@@ -40,7 +40,7 @@ axiosUtil.interceptors.response.use(function (response) {
      return Promise.resolve(response)
    }
}, error => {
    Message.error('请求错误2，请重试')
    Message.error('服务器请求错误，请重试')
    return Promise.reject(error)
})

src/pages/content/show.vue

@@ -21,6 +21,13 @@
              <div class="content-uditor" v-html="contentInfo.cnt"></div>
            </div>
          </div>
          <div class="inner-wrapper">
            <div class="content">
              <el-row class="tag-item" v-if="contentInfo.keyWords && contentInfo.keyWords.length">
                <el-tag v-for="sub in contentInfo.keyWords" :key="sub.index">{{sub}}</el-tag>
              </el-row>
            </div>
          </div>
          <div class="inner-wrapper" v-if="platExperts && platExperts.length">
            <div class="content-title">
              <span>相关专家</span>
@@ -62,7 +69,7 @@
</template>
<script>
  import { urlParse, commenTime } from '@/libs/util';
  import { urlParse, commenTime, strToArr } from '@/libs/util';
  import queryBase from '@/libs/queryBase';
  import baseExpert from '@/components/subTemplate/BaseExpert';
@@ -102,6 +109,9 @@
        }, (res) => {
          if (res.success) {
            var $info = res.data;
            if ($info.keyWords) {
              $info.keyWords = strToArr($info.keyWords);
            }
            if ($info.modifyTime) {
              $info.modifyTime = commenTime($info.modifyTime, true)
            }

src/pages/h5/views/Result/result.vue

@@ -43,7 +43,7 @@
                </el-col>
                <el-col :span="24" v-if="patentInfo.keywords && patentInfo.keywords.length">
                  <el-row class="tag-item">
                    <el-tag v-for="sub in patentInfo.keywords" :key="sub.index">{{sub}}</el-tag>
                    <el-tag v-for="sub in patentInfo.keywords" :key="sub.index"><a :href="'h5.html#/search?n=5&k='+ sub">{{sub}}</a></el-tag>
                  </el-row>
                </el-col>
              </el-row>

src/pages/h5/views/content/content.vue

@@ -25,6 +25,13 @@
              <div class="content-uditor" v-html="contentInfo.cnt"></div>
            </div>
          </div>
          <div class="inner-wrapper">
            <div class="content">
              <el-row class="tag-item" v-if="contentInfo.keyWords && contentInfo.keyWords.length">
                <el-tag v-for="sub in contentInfo.keyWords" :key="sub.index"><a :href="'h5.html#/search?n=1&k='+ sub + '&c=' + contentInfo.catalog">{{sub}}</a></el-tag>
              </el-row>
            </div>
          </div>
          <div class="inner-wrapper" v-if="platExperts && platExperts.length">
            <div class="content-title">
              <span>相关专家</span>
@@ -74,7 +81,7 @@
</template>
<script>
  import { urlParse, commenTime } from '@/libs/util';
  import { urlParse, commenTime, strToArr } from '@/libs/util';
  import queryBase from '@/libs/queryBase';
  import baseExpert from '@/components/subTemplate/BaseExpert';
  import baseOrg from '@/components/subTemplate/BaseOrg';
@@ -139,6 +146,9 @@
        }, (res) => {
          if (res.success) {
            var $info = res.data;
            if ($info.keyWords) {
              $info.keyWords = strToArr($info.keyWords);
            }
            if ($info.modifyTime) {
              $info.modifyTime = commenTime($info.modifyTime, true)
            }

src/pages/h5/views/resource/resource.vue

@@ -41,7 +41,7 @@
              </el-col>
              <el-col class="rel-item" :span="24" v-if="resourceInfo.subject && resourceInfo.subject.length">
                <el-row class="tag-item">
                  <el-tag v-for="sub in resourceInfo.subject" :key="sub.index">{{sub}}</el-tag>
                  <el-tag v-for="sub in resourceInfo.subject" :key="sub.index"><a :href="'h5.html#/search?n=4&k='+ sub">{{sub}}</a></el-tag>
                </el-row>
              </el-col>
            </el-row>

src/pages/h5/views/search/scrollMore.vue

@@ -1,20 +1,32 @@
<template lang="html">
 
    <div class="yo-scroll" @touchstart="touchStart($event)" ref="scrollBox"
         @touchmove="touchMove($event)" @touchend="touchEnd($event)" :style="{top: topVal+'px'}" v-loading="dataList.loading">
      <section class="inner" ref="contentBox">
        <!-- 使用时外面的标签会填在里面 -->
  <!-- <div class="swiper-container" ref="swiperContainer" :style="{top: topVal+'px;-webkit-overflow-scrolling: touch;'}" v-loading="dataList.loading">
    <div class="swiper-wrapper">
      <div class="swiper-slide" :style="'height:'+ slideH" ref="slideScroll">
        <slot>
        </slot>
        <!-- 保持加载更多条在最下面 -->
        <footer class="load-more">
          <slot name="load-more">
            <span>{{loadMoreText}}</span>
          </slot>
        </footer>
        <div class="nullData" v-show="dataList.noFlag">暂无更多数据</div>
      </section>
      </div>
    </div>
    <div class="load-more">
      <slot name="load-more">
        <span>{{loadMoreText}}</span>
      </slot>
    </div>
    <div class="nullData" v-show="dataList.noFlag">暂无更多数据</div>
    <div class="swiper-scrollbar" ref="scrollSwiper"></div>
  </div> -->
  <div class="yo-scroll" @touchstart="touchStart($event)" ref="scrollBox"
        @touchmove="touchMove($event)" @touchend="touchEnd($event)" :style="{top: topVal+'px'}" v-loading="dataList.loading">
    <section class="inner" ref="contentBox">
      <slot>
      </slot>
      <footer class="load-more">
        <slot name="load-more">
          <span>{{loadMoreText}}</span>
        </slot>
      </footer>
      <div class="nullData" v-show="dataList.noFlag">暂无更多数据</div>
    </section>
  </div>
</template>
<script>
export default {
@@ -52,7 +64,64 @@ export default {
  mounted() {
    this.scrollBottomTest()
  },
  // mounted() {
  //   var that = this
  //   this.$nextTick(() => {
  //      that.setSlideHeight()
  //   });
  //   this.mySwiperScroll = new Swiper(that.$refs.swiperContainer, {
  //     direction: 'vertical',
  //     scrollbar: that.$refs.scrollSwiper,
  //     autoplay : 500,
  //     mode : 'vertical',
  //     slidesPerView: 'auto',
  //     mousewheelControl: true,
  //     freeMode: true,
  //     allowTouchMove: true,
  //     preventInteractionOnTransition: true,
  //     observer: true,
  //     on: {
  //       touchMove(e) {
  //         if (!that.enableLoadMore || that.dataList.noFlag || !that.touching) {
  //           return;
  //         }
  //         if (that.mySwiperScroll.translate === 0) {
  //           e.preventDefault();
  //         }
  //         that.loadMoreText = '上拉加载更多';
  //         that.$el.querySelector('.load-more').style.display = 'block';
  //       },
  //       touchEnd(swiper) {
  //         var _viewHeight = that.$refs.swiperContainer.offsetHeight;
  //         var _contentHeight = that.$refs.slideScroll.offsetHeight;
  //         // 上拉加载
  //         if(that.mySwiperScroll.translate <= _viewHeight - _contentHeight + that.topVal - 50
  //           && that.mySwiperScroll.translate < 0
  //           && !that.dataList.noFlag && !that.isLoading) {
  //           setTimeout(function() {
  //             that.doLoadMore()
  //             that.mySwiperScroll.update()
  //           }, 300);
  //         } else {
  //           let more = that.$el.querySelector('.load-more');
  //           more.style.display = 'none'; //隐藏加载条
  //         }
  //         if(that.mySwiperScroll.translate >= 50) {
  //           setTimeout(function() {
  //             //刷新操作
  //             that.mySwiperScroll.update(); // 重新计算高度;
  //           }, 1000);
  //         }else if(that.mySwiperScroll.translate >= 0 && that.mySwiperScroll.translate < 50){
  //         }
  //       }
  //     }
  //   });
  // },
  methods: {
    setSlideHeight() {
      this.slideH = window.innerHeight + 'px'
    },
    touchStart(e) {
      this.startY = e.targetTouches[0].pageY;
      this.startX = e.targetTouches[0].pageX;
@@ -87,7 +156,6 @@ export default {
      //如果滑动距离太短
      if (Math.abs(dx) < 2 && Math.abs(dy) < 2) {
        // console.log("滑动距离太短")
        let more = this.$el.querySelector('.load-more');
        more.style.display = 'none'; //隐藏加载条
        return;
@@ -103,7 +171,7 @@ export default {
        innerHeight = this.$el.querySelector('.inner').clientHeight,
        scrollTop = this.$el.scrollTop,
        bottom = innerHeight - outerHeight - scrollTop - 50;
      if (bottom <= this.offset && !this.dataList.noFlag) {
      if (bottom <= this.offset && !this.dataList.noFlag && !this.isLoading ) {
        //内容太少
        this.doLoadMore();
      } else {
@@ -129,8 +197,7 @@ export default {
        var viewH = elbody.clientHeight, // 可视高度
          contentH = conbody.scrollHeight, // 内容高度
          scrollTop = elbody.scrollTop; // 滚动高度
        //if(contentH - viewH - scrollTop <= 100) { //到达底部100px时,加载新内容
        if (scrollTop / (contentH -viewH) >= 0.95 && !that.dataList.noFlag ) { //到达底部100px时,加载新内容
        if (scrollTop / (contentH -viewH) >= 1 && !that.dataList.noFlag && !that.dataList.loading && !that.isLoading ) { //到达底部时,加载新内容
          that.doLoadMore();
        }
      })

src/pages/h5/views/search/search.vue

@@ -29,7 +29,7 @@
        </div>
      </div>
    </div>
    <div class="swiper-container" :style="'height:'+ slideH" ref="scrollSwiper">
    <div class="swiper-container" ref="swiperMainCon" :style="'height:'+ slideH">
      <div class="swiper-wrapper" :style="'height:'+ slideH">
        <div class="swiper-slide swiper-Main-con" :style="'height:'+ slideH" v-for="tab in navList" :key="tab.tab">
          <v-scroll :onLoadMore="onLoadMore" :dataList="scrollData" :topVal="activeTab==='1'? '122' : '84'">
@@ -200,11 +200,6 @@ export default {
      this.mySwiperTab.slideTo(num, 500, false)
      this.mySwiperMain.slideTo(parseInt(val) - 1, 500, false)
      this.clearToFun()
    },
    activeColumn(val) {
      this.contentList = []
      this.pageNo = 1
      this.contentListFun()
    }
  },
  created() {
@@ -214,7 +209,10 @@ export default {
    if (urlParse('k')) {
      this.searchText = urlParse('k');
    }
    this.tabTofun()
    if (urlParse('c')) {
      this.activeColumn = urlParse('c');
    }
    this.clearToFun()
  },
  mounted() {
    var that = this
@@ -231,7 +229,7 @@ export default {
      slidesPerView: 'auto',
      freeModeSticky: true
    });
    this.mySwiperMain = new Swiper(that.$refs.scrollSwiper,{
    this.mySwiperMain = new Swiper(that.$refs.swiperMainCon,{
      allowTouchMove: true,
      preventInteractionOnTransition: true,
      observer: true,
@@ -252,6 +250,9 @@ export default {
    },
    slideChangedColumn(val) {
      this.activeColumn = val
      this.contentList = []
      this.pageNo = 1
      this.contentListFun()
    },
    clearToFun() {
      this.contentList = []
@@ -273,6 +274,10 @@ export default {
        patId: ''
      }
      this.pageNo = 1
      this.scrollData = {
        noFlag: false,
        loading: false
      }
      this.tabTofun()
    },
    tabTofun() {
@@ -295,18 +300,26 @@ export default {
    },
    onLoadMore(done) {
      var that = this
      this.pageNo++;
      setTimeout(() => {
        that.tabTofun()
        done();
      }, 300);
      console.log(111)
      console.log(that.scrollData.noFlag)
      console.log(that.scrollData.loading)
      if (!that.scrollData.noFlag) {
        console.log(222)
        setTimeout(() => {
          console.log(that.pageNo)
          that.pageNo++;
          console.log(that.pageNo)
          that.tabTofun()
          done();
        }, 10);
      }
    },
    contentListFun() {
      var that = this
      that.scrollData.loading = true
      that.scrollData.noFlag = false
      this.$axios.get('/ajax/article/pq', {
        title: that.searchText,
        key: that.searchText,
        catalog: that.activeColumn,
        published: 1,
        pageSize: that.rows,

src/pages/h5/views/service/service.vue

@@ -26,7 +26,7 @@
            </el-col>
            <el-col class="rel-item" :span="24" v-if="serveInfo.keywords && serveInfo.keywords.length">
              <el-row class="tag-item">
                <el-tag v-for="sub in serveInfo.keywords" :key="sub.index">{{sub}}</el-tag>
                <el-tag v-for="sub in serveInfo.keywords" :key="sub.index"><a :href="'h5.html#/search?n=3&k='+ sub">{{sub}}</a></el-tag>
              </el-row>
            </el-col>
          </el-row>
@@ -39,7 +39,7 @@
            <div class="content content-nf">
              <baseService v-for="item in likeserves" :key="item.index" :itemSingle="item" :noBlank="true"></baseService>
            </div>
          </div>>
          </div>
        </div>
        <div class="content-wrapper" v-if="hotserves && hotserves.length">
          <div class="inner-wrapper">