修正bug

src/components/subTemplate/BaseCompany.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'company.html?id='+companyInfo.id" :target="noBlank ? '' : '_blank'">
  <a class="list-item" :href="urlHref" :target="noBlank ? '' : '_blank'">
    <div class="list-head">
      <div class="item-pic-org">
        <img :src="companyInfo.logo">
@@ -26,7 +26,8 @@
    },
    data() {
      return {
        objKey: []
        objKey: [],
        urlHref: ''
      }
    },
    computed: {
@@ -43,6 +44,11 @@
    },
    created() {
      this.getCompanyKeyword()
      if (this.noBlank) {
        this.urlHref = `h5.html#/company?id=${this.companyInfo.id}`;
      } else {
        this.urlHref = `company.html?id=${this.companyInfo.id}`
      }
    },
    methods: {
      getCompanyKeyword() {

src/components/subTemplate/BaseContent.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :class="isShowImg(itemSingle.catalog)" :href="'content.html?id='+itemSingle.id" :target="noBlank ? '' : '_blank'">
  <a class="list-item" :class="isShowImg(itemSingle.catalog)" :href="urlHref" :target="noBlank ? '' : '_blank'">
    <div class="list-head" :style="{backgroundImage: 'url(' + imgUrl + ')'}"></div>
    <div class="list-info">
      <div class="list-tit">{{itemSingle.title}}</div>
@@ -24,9 +24,17 @@
    },
    data() {
      return {
        imgUrl: this.itemSingle.imgUrl || defaultSet.img.article
        imgUrl: this.itemSingle.imgUrl || defaultSet.img.article,
        urlHref: ''
      };
    },
    created() {
      if (this.noBlank) {
        this.urlHref = `h5.html#/content?id=${this.itemSingle.id}`;
      } else {
        this.urlHref = `content.html?id=${this.itemSingle.id}`
      }
    },
    methods: {
      isShowImg(catalog) {
        if (catalog === '1' || catalog === '2' || catalog === '5') {

src/components/subTemplate/BaseExpert.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'expert.html?id='+itemSingle.id" :target="noBlank ? '' : '_blank'">
  <a class="list-item" :href="urlHref" :target="noBlank ? '' : '_blank'">
    <div class="list-head list-circular-head" :style="{backgroundImage: 'url(' + imgUrl + ')'}"></div>
    <div class="list-info">
      <div class="list-tit list-topic">{{itemSingle.name}}</div>
@@ -22,7 +22,9 @@
      }
    },
    data() {
      return {};
      return {
        urlHref: ''
      };
    },
    computed: {
      imgUrl() {
@@ -34,6 +36,11 @@
      }
    },
    created() {
      if (this.noBlank) {
        this.urlHref = `h5.html#/expert?id=${this.itemSingle.id}`;
      } else {
        this.urlHref = `expert.html?id=${this.itemSingle.id}`
      }
    },
    methods: {
    }

src/components/subTemplate/BaseOrg.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'org.html?id='+orgInfo.id" :target="noBlank ? '' : '_blank'">
  <a class="list-item" :href="urlHref" :target="noBlank ? '' : '_blank'">
    <div class="list-head">
      <div class="item-pic-org">
        <img :src="orgInfo.logo">
@@ -25,7 +25,9 @@
      }
    },
    data() {
      return {};
      return {
        urlHref: ''
      };
    },
    computed: {
      orgInfo() {
@@ -42,6 +44,11 @@
      }
    },
    created() {
      if (this.noBlank) {
        this.urlHref = `h5.html#/org?id=${this.orgInfo.id}`;
      } else {
        this.urlHref = `org.html?id=${this.orgInfo.id}`
      }
    },
    methods: {
    }

src/components/subTemplate/BaseProduct.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'product.html?id='+itemSingle.id" :target="noBlank ? '' : '_blank'">
  <a class="list-item" :href="urlHref" :target="noBlank ? '' : '_blank'">
    <div class="list-head" :style="{backgroundImage: 'url(' + imgUrl + ')'}"></div>
    <div class="list-info">
      <div class="list-tit list-topic">{{itemSingle.name}}</div>
@@ -27,10 +27,16 @@
    },
    data() {
      return {
        imgUrl: this.itemSingle.img ? strToArr(this.itemSingle.img)[0] : defaultSet.img.product
        imgUrl: this.itemSingle.img ? strToArr(this.itemSingle.img)[0] : defaultSet.img.product,
        urlHref: ''
      };
    },
    created() {
      if (this.noBlank) {
        this.urlHref = `h5.html#/product?id=${this.itemSingle.id}`;
      } else {
        this.urlHref = `product.html?id=${this.itemSingle.id}`
      }
    },
    methods: {
    }

src/components/subTemplate/BaseResource.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'resource.html?id='+resourceInfo.id" :target="noBlank ? '' : '_blank'">
  <a class="list-item" :href="urlHref" :target="noBlank ? '' : '_blank'">
    <div class="list-head" :style="{backgroundImage: 'url(' + resourceInfo.firstImg + ')'}"></div>
    <div class="list-info">
      <div class="list-tit list-topic">{{resourceInfo.name}}</div>
@@ -26,7 +26,8 @@
    data() {
      return {
        ownerName: '',
        ownerAuth: ''
        ownerAuth: '',
        urlHref: ''
      };
    },
    computed: {
@@ -54,6 +55,11 @@
    },
    created() {
      this.ownerByond();
      if (this.noBlank) {
        this.urlHref = `h5.html#/resource?id=${this.resourceInfo.id}`;
      } else {
        this.urlHref = `resource.html?id=${this.resourceInfo.id}`
      }
    },
    methods: {
      ownerByond() {

src/components/subTemplate/BaseResult.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'result.html?id='+itemSingle.id" :target="noBlank ? '' : '_blank'">
  <a class="list-item" :href="urlHref" :target="noBlank ? '' : '_blank'">
    <div class="list-head" :style="{backgroundImage: 'url(' + imgUrl + ')'}"></div>
    <div class="list-info">
      <div class="list-tit list-topic">{{itemSingle.name}}</div>
@@ -24,10 +24,16 @@
    },
    data() {
      return {
        imgUrl: defaultSet.img.patent
        imgUrl: defaultSet.img.patent,
        urlHref: ''
      };
    },
    created() {
      if (this.noBlank) {
        this.urlHref = `h5.html#/result?id=${this.itemSingle.id}`;
      } else {
        this.urlHref = `result.html?id=${this.itemSingle.id}`
      }
    },
    methods: {
    }

src/components/subTemplate/BaseService.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'serve.html?id='+serveInfo.id" :target="noBlank ? '' : '_blank'">
  <a class="list-item" :href="urlHref" :target="noBlank ? '' : '_blank'">
    <div class="list-head" :style="{backgroundImage: 'url(' + serveInfo.firstImg + ')'}"></div>
    <div class="list-info">
      <div class="list-tit list-topic">{{serveInfo.name}}</div>
@@ -27,11 +27,17 @@
      return {
        ownerName: '',
        ownerAuth: '',
        serveInfo: ''
        serveInfo: '',
        urlHref: ''
      };
    },
    created() {
      this.itmeList();
      if (this.noBlank) {
        this.urlHref = `h5.html#/serve?id=${this.serveInfo.id}`;
      } else {
        this.urlHref = `serve.html?id=${this.serveInfo.id}`
      }
    },
    methods: {
      itmeList() {

src/pages/h5/style/index.scss

@@ -95,7 +95,6 @@
        vertical-align: middle;
        text-align: center;
        overflow: hidden;
        img {
          max-width: 100%;
          max-height: 100%;
@@ -104,6 +103,7 @@
          overflow-y: auto;
          color: transparent;
          font-size: 0;
          margin: auto;
        }
      }
    }

src/pages/h5/views/company/company.vue

@@ -38,7 +38,7 @@
            </div>
            <div class="content">{{orgInfo.descp}}</div>
          </div>
          <div class="inner-wrapper" v-if="keywordObj && keywordObj[2].length">
          <div class="inner-wrapper" v-if="keywordObj[2] && keywordObj[2].length">
            <div class="content-title">
              <span>专注领域</span>
            </div>
@@ -50,11 +50,13 @@
          </div>
        </div>
        <div class="content-wrapper" v-if="compContents && compContents.length">
          <div class="content-title">
            <span>相关文章</span>
          </div>
          <div class="content content-nf" v-if="compContents.length">
            <baseContent v-for="item in compContents" :key="item.index" :itemSingle="item" :noBlank="true"></baseContent>
          <div class="inner-wrapper">
            <div class="content-title">
              <span>相关文章</span>
            </div>
            <div class="content content-nf" v-if="compContents.length">
              <baseContent v-for="item in compContents" :key="item.index" :itemSingle="item" :noBlank="true"></baseContent>
            </div>
          </div>
        </div>
      </div>

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

@@ -9,6 +9,7 @@
                <div class="info-tit info-tit-big">{{contentInfo.title}}</div>
                <div class="info-tag">
                  <span>{{contentInfo.modifyTime}}</span>
                  <pageView v-if="contentId" :pageObj="{ tn: 'article', id: contentId, src: '2'}"></pageView>
                  <span>作者/来源：{{contentInfo.source}}</span>
                </div>
              </div>
@@ -79,6 +80,7 @@
  import baseOrg from '@/components/subTemplate/BaseOrg';
  import baseCompany from '@/components/subTemplate/BaseCompany';
  import baseContent from '@/components/subTemplate/BaseContent';
  import pageView from '@/components/pageView';
  export default {
    data() {
      return {
@@ -103,7 +105,8 @@
      baseExpert,
      baseOrg,
      baseCompany,
      baseContent
      baseContent,
      pageView
    },
    methods: {
      queryPaltNews() {

src/pages/h5/views/org/org.vue

@@ -18,59 +18,67 @@
        </div>
      </div>
    </div>
    <div class="content-wrapper split-other" v-if="platServices.length || platResources.length">
      <div class="inner-wrapper" v-if="platServices.length">
        <div class="content-title">
          <span>可提供服务</span>
        </div>
        <div class="content content-nf" v-if="platServices.length">
          <baseService v-for="item in platServices" :key="item.index" :itemSingle="item" :noBlank="true"></baseService>
          <p class="moretype" @click="moreService" v-show="loadingModalShow">查看更多服务</p>
        </div>
      </div>
      <div class="inner-wrapper" v-if="platResources.length">
        <div class="content-title">
          <span>可共享资源</span>
        </div>
        <div class="content content-nf" v-if="platResources.length">
          <baseResource v-for="item in platResources" :key="item.index" :itemSingle="item" :noBlank="true"></baseResource>
          <p class="moretype" @click="moreProduct" v-show="loadingModalShow2">查看更多资源</p>
        </div>
      </div>
    </div>
    <div class="content-wrapper" v-if="orgInfo.descp">
      <div class="inner-wrapper">
        <div class="content-title">
          <span>机构简介</span>
        </div>
        <div class="content">{{orgInfo.descp}}</div>
      </div>
      <div class="inner-wrapper" v-if="orgInfo.subject && orgInfo.subject.length">
        <div class="content-title">
          <span>专注领域</span>
        </div>
        <div class="content">
          <el-row class="tag-item">
            <el-tag v-for="sub in orgInfo.subject" :key="sub.index">{{sub}}</el-tag>
          </el-row>
    <div class="block-wrapper">
        <div class="left-main">
          <div class="content-wrapper split-other" v-if="platServices.length || platResources.length">
            <div class="inner-wrapper" v-if="platServices.length">
              <div class="content-title">
                <span>可提供服务</span>
              </div>
              <div class="content content-nf" v-if="platServices.length">
                <baseService v-for="item in platServices" :key="item.index" :itemSingle="item" :noBlank="true"></baseService>
                <p class="moretype" @click="moreService" v-show="loadingModalShow">查看更多服务</p>
              </div>
            </div>
            <div class="inner-wrapper" v-if="platResources.length">
              <div class="content-title">
                <span>可共享资源</span>
              </div>
              <div class="content content-nf" v-if="platResources.length">
                <baseResource v-for="item in platResources" :key="item.index" :itemSingle="item" :noBlank="true"></baseResource>
                <p class="moretype" @click="moreProduct" v-show="loadingModalShow2">查看更多资源</p>
              </div>
            </div>
          </div>
          <div class="content-wrapper" v-if="orgInfo.descp">
            <div class="inner-wrapper">
              <div class="content-title">
                <span>机构简介</span>
              </div>
              <div class="content">{{orgInfo.descp}}</div>
            </div>
            <div class="inner-wrapper" v-if="orgInfo.subject && orgInfo.subject.length">
              <div class="content-title">
                <span>专注领域</span>
              </div>
              <div class="content">
                <el-row class="tag-item">
                  <el-tag v-for="sub in orgInfo.subject" :key="sub.index">{{sub}}</el-tag>
                </el-row>
              </div>
            </div>
          </div>
          <div class="content-wrapper" v-if="orgContents && orgContents.length">
            <div class="inner-wrapper">
              <div class="content-title">
                <span>相关文章</span>
              </div>
              <div class="content content-nf" v-if="orgContents.length">
                <baseContent v-for="item in orgContents" :key="item.index" :itemSingle="item" :noBlank="true"></baseContent>
              </div>
            </div>  
          </div>
          <div class="content-wrapper" v-if="likeOrgs && likeOrgs.length">
            <div class="inner-wrapper">
              <div class="content-title">
                <span>您可能感兴趣的机构</span>
              </div>
              <div class="content">
                <BaseOrg v-for="item in likeOrgs" :key="item.index" :itemSingle="item" :noBlank="true"></BaseOrg>>
              </div>
            </div>
          </div>
        </div>
      </div>
    </div>
    <div class="content-wrapper" v-if="orgContents && orgContents.length">
      <div class="content-title">
        <span>相关文章</span>
      </div>
      <div class="content content-nf" v-if="orgContents.length">
        <baseContent v-for="item in orgContents" :key="item.index" :itemSingle="item" :noBlank="true"></baseContent>
      </div>
    </div>
    <div class="content-wrapper" v-if="likeOrgs && likeOrgs.length">
      <div class="content-title">
        <span>您可能感兴趣的机构</span>
      </div>
      <div class="content">
        <BaseOrg v-for="item in likeOrgs" :key="item.index" :itemSingle="item" :noBlank="true"></BaseOrg>>
      </div>
    </div>
  </div>
</template>

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

@@ -61,7 +61,7 @@
              <div class="content-title">
                <span>热门资源</span>
              </div>
              <div class="content">
              <div class="content content-nf">
                  <baseResource v-for="item in hotResources" :key="item.index" :itemSingle="item" :noBlank="true"></baseResource>
              </div>
            </div>

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

@@ -289,6 +289,7 @@ export default {
      }, (res) => {
        if (res.success && res.data) {
          if (res.data.pageNo !== that.pageNo) {
            that.scrollData.loading = false
            return;
          }
          var $info = res.data.data;
@@ -431,6 +432,7 @@ export default {
      }, (res) => {
        if (res.success) {
          if (res.data.pageNo !== that.pageNo) {
            that.scrollData.loading = false
            return;
          }
          var $info = res.data.data;