h5 index、search、log

config/dev.env.js

@@ -6,5 +6,6 @@ module.exports = merge(prodEnv, {
  NODE_ENV: '"development"',
  ENV_CONFIG:'"dev"',
  BASE_API: '""',
  KX_API: '"http://192.168.3.233:81"'
  KX_API: '"http://192.168.3.233:81"',
  HT_API: '"http://192.168.3.233:83"',
})

config/prod.env.js

@@ -3,6 +3,8 @@ module.exports = {
  NODE_ENV: '"production"',
  ENV_CONFIG:'"prod"',
  BASE_API: '""',
  // KX_API: '"http://www.ekexiu.com"'
  KX_API: '"http://192.168.3.233:81"'
  // KX_API: '"http://www.ekexiu.com"',
  // HT_API: '"http://www.xttjpt.cn:88"'
  KX_API: '"http://192.168.3.233:81"',
  HT_API: '"http://192.168.3.233:83"',
}

src/components/subTemplate/BaseCompany.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'company.html?id='+companyInfo.id" target="_blank">
  <a class="list-item" :href="'company.html?id='+companyInfo.id" :target="noBlank ? '' : '_blank'">
    <div class="list-head">
      <div class="item-pic-org">
        <img :src="companyInfo.logo">
@@ -18,6 +18,10 @@
    props: {
      itemSingle: {
        type: Object
      },
      noBlank: {
        type: Boolean,
        default: false
      }
    },
    data() {

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="_blank">
  <a class="list-item" :class="isShowImg(itemSingle.catalog)" :href="'content.html?id='+itemSingle.id" :target="noBlank ? '' : '_blank'">
    <div class="list-head" :style="{backgroundImage: 'url(' + imgUrl + ')'}"></div>
    <div class="list-info">
      <div class="list-tit">{{itemSingle.title}}</div>
@@ -16,6 +16,10 @@
    props: {
      itemSingle: {
        type: Object
      },
      noBlank: {
        type: Boolean,
        default: false
      }
    },
    data() {

src/components/subTemplate/BaseExpert.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'expert.html?id='+itemSingle.id" target="_blank">
  <a class="list-item" :href="'expert.html?id='+itemSingle.id" :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>
@@ -15,6 +15,10 @@
    props: {
      itemSingle: {
        type: Object
      },
      noBlank: {
        type: Boolean,
        default: false
      }
    },
    data() {

src/components/subTemplate/BaseOrg.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'org.html?id='+orgInfo.id" target="_blank">
  <a class="list-item" :href="'org.html?id='+orgInfo.id" :target="noBlank ? '' : '_blank'">
    <div class="list-head">
      <div class="item-pic-org">
        <img :src="orgInfo.logo">
@@ -18,6 +18,10 @@
    props: {
      itemSingle: {
        type: Object
      },
      noBlank: {
        type: Boolean,
        default: false
      }
    },
    data() {

src/components/subTemplate/BaseProduct.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'product.html?id='+itemSingle.id" target="_blank">
  <a class="list-item" :href="'product.html?id='+itemSingle.id" :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>
@@ -19,6 +19,10 @@
      },
      showTime: {
        type: Boolean
      },
      noBlank: {
        type: Boolean,
        default: false
      }
    },
    data() {

src/components/subTemplate/BaseResource.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'resource.html?id='+resourceInfo.id" target="_blank">
  <a class="list-item" :href="'resource.html?id='+resourceInfo.id" :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>
@@ -17,6 +17,10 @@
    props: {
      itemSingle: {
        type: Object
      },
      noBlank: {
        type: Boolean,
        default: false
      }
    },
    data() {

src/components/subTemplate/BaseResult.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'result.html?id='+itemSingle.id" target="_blank">
  <a class="list-item" :href="'result.html?id='+itemSingle.id" :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>
@@ -16,6 +16,10 @@
    props: {
      itemSingle: {
        type: Object
      },
      noBlank: {
        type: Boolean,
        default: false
      }
    },
    data() {

src/components/subTemplate/BaseService.vue

@@ -1,5 +1,5 @@
<template>
  <a class="list-item" :href="'serve.html?id='+serveInfo.id" target="_blank">
  <a class="list-item" :href="'serve.html?id='+serveInfo.id" :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>
@@ -17,6 +17,10 @@
    props: {
      itemSingle: {
        type: Object
      },
      noBlank: {
        type: Boolean,
        default: false
      }
    },
    data() {

src/libs/common.js

@@ -17,3 +17,22 @@ Vue.use(Loading);
Vue.use(BackTop);
// Vue.component('BackTop', BackTop);
Vue.use(defaultPage);
function hashChange () {
  location.reload();
}
//url变化监听器
if( ('onhashchange' in window) && ((typeof document.documentMode==='undefined') || document.documentMode==8)) {
// 浏览器支持onhashchange事件
    window.onhashchange = hashChange;  // TODO，对应新的hash执行的操作函数
} else {
  // 不支持则用定时器检测的办法
  setInterval(function() {
    // 检测hash值或其中某一段是否更改的函数， 在低版本的iE浏览器中通过window.location.hash取出的指和其它的浏览器不同，要注意
    var ischanged = isHashChanged();
    if (ischanged) {
        hashChange();  // TODO，对应新的hash执行的操作函数
    }
  }, 150);
}

src/pages/center/views/common/Sidebar/SidebarItem.vue

@@ -1,77 +0,0 @@
<template>
  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
      <router-link v-if="hasOneShowingChild(item.children) && !onlyOneChild.children&&!item.alwaysShow" :to="resolvePath(onlyOneChild.path)">
        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
          <svg-icon v-if="onlyOneChild.meta&&onlyOneChild.meta.icon" :icon-class="onlyOneChild.meta.icon"></svg-icon>
          <span v-if="onlyOneChild.meta&&onlyOneChild.meta.title" slot="title">{{onlyOneChild.meta.title}}</span>
        </el-menu-item>
      </router-link>
      <el-submenu v-else :index="item.name||item.path">
        <template slot="title">
          <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
          <span v-if="item.meta&&item.meta.title" slot="title">{{item.meta.title}}</span>
        </template>
        <template v-for="child in item.children" v-if="!child.hidden">
          <sidebar-item :is-nest="true" class="nest-menu" v-if="child.children&&child.children.length>0" :item="child" :key="child.path" :base-path="resolvePath(child.path)"></sidebar-item>
          <router-link v-else :to="resolvePath(child.path)" :key="child.name" replace>
            <el-menu-item :index="resolvePath(child.path)">
              <svg-icon v-if="child.meta&&child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
              <span v-if="child.meta&&child.meta.title" slot="title">{{child.meta.title}}</span>
            </el-menu-item>
          </router-link>
        </template>
      </el-submenu>
  </div>
</template>
<script>
import path from 'path'
export default {
  name: 'SidebarItem',
  props: {
    // route配置json
    item: {
      type: Object,
      required: true
    },
    isNest: {
      type: Boolean,
      default: false
    },
    basePath: {
      type: String,
      default: ''
    }
  },
  data() {
    return {
      onlyOneChild: null
    }
  },
  methods: {
    hasOneShowingChild(children) {
      const showingChildren = children.filter(item => {
        if (item.hidden) {
          return false
        } else {
          // temp set(will be used if only has one showing child )
          this.onlyOneChild = item
          return true
        }
      })
      if (showingChildren.length === 1) {
        return true
      }
      return false
    },
    resolvePath(...paths) {
      return path.resolve(this.basePath, ...paths)
    }
  }
}
</script>

src/pages/center/views/common/Sidebar/index.vue

@@ -1,34 +0,0 @@
<template>
  <el-menu
    mode="vertical"
    :default-openeds="['personalCenter', 'myBusiness', 'modifyPassword']"
    :show-timeout="200"
    :default-active="$route.path">
    <sidebar-item v-for="route in routes" :key="route.name" :item="route" :base-path="route.path"></sidebar-item>
  </el-menu>
</template>
<script>
import SidebarItem from './SidebarItem'
export default {
  components: { SidebarItem },
  watch: {
    bindCompany(val) {
      this.bindCompany = val
    }
  },
  computed: {
    ...Vuex.mapGetters([
      'bindCompany'
    ]),
    routes() {
      var aRouter = this.$router.options.routes
      if (!this.bindCompany) {
        aRouter[0].children.splice(2, 1)
      }
      return aRouter
    }
  }
}
</script>

src/pages/center/views/common/index.vue

@@ -1,102 +0,0 @@
<template>
  <div class="main-content">
    <div class="boxLeft">
      <div class="headPhoto">
        <div class="userInfo">
          <div class="img-div" :style="{backgroundImage: 'url(' + headPhoto + ')'}"></div>
          <p>{{account}}</p>
        </div>
      </div>
      <sidebar></sidebar>
      <div class="exit-menu-item" @click="logout">退出登录</div>
    </div>
    <div class="boxRight">
      <transition name="fade" mode="out-in">
        <router-view></router-view>
      </transition>
    </div>
  </div>
</template>
<script>
  import Sidebar from './Sidebar';
  export default {
    computed: {
      ...Vuex.mapGetters([
        'bindCompany',
        'headPhoto',
        'account'
      ])
    },
    components: {
      Sidebar
    },
    methods: {
      logout() {
        this.$confirm('您确认要退出登录吗?', '提示', {
          type: 'warning',
          center: true
        }).then(() => {
          this.$store.dispatch('LogOut').then(() => {
            location.href = '/#/loginPlat'
          })
        }).catch(() => {})
      }
    }
  };
</script>
<style scoped>
.main-content{
  margin: 20px 0;
  min-height: 500px;
}
.main-content .boxRight {
  padding:10px 20px;
  float: left;
  width: 880px;
  margin-left: 20px;
  background: #ffffff;
  box-sizing: border-box;
}
.main-content .boxLeft {
    float: left;
    overflow: hidden;
    width: 200px;
}
.main-content .boxLeft .headPhoto {
  height: 146px;
  background: #ffffff;
  margin-bottom: 20px;
  display: flex;
  justify-content: center;
  align-items: center;
}
.main-content .boxLeft .headPhoto .userInfo {
  text-align: center;
  color: #606266;
}
.main-content .boxLeft .headPhoto .userInfo p {
  margin-top: 10px;
}
.main-content .boxLeft .headPhoto .userInfo .img-div {
  width: 80px;
  height: 80px;
  border-radius: 50%;
  margin: auto;
  background-size: cover;
}
.main-content .boxLeft .el-menu {
  border:none;
}
.main-content .boxLeft .exit-menu-item{
  padding-left: 20px;
  background: #ffffff;
  border-top: 10px solid #f4f6f8;
  box-sizing: content-box;
  height: 56px;
  line-height: 56px;
  font-size: 14px;
  cursor: pointer;
}
</style>

src/pages/center/views/layout/index.vue

@@ -15,7 +15,7 @@
<script>
  import { TheHeader, TheFooter } from '@/layout';
  import com from '../common/index';
  import com from './common/index';
  import Breadcrumb from '@/components/Breadcrumb';
  export default {

src/pages/center/views/myBusiness/companyInformation.vue

@@ -357,6 +357,7 @@
            }
            })
          } else {
            window.scroll(0, 0)
            return false
          }
        })

src/pages/center/views/myBusiness/publishProduct.vue

@@ -232,6 +232,7 @@
              })
            }
          } else {
            window.scroll(0, 0)
            return false
          }
        })

src/pages/center/views/myDemands/DemandIssue.vue

@@ -275,6 +275,7 @@
              })
            }
          } else {
            window.scroll(0, 0)
            return false
          }
        })

src/pages/content/show.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: '1'}"></pageView>
                  <span>作者/来源：{{contentInfo.source}}</span>
                  <shareOut :tUrl="elurl"></shareOut>
                </div>
@@ -68,6 +69,7 @@
  import baseOrg from '@/components/subTemplate/BaseOrg';
  import baseCompany from '@/components/subTemplate/BaseCompany';
  import shareOut from '@/components/ShareOut';
  import pageView from '@/components/pageView';
  export default {
    data() {
      return {
@@ -93,6 +95,7 @@
    },
    components: {
      shareOut,
      pageView,
      baseExpert,
      baseOrg,
      baseCompany

src/pages/h5/h5.js

@@ -7,8 +7,14 @@ new Vue({
  router: router,
  render: h => h(App),
  created () {
    router.beforeEach((to, from, next) => {
      document.title = PLAT.info.title
      if (to.meta.title) {
        document.title = to.meta.title + '-' + PLAT.info.title
      }
    })
    router.afterEach((to, from, next) => {
      window.scrollTo(0, 0);
    });
    })
  }
});

src/pages/h5/router/index.js

@@ -1,24 +1,55 @@
import Layout from '../views/layout';
const constantRouterMap = [
  {
    path: '/content',
    alwaysShow: true,
    component: (resolve) => require(['../views/content/content.vue'], resolve),
    name: 'content',
    meta: { title: '内容' }
    path: '/',
    redirect: '/index',
    component: Layout,
    children: [{
      component: (resolve) => require(['../views/index/index.vue'], resolve),
      path: '/index',
      name: 'index',
      meta: { title: '首页' }
    }]
  },
  {
    path: '/company',
    alwaysShow: true,
    component: (resolve) => require(['../views/company/company.vue'], resolve),
    name: 'company',
    meta: { title: '企业' }
    path: '',
    component: Layout,
    children: [{
      component: (resolve) => require(['../views/search/search.vue'], resolve),
      name: 'search',
      path: '/search',
      meta: { title: '搜索' }
    }]
  },
  {
    path: '/org',
    alwaysShow: true,
    component: (resolve) => require(['../views/org/org.vue'], resolve),
    name: 'org',
    meta: { title: '机构' }
    path: '',
    component: Layout,
    children: [{
      path: '/content',
      component: (resolve) => require(['../views/content/content.vue'], resolve),
      name: 'content',
      meta: { title: '内容' }
    }]
  },
  {
    path: '',
    component: Layout,
    children: [{
      path: '/company',
      component: (resolve) => require(['../views/company/company.vue'], resolve),
      name: 'company',
      meta: { title: '企业' }
    }]
  },
  {
    path: '',
    component: Layout,
    children: [{
      path: '/org',
      component: (resolve) => require(['../views/org/org.vue'], resolve),
      name: 'org',
      meta: { title: '机构' }
    }]
  }
];

src/pages/h5/style/index.scss

@@ -19,9 +19,17 @@
  }
  .list-info {
    .list-tit {
      display: block;
      white-space: nowrap !important;
      max-height: none;
      -webkit-line-clamp: unset;
      font-size: 16px;
    }
    .list-desc {
      display: block;
      white-space: nowrap !important;
      max-height: none;
      -webkit-line-clamp: unset;
      font-size: 14px;
    }
  }

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

@@ -26,8 +26,8 @@
              <span>我们的产品</span>
            </div>
            <div class="content content-nf" v-if="platProducts.length">
              <baseProduct v-for="item in platProducts" :key="item.index" :itemSingle="item"></baseProduct>
              <p class="moretype"@click="moreProduct" v-show="loadingModalShow">查看更多产品</span></p>
              <baseProduct v-for="item in platProducts" :key="item.index" :itemSingle="item" :noBlank="true"></baseProduct>
              <p class="moretype" @click="moreProduct" v-show="loadingModalShow">查看更多产品</p>
            </div>
          </div>
        </div>
@@ -54,7 +54,7 @@
            <span>相关文章</span>
          </div>
          <div class="content content-nf" v-if="compContents.length">
              <baseContent v-for="item in compContents" :key="item.index" :itemSingle="item"></baseContent>
              <baseContent v-for="item in compContents" :key="item.index" :itemSingle="item" :noBlank="true"></baseContent>
            </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>
@@ -29,7 +30,7 @@
              <span>相关专家</span>
            </div>
            <div class="content contentPro">
              <baseExpert v-for="item in platExperts" :key="item.index" :itemSingle="item"></baseExpert>
              <baseExpert v-for="item in platExperts" :key="item.index" :itemSingle="item" :noBlank="true"></baseExpert>
            </div>
          </div>
          <div class="inner-wrapper" v-if="platOrgs && platOrgs.length">
@@ -37,7 +38,7 @@
              <span>相关机构</span>
            </div>
            <div class="content">
              <baseOrg v-for="item in platOrgs" :key="item.index" :itemSingle="item"></baseOrg>
              <baseOrg v-for="item in platOrgs" :key="item.index" :itemSingle="item" :noBlank="true"></baseOrg>
            </div>
          </div>
          <div class="inner-wrapper" v-if="platCompanys && platCompanys.length">
@@ -45,7 +46,7 @@
              <span>相关企业</span>
            </div>
            <div class="content">
              <baseCompany v-for="item in platCompanys" :key="item.index" :itemSingle="item"></baseCompany>
              <baseCompany v-for="item in platCompanys" :key="item.index" :itemSingle="item" :noBlank="true"></baseCompany>
            </div>
          </div>
          <div class="block-wrapper" v-if="adinfo.shareAdCenter.length">
@@ -58,7 +59,7 @@
                <span>最新文章</span>
              </div>
              <div class="content content-nf">
                  <baseContent v-for="item in paltNews" :key="item.index" :itemSingle="item" :showOwner="false"></baseContent>
                  <baseContent v-for="item in paltNews" :key="item.index" :itemSingle="item" :showOwner="false" :noBlank="true"></baseContent>
              </div>
            </div>
            <div class="block-wrapper" v-if="adinfo.shareAdBottom.length">
@@ -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 {
@@ -100,6 +102,7 @@
      this.queryPaltNews();
    },
    components: {
      pageView,
      baseExpert,
      baseOrg,
      baseCompany,

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

@@ -24,8 +24,8 @@
          <span>可提供服务</span>
        </div>
        <div class="content content-nf" v-if="platServices.length">
          <baseService v-for="item in platServices" :key="item.index" :itemSingle="item"></baseService>
          <p class="moretype" @click="moreService" v-show="loadingModalShow">查看更多服务</span></p>
          <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">
@@ -33,8 +33,8 @@
          <span>可共享资源</span>
        </div>
        <div class="content content-nf" v-if="platResources.length">
          <baseResource v-for="item in platResources" :key="item.index" :itemSingle="item"></baseResource>
          <p class="moretype"@click="moreProduct" v-show="loadingModalShow2">查看更多资源</span></p>
          <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>
@@ -61,7 +61,7 @@
        <span>相关文章</span>
      </div>
      <div class="content content-nf" v-if="orgContents.length">
        <baseContent v-for="item in orgContents" :key="item.index" :itemSingle="item"></baseContent>
        <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">
@@ -69,7 +69,7 @@
        <span>您可能感兴趣的机构</span>
      </div>
      <div class="content">
        <a v-for="item in likeOrgs" :key="item.index" class="list-item" :href="'org.html?id='+item.id" target="_blank">
        <a v-for="item in likeOrgs" :key="item.index" class="list-item" :href="'org.html?id='+item.id">
          <div class="list-head" :style="{backgroundImage: 'url(' + item.logo + ')'}"></div>
          <div class="list-info">
            <div class="list-owner">{{item.name}}</div>
@@ -79,8 +79,6 @@
      </div>
    </div>
  </div>
  </div>
  </div>
</template>
<script>
  import { urlParse, ImageUrl, defaultSet, strToArr, TimeTr, commenTime } from '@/libs/util';

src/styles/listitem.scss

@@ -103,6 +103,7 @@
  .list-info{
    flex: 1 1 170px;
    padding-left:15px;
    width: 170px;
    .list-tit{
      color:$mainFont;
      font-size:18px;
@@ -123,7 +124,7 @@
    }
    .list-owner{
      color:$commonFont;
      line-height:30px;
      @include text-ellipsis();
    }
    .list-desc{
      @include text-ellipsis-n(2,20px);