Skip to content

R
rs-pc
提交 f348bf13 authored 作者: 翟畅's avatar 翟畅
浏览文件
操作

zc修改bug

上级 c903ca09
隐藏空白字符变更
内嵌 并排
正在显示 包含 99 行增加 和 84 行删除
src/App.vue
浏览文件 @ f348bf13
......@@ -20,19 +20,19 @@ export default {
let id = window.location.hash.split('=')[1]
let toUrl = ''
switch (path){
case '/pressCenter/pressDetail': toUrl = '/pages/index/msgDetail'
case '#/pressCenter/pressDetail': toUrl = '/pages/index/msgDetail'
break;
case '/resource/paperBookDetail': toUrl = '/resource/paperBook/detail'
case '#/resource/paperBookDetail': toUrl = '/resource/paperBook/detail'
break;
case '/digital/bookDetail': toUrl = '/digital/ebook/detail'
case '#/digital/bookDetail': toUrl = '/digital/ebook/detail'
break;
case '/digital/videoDetail': toUrl = '/digital/video/detail'
case '#/digital/videoDetail': toUrl = '/digital/video/detail'
break;
case '/digital/audioDetail': toUrl = '/digital/audio/detail'
case '#/digital/audioDetail': toUrl = '/digital/audio/detail'
break;
case '/digital/annexDetail': toUrl = '/digital/annex/detail'
case '#/digital/annexDetail': toUrl = '/digital/annex/detail'
break;
case '/digital/pictureDetail': toUrl = '/digital/picture/detail'
case '#/digital/pictureDetail': toUrl = '/digital/picture/detail'
break;
default: toUrl=''
break;
......
src/components/comHeader.vue
浏览文件 @ f348bf13
......@@ -61,7 +61,7 @@
<el-select v-model="searchSelect" @change="changeSearchText" style="width:120px;">
<el-option v-for="(item,index) in selectList" :key="'selectList'+index" :label="item.name" :value="item.val"></el-option>
</el-select>
<el-input placeholder="请输入要查询的关键字或词语" v-model="searchKeyWord" class="input-with-select" @keydown="keyup_submit()"></el-input>
<el-input placeholder="请输入要查询的关键字或词语" v-model="searchKeyWord" class="input-with-select" @keyup.enter.native="keyup_submit"></el-input>
<div class="searchIcon" @click="searchLink()">
<img :src="searchIcon" alt="">
</div>
......@@ -229,6 +229,7 @@ export default {
},
changeSearchTab(item,index){
this.currentIndex = index
this.searchKeyWord = ''
if(this.currentIndex == 0){
this.selectList = this.selectProduceList
this.searchSelect = ''
......@@ -247,29 +248,18 @@ export default {
toSearchHot(item){
window.open(this.resourceLink + '/fg/book/book_list.html?categoryId=&userInput=' + item.hotSearchWord ,'_self')
},
keyup_submit(){
keyup_submit(e){
let evt = window.event || e;
if(evt.keyCode == 13){
this.searchClick()
this.searchLink()
}
},
searchLink(){
if(this.currentIndex == 0){ //产品
// if(!this.searchSelect || this.searchSelect == ''){
// window.open(this.resourceLink + '/fg/solr/index.html?word=' + this.searchKeyWord + '&category=1')
// }else{
// window.open(this.resourceLink + '/fg/book/book_list.html?'+ this.searchSelect + '=' + this.searchKeyWord)
// }
this.$linkToRsResource('/resource?name=' + this.searchKeyWord)
}else if(this.currentIndex == 1){ //资源
// if(!this.searchSelect || this.searchSelect == ''){
// window.open(this.resourceLink + '/fg/solr/index.html?word=' + this.searchKeyWord + '&category=3')
// }else{
// window.open(this.resourceLink + '/fg/book/book_list.html?'+ this.searchSelect + '=' + this.searchKeyWord +'&showView=2')
// }
this.$linkToRsResource('/digital?name=' + this.searchKeyWord)
}else if(this.currentIndex == 2){ //资讯
// window.open(this.resourceLink + '/fg/index/toSearchList.html?searchName=newsTitle&newsTitle='+ this.searchKeyWord +'&clickNum=0')
this.$router.push({name:"pressCenter",query:{name:this.searchKeyWord}})
this.dialogSearchVisible = false
}
......
src/utils/common.js
浏览文件 @ f348bf13
......@@ -2,7 +2,11 @@ import Vue from 'vue'
//图片地址
Vue.prototype.coverUrl = function(cover) {
return process.env.VUE_APP_URL + '/file/file/?fileName=' + cover
if(cover && cover.indexOf('http') == -1){
return process.env.VUE_APP_URL + '/file/file/?fileName=' + cover
}else{
return cover
}
}
//图片地址
Vue.prototype.fileUrl = function(cover) {
......
src/views/groupProfile/index.vue
浏览文件 @ f348bf13
......@@ -45,7 +45,9 @@
</thead>
<tbody class="leaderTbody">
<tr v-for="(item,index) in leaderList" :key="'li'+index">
<td class="nameContent">{{item.name}}</td>
<td class="nameContent">
<div class="nameLetter">{{item.name}}</div>
</td>
<td class="jobContent">{{item.title}}</td>
</tr>
</tbody>
......@@ -1088,9 +1090,15 @@ export default {
height: 50px;
background: #CFCFCF;
text-align: center;
line-height: 50px;
font-size: 18px;
color: #222222;
.nameLetter{
width: 70px;
height: 100%;
display: inline-block;
line-height: 50px;
text-align-last:justify;
}
}
.jobContent{
height: 50px;
......
src/views/home/index.vue
浏览文件 @ f348bf13
......@@ -83,7 +83,7 @@
<div class="swiper-container">
<div class="swiper-wrapper">
<div class="swiper-slide" v-for="(item,index) in newArrivalsList" :key="'na'+index" @click="toDetailBook(item)">
<img :src="coverUrl(item.cover)" alt="">
<img :src="item.cover?coverUrl(item.cover):''" alt="">
<div class="shadeBookName">{{item.name}}</div>
</div>
</div>
......@@ -161,7 +161,7 @@
<div class="resourcePlatformBottom">
<div class="rpbContent">
<div class="rpbCell" v-for="(item,index) in resourcePlatformList" :key="'rpb'+index" @click="toResourcePlat(item.url)">
<img :src="coverUrl(item.cover)" alt="" class="bgImg">
<img :src="item.cover?coverUrl(item.cover):''" alt="" class="bgImg">
<div class="shadeWeb">
<div class="imgStyle">
<img src="@/assets/home/ico-global.png" alt="" class="imgSize">
......
src/views/marketingService/index.vue
浏览文件 @ f348bf13
......@@ -78,7 +78,7 @@
<div class="swiper-wrapper">
<div class="swiper-slide" v-for="(item,index) in contactDetailList" :key="'cd'+index">
<div class="boxTop">
<img :src="coverUrl(item.cover)" alt="" class="topImg">
<img :src="item.cover?coverUrl(item.cover):''" alt="" class="topImg">
<div class="boxText">
<span>{{item.name}}</span>
</div>
......@@ -128,7 +128,7 @@
<span v-html="scope.row.name"></span>
</template>
</el-table-column>
<el-table-column label="联系方式">
<el-table-column label="电话">
<template slot-scope="scope">
<span v-html="scope.row.contactInformation"></span>
</template>
......@@ -186,13 +186,21 @@
<span>{{scope.row.information}}</span>
</template>
</el-table-column>
<el-table-column label="联系方式">
<el-table-column label="电话">
<template slot-scope="scope">
<span>{{scope.row.contactInformation}}</span>
</template>
</el-table-column>
<el-table-column prop="address" label="通讯地址"></el-table-column>
<el-table-column prop="zipCode" label="邮政编码"></el-table-column>
<el-table-column label="通讯地址">
<template slot-scope="scope">
<span>{{scope.row.address}}</span>
</template>
</el-table-column>
<el-table-column label="邮政编码">
<template slot-scope="scope">
<span>{{scope.row.zipCode}}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
......@@ -574,11 +582,12 @@ export default {
z-index: 1;
.digitalProductsContent{
width: 100%;
height: 718px;
height: auto;
background-image: url('~@/assets/marketingService/con-bg2.png');
background-size: 100% 100%;
background-position: 0 0;
background-repeat: no-repeat;
padding-bottom: 60px;
.bookProduceTop{
width: 100%;
height: auto;
......@@ -870,12 +879,13 @@ export default {
.franchiserBox{
width: 100%;
height: 1200px;
height: auto;
background-image: url('~@/assets/home/con-bg2.png');
background-position: 0 0;
background-repeat: no-repeat;
background-size: 100% 100%;
position: relative;
padding-bottom:160px;
.bgImg{
width: 100%;
height: 147px;
......
src/views/mine/index.vue
浏览文件 @ f348bf13
......@@ -122,7 +122,7 @@
</span>
<span class="oneChild">
<span class="title">中文简称：</span>
<span>人事出版社</span>
<span>人事出版集团</span>
</span>
</div>
<div class="one">
......
src/views/pressCenter/detail.vue
浏览文件 @ f348bf13
......@@ -231,7 +231,7 @@ export default {
padding-top: 48px;
box-sizing: border-box;
.title{
width: 560px;
width: 800px;
height: auto;
margin: 0 auto 20px;
font-size: 25px;
......@@ -283,6 +283,10 @@ export default {
color: #333333;
line-height: 32px;
cursor: pointer;
&:nth-of-type(1){
font-size: 18px;
font-weight: bold;
}
}
}
}
......
src/views/pressCenter/index.vue
浏览文件 @ f348bf13
......@@ -27,7 +27,7 @@
<div class="bottomPressCell" v-for="(item,index) in pressDetailList" :key="'pd'+index" @mouseenter="currentBottomCell = index" @mouseleave="currentBottomCell = null" @click="toDetailPress(item)">
<div class="cellLeft">
<img :src="currentBottomCell == index?require('@/assets/pressCenter/li-h.png'):require('@/assets/pressCenter/li.png')" alt="">
<span :title="item.name">{{item.name}}</span>
<span :title="item.name" v-html="item.name"></span>
</div>
<div class="cellRight">
<span>{{item.releaserTime?item.releaserTime.substring(0,10):''}}</span>
......@@ -162,6 +162,12 @@ export default {
if(res.data.code == 0){
this.pressDetailList = res.data.data.list ? res.data.data.list : []
this.totalPage = res.data.data.pages ? res.data.data.pages : 0
let str = this.listQuery.name
this.pressDetailList.forEach(item => {
if(str){
item.name = item.name.replace(new RegExp(str,'g'),"<span style='color:#1764DF;font-weight:bold;'>"+str+"</span>")
}
})
}
})
},
......
src/views/productsWorld/detail.vue
浏览文件 @ f348bf13
......@@ -52,6 +52,7 @@
<div class="synopses">{{item.synopsis?$getSimpleText(item.synopsis):'暂无'}}</div>
</div>
</div>
<div class="bottomPressCell" style="height:280px;" v-if="downResourceList && downResourceList.length%2 != 0">&nbsp;</div>
</div>
<!-- 空列表 -->
<div class="null_box" v-if="!downResourceList || downResourceList.length == 0">
......@@ -80,7 +81,7 @@ import sidebar from "@/components/index/sidebar.vue"
import isnull from "@/components/common/isNull.vue";
import pagebox from "@/components/common/pageComponents.vue";
import { clearInterval, setInterval } from 'timers';
// import { clearInterval, setInterval } from 'timers';
export default {
name: "index",
components: {
......@@ -352,12 +353,12 @@ export default {
display: flex;
justify-content: flex-start;
align-items: flex-start;
&:nth-last-of-type(1){
border-bottom: 0;
}
&:nth-last-of-type(2){
border-bottom: 0;
}
// &:nth-last-of-type(1){
// border-bottom: 0;
// }
// &:nth-last-of-type(2){
// border-bottom: 0;
// }
.cellLeft{
width: 100px;
height: auto;
......
src/views/productsWorld/index.vue
浏览文件 @ f348bf13
......@@ -37,7 +37,7 @@
<div class="recommendBottom" v-if="currentTabIndex == 1">
<div class="recommendCell" v-for="(item,index) in recommendList1" :key="'book1'+index" @click="toDetailBook(item)">
<div class="cellContent">
<img :src="coverUrl(item.cover)" alt="">
<img :src="item.cover?coverUrl(item.cover):''" alt="">
<div class="bottomBox">
<span class="bookName">{{item.name}}</span>
<span class="bookAuthor" v-if="item.author">{{item.author}}</span>
......@@ -48,7 +48,7 @@
<div class="recommendBottom" v-if="currentTabIndex == 2">
<div class="recommendCell" v-for="(item,index) in recommendList2" :key="'book2'+index" @click="toDetailBook(item)">
<div class="cellContent">
<img :src="coverUrl(item.cover)" alt="">
<img :src="item.cover?coverUrl(item.cover):''" alt="">
<div class="bottomBox">
<span class="bookName">{{item.name}}</span>
<span class="bookAuthor" v-if="item.author">{{item.author}}</span>
......@@ -182,7 +182,7 @@
</div>
<div class="rpRight">
<div class="platformItem" v-for="(item,index) in platformList.slice(1,3)" :key="'pf'+index" @click="toResourcePlat(item.url)">
<img :src="coverUrl(item.cover)" alt="">
<img :src="item.cover?coverUrl(item.cover):''" alt="">
<div class="bottomLine">
<img src="@/assets/productsWorld/icon-eyes.png" alt="">
<span>{{item.synopsis}}</span>
......@@ -814,8 +814,11 @@ export default {
}
.bookName{
text-align: center;
white-space: pre-wrap;
white-space: nowrap;
line-height: 24px;
text-overflow: ellipsis;
overflow: hidden;
height: 24px;
}
}
}
......
src/views/specialSeries/specialDetFirst.vue
浏览文件 @ f348bf13
......@@ -12,7 +12,7 @@
<div class="enName">THEMATIC SERIES NAME</div>
</div>
<div class="specialInfo">
<div class="infoDetail">{{specialForm.synopsis}}</div>
<div class="infoDetail">{{specialForm.synopsis && specialForm.synopsis.length > 310?specialForm.synopsis.substring(0,310) + '...':specialForm.synopsis}}</div>
</div>
</div>
<div class="special_tab">
......@@ -38,7 +38,7 @@
<div class="special_type_num0" v-if="x.resourceType == '1' || x.resourceType == '2'" :id="'specialType'+y">
<div class="special_type_content0" v-for="(item,index) in special_type_body_list[y]" :key="'stc0'+index" @click="toSpecialDetail(item)">
<div class="special_content_img">
<img :src="coverUrl(item.cover)" @error="errImg('book')" alt="">
<img :src="item.cover?coverUrl(item.cover):''" @error="errImg('book')" alt="">
</div>
<div class="special_content_synopsis">
<div class="special_content_name">{{item.resourceName}}</div>
......@@ -53,7 +53,7 @@
<div class="special_type_num1" v-if="x.resourceType == '5'" :id="'specialType'+y">
<div class="special_type_content1" v-for="(item,index) in special_type_body_list[y]" :key="'stc1'+index" @click="toSpecialDetail(item)">
<div class="special_content1_img">
<img :src="coverUrl(item.cover)" @error="errImg('video')" alt="">
<img :src="item.cover?coverUrl(item.cover):''" @error="errImg('video')" alt="">
</div>
<div class="special_content1_detail">
<div class="detail_name">{{item.resourceName}}</div>
......@@ -67,7 +67,7 @@
<div class="special_type_num2" v-if="x.resourceType == '6'" :id="'specialType'+y">
<div class="special_type_content2" v-for="(item,index) in special_type_body_list[y]" :key="'stc2'+index" @click="toSpecialDetail(item)">
<div class="special_content2_img">
<img :src="coverUrl(item.cover)" @error="errImg('audio')" alt="">
<img :src="item.cover?coverUrl(item.cover):''" @error="errImg('audio')" alt="">
</div>
<div class="special_content2_detail">
<div class="detail_name">{{item.resourceName}}</div>
......@@ -82,7 +82,7 @@
<div class="special_type_content3" v-for="(item,index) in special_type_body_list[y]" :key="'stc3'+index" @click="toSpecialDetail(item)">
<div class="featured_cell_box">
<div class="fcb_left">
<img :src="coverUrl(item.cover)" @error="errImg('special')" alt="">
<img :src="item.cover?coverUrl(item.cover):''" @error="errImg('special')" alt="">
</div>
<div class="fcb_right">
<div class="fr_name">{{item.resourceName}}</div>
......@@ -142,19 +142,6 @@ export default {
},
methods: {
toSpecialDetail(item){
// if(item.resourceType == '16'){
// let route = this.$router.resolve({name:'digitalDetail',query:{id:item.resourceId}})
// window.open(route.href,'_self')
// }else if(item.resourceType == '6'){
// let route = this.$router.resolve({name:'audioDetail',query:{id:item.resourceId}})
// window.open(route.href,'_self')
// }else if(item.resourceType == '2'){
// let route = this.$router.resolve({name:'bookDetail',query:{id:item.resourceId}})
// window.open(route.href,'_self')
// }else if(item.resourceType == '5'){
// let route = this.$router.resolve({name:'videoDetail',query:{id:item.resourceId}})
// window.open(route.href,'_self')
// }
let id = item.resourceId || item.id;
switch (item.resourceType*1) {
case 1:
......@@ -221,27 +208,21 @@ export default {
if(num == 0){
this.special_type_body_list_all[0] = res.data.data.list
this.special_type_body_list[0] = res.data.data.list.slice(0,sliceNum)
console.log(this.special_type_body_list[0],'00000000')
}else if(num == 1){
this.special_type_body_list_all[1] = res.data.data.list
this.special_type_body_list[1] = res.data.data.list.slice(0,sliceNum)
console.log(this.special_type_body_list[1],'11111111')
}else if(num == 2){
this.special_type_body_list_all[2] = res.data.data.list
this.special_type_body_list[2] = res.data.data.list.slice(0,sliceNum)
console.log(this.special_type_body_list[2],'2222222')
}else if(num == 3){
this.special_type_body_list_all[3] = res.data.data.list
this.special_type_body_list[3] = res.data.data.list.slice(0,sliceNum)
console.log(this.special_type_body_list[3],'3333333')
}else if(num == 4){
this.special_type_body_list_all[4] = res.data.data.list
this.special_type_body_list[4] = res.data.data.list.slice(0,sliceNum)
console.log(this.special_type_body_list[4],'4444444')
}else if(num == 5){
this.special_type_body_list_all[5] = res.data.data.list
this.special_type_body_list[5] = res.data.data.list.slice(0,sliceNum)
console.log(this.special_type_body_list[5],'5555555')
}
this.$forceUpdate()
}
......
src/views/specialSeries/specialDetSecond.vue
浏览文件 @ f348bf13
......@@ -10,7 +10,7 @@
<div class="specialNameBox">
<div class="name">{{specialForm.name}}</div>
<div class="enName">THEMATIC SERIES NAME</div>
<div class="synopsis">{{specialForm.synopsis}}</div>
<div class="synopsis">{{specialForm.synopsis && specialForm.synopsis.length > 310?specialForm.synopsis.substring(0,310) + '...':specialForm.synopsis}}</div>
</div>
</div>
<div class="special_tab">
......@@ -116,18 +116,26 @@ export default {
this.specialResource(num)
},
toSpecialDet(item){
if(item.resourceType == '16'){
let route = this.$router.resolve({name:'digitalDetail',query:{id:item.resourceId}})
window.open(route.href,'_self')
}else if(item.resourceType == '6'){
let route = this.$router.resolve({name:'audioDetail',query:{id:item.resourceId}})
window.open(route.href,'_self')
}else if(item.resourceType == '2'){
let route = this.$router.resolve({name:'bookDetail',query:{id:item.resourceId}})
window.open(route.href,'_self')
}else if(item.resourceType == '5'){
let route = this.$router.resolve({name:'videoDetail',query:{id:item.resourceId}})
window.open(route.href,'_self')
let id = item.resourceId || item.id;
switch (item.resourceType*1) {
case 1:
this.$linkToRsResource('/resource/paperBookDetail?id=' + id)
break;
case 2:
this.$linkToRsResource('/digital/bookDetail?id=' + id)
break;
case 5:
this.$linkToRsResource('/digital/videoDetail?id=' + id)
break;
case 6:
this.$linkToRsResource('/digital/audioDetail?id=' + id)
break;
case 9:
this.$linkToRsResource('/digital/pictureDetail?id=' + id)
break;
case 12:
this.$linkToRsResource('/digital/annexDetail?id=' + id)
break;
}
},
getMemberInfo() {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论