Skip to content

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

zc

上级 4dde8ca3
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 194 行增加 和 185 行删除
src/App.vue
浏览文件 @ e24fa73f
......@@ -32,7 +32,7 @@ html,body,p{
text-align:center;
}
#app {
font-family: Avenir, Helvetica, Arial, sans-serif,Microsoft YaHei;
font-family: 'pingfang SC','helvetica neue',arial,'hiragino sans gb','microsoft yahei ui','microsoft yahei',simsun,sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
......
src/Epub/Ebook/components/catalogue.vue
浏览文件 @ e24fa73f
......@@ -106,7 +106,6 @@
text-align: center;
font-size:20px;
margin: 10px 0 40px;
font-family:MicrosoftYaHei-Bold;
font-weight:bold;
color: #46515A;
}
......@@ -118,7 +117,6 @@
.for-list{
font-size: 14px;
color: #46515A;
font-family: MicrosoftYaHei;
font-weight: 400;
padding: 0 49px;
.level-1,
......
src/Epub/Ebook/components/setting.vue
浏览文件 @ e24fa73f
......@@ -246,7 +246,6 @@
text-align: center;
font-size:20px;
margin-bottom: 80px;
font-family:MicrosoftYaHei-Bold;
font-weight:bold;
color: #46515A;
}
......@@ -254,7 +253,6 @@
.el-form-item--mini .el-form-item__label{
font-size: 14px;
color: #47525B;
font-family:MicrosoftYaHei-Bold;
font-weight:bold;
}
}
......
src/Epub/Ebook/index.scss
浏览文件 @ e24fa73f
......@@ -598,7 +598,6 @@
border-radius: 2px;
display: block;
font-size:12px;
font-family:MicrosoftYaHei;
font-weight:400;
margin-right: 15px;
}
......
src/assets/productsWorld/down-banner.png 0 → 100644
浏览文件 @ e24fa73f
差异被折叠。
src/components/comFooter.vue
浏览文件 @ e24fa73f
......@@ -234,7 +234,6 @@ export default {
}
.linkEn{
font-size: 16px;
font-family: SF Pro Display;
color: #757575;
padding-left: 12px;
padding-right: 3px;
......@@ -293,7 +292,6 @@ export default {
margin-bottom: 10px;
.title{
font-size: 20px;
font-family: PingFang SC;
font-weight: bold;
color: #FFFFFF;
}
......
src/components/comHeader.vue
浏览文件 @ e24fa73f
......@@ -168,7 +168,7 @@ export default {
{ title:'下载服务', idUrl:'/marketingService#marketing2' },
{ title:'联系信息', idUrl:'/marketingService#marketing3' },
{ title:'经销商服务', idUrl:'/marketingService#marketing4' },
{ title:'经销商登陆', idUrl:'/marketingService#marketing5' },
{ title:'经销商登陆', idUrl:'/marketingService#marketing5',openUrl:'http://nps.class.com.cn/dealer/' },
]
},
{ name:'专题系列', val:6, routerUrl:'/specialSeries', dropDownList:[]},
......@@ -272,11 +272,19 @@ export default {
toUrl(routerUrl,index){
this.currentNavItem = index
this.currentUrl = routerUrl
this.$router.push({ path: routerUrl })
if(routerUrl == '/addedServices'){
window.open('https://xfskt.class.com.cn/coursepackage/getFreeHomePackageListWeb','_blank')
}else{
this.$router.push({ path: routerUrl })
}
},
changePageScroll(index,item){
this.currentNavItem = index
this.$router.push({ path: item.idUrl })
if(item.openUrl){
window.open(item.openUrl,'_blank')
}else{
this.$router.push({ path: item.idUrl })
}
// this.$emit('changePageScrollCurrent', item.idUrl)
}
......
src/components/common/comFooter.vue
浏览文件 @ e24fa73f
......@@ -158,7 +158,6 @@ export default {
.friend_title {
font-size: 24px;
font-size: 24px;
font-family: PingFang SC;
font-weight: bold;
color: #A91923;
}
......@@ -166,7 +165,6 @@ export default {
font-size: 16px;
margin-right: 20px;
margin-left: 18px;
font-family: SF Pro Display;
color: #A4A4A5;
}
.friend_con {
......
src/components/common/comHeader.vue
浏览文件 @ e24fa73f
......@@ -287,7 +287,6 @@ export default {
cursor: pointer;
.tipTxt{
font-size: 14px;
font-family: PingFang SC;
font-weight: 500;
color: #FFFFFF;
line-height: 50px;
......@@ -316,7 +315,6 @@ export default {
.list{
display: inline-block;
font-size: 18px;
font-family: PingFang SC;
font-weight: bold;
color: #222222;
line-height: 30px;
......
src/components/common/map.vue
浏览文件 @ e24fa73f
......@@ -20,63 +20,71 @@ export default {
};
},
mounted() {
//初始化模板选择的下拉框
var sel = document.getElementById('stylelist');
for(var key in mapstyles){
var style = mapstyles[key];
var item = new Option(style.title,key);
sel.options.add(item);
}
var map = new BMap.Map("allmap");
window.map = map;
var point = new BMap.Point(116.43032,39.993478);
this.$nextTick(() => {
this.init()
})
},
methods: {
init(){
//初始化模板选择的下拉框
var sel = document.getElementById('stylelist');
if(this.mapstyles){
for(var key in this.mapstyles){
var style = this.mapstyles[key];
var item = new Option(style.title,key);
sel.options.add(item);
}
}
var map = new BMap.Map("allmap");
window.map = map;
var point = new BMap.Point(116.43032,39.993478);
map.addControl(new BMap.NavigationControl()); // 添加平移缩放控件
map.addControl(new BMap.ScaleControl()); // 添加比例尺控件
map.addControl(new BMap.OverviewMapControl()); //添加缩略地图控件
map.addControl(new BMap.MapTypeControl()); //添加地图类型控件
map.disable3DBuilding();
map.centerAndZoom(point, 18);
var marker = new BMap.Marker(point); // 创建标注
map.addOverlay(marker); // 将标注添加到地图中
marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
//代码使用如下,即可. 模板页可以查看http://lbsyun.baidu.com/custom/list.htm
//map.setMapStyle({style:'midnight'});
map.addControl(new BMap.NavigationControl()); // 添加平移缩放控件
map.addControl(new BMap.ScaleControl()); // 添加比例尺控件
map.addControl(new BMap.OverviewMapControl()); //添加缩略地图控件
map.addControl(new BMap.MapTypeControl()); //添加地图类型控件
map.disable3DBuilding();
map.centerAndZoom(point, 18);
var marker = new BMap.Marker(point); // 创建标注
map.addOverlay(marker); // 将标注添加到地图中
marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
//代码使用如下,即可. 模板页可以查看http://lbsyun.baidu.com/custom/list.htm
//map.setMapStyle({style:'midnight'});
var content = '<div style="margin:0;line-height:20px;padding:2px;">' +
'地址：北京市朝阳区惠新东街1号<br/>电话：（010）-64929196<br/>简介：中国人事出版社和中国劳动社会保障出版社。' +
'</div>';
var content = '<div style="margin:0;line-height:20px;padding:2px;">' +
'地址：北京市朝阳区惠新东街1号<br/>电话：（010）-64929196<br/>简介：中国人事出版社和中国劳动社会保障出版社。' +
'</div>';
//创建检索信息窗口对象
var searchInfoWindow = null;
searchInfoWindow = new BMapLib.SearchInfoWindow(map, content, {
title : "人社出版集团", //标题
width : 320, //宽度
height : 105, //高度
panel : "panel", //检索结果面板
enableAutoPan : true, //自动平移
searchTypes :[
BMAPLIB_TAB_SEARCH, //周边检索
BMAPLIB_TAB_TO_HERE, //到这里去
BMAPLIB_TAB_FROM_HERE //从这里出发
]
});
searchInfoWindow.open(marker);
document.getElementById("BMapLib_tab_fromhere0").style.width="96px";
marker.addEventListener("click", function(e){
//创建检索信息窗口对象
var searchInfoWindow = null;
searchInfoWindow = new BMapLib.SearchInfoWindow(map, content, {
title : "人社出版集团", //标题
width : 320, //宽度
height : 105, //高度
panel : "panel", //检索结果面板
enableAutoPan : true, //自动平移
searchTypes :[
BMAPLIB_TAB_SEARCH, //周边检索
BMAPLIB_TAB_TO_HERE, //到这里去
BMAPLIB_TAB_FROM_HERE //从这里出发
]
});
searchInfoWindow.open(marker);
document.getElementById("BMapLib_tab_fromhere0").style.width="96px";
})
// document.getElementById("BMapLib_tab_fromhere0").style.width="96px";
this.changeMapStyle('normal')
sel.value = 'normal';
},
methods: {
marker.addEventListener("click", function(e){
searchInfoWindow.open(marker);
// document.getElementById("BMapLib_tab_fromhere0").style.width="96px";
})
this.changeMapStyle('normal')
sel.value = 'normal';
},
changeMapStyle(style){
map.setMapStyle({style:style});
$('#desc').html(mapstyles[style].desc);
// $('#desc').html(this.mapstyles[style].desc);
}
},
};
......
src/components/common/mapHeader.vue
浏览文件 @ e24fa73f
......@@ -30,7 +30,6 @@ export default {
display: flex;
color: #999999;
font-size: 14px;
font-family: "Microsoft Yahei", "simsun", "arial", "tahoma";
font-weight: 400;
align-items: center;
height: 55px;
......
src/router/index.js
浏览文件 @ e24fa73f
......@@ -45,6 +45,12 @@ const routes = [
component: () => import("@/views/productsWorld/index"),
},
{
path: "/productsWorld/resourceDownload",
name: "resourceDownload",
meta: { title: "资源下载-中国劳动社会保障出版社有限公司", name: 'resourceDownload', fatherName: "productsWorld", shopBg: true, },
component: () => import("@/views/productsWorld/detail"),
},
{
path: "/marketingService",
name: "marketingService",
meta: { title: "营销服务-中国劳动社会保障出版社有限公司", name: "marketingService", shopBg: true, },
......
src/views/groupProfile/index.vue
浏览文件 @ e24fa73f
......@@ -809,7 +809,6 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......@@ -901,7 +900,6 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......@@ -1052,7 +1050,6 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......@@ -1127,7 +1124,6 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......@@ -1403,7 +1399,6 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......@@ -1575,7 +1570,6 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......
src/views/home/index.vue
浏览文件 @ e24fa73f
......@@ -75,9 +75,22 @@
</div>
</div>
<div class="bottomNewArrivalsDetail">
<div class="bookCarousel">
<div class="leftArrows"><i class="el-icon-arrow-left"></i></div>
<div class="rightArrows"><i class="el-icon-arrow-right"></i></div>
<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="item.picUrl" alt="">
<div class="shadeBookName">{{item.name}}</div>
</div>
</div>
<!-- Add Pagination -->
<div class="swiper-pagination"></div>
<!-- Add button -->
<div class="swiper-button-prev"><i class="el-icon-arrow-left"></i></div>
<div class="swiper-button-next"><i class="el-icon-arrow-right"></i></div>
</div>
<!-- <div class="bookCarousel">
<div class="leftArrows"></div>
<div class="rightArrows"></div>
<div :class="currentNewArrivalsIndex == index?'currentNewArrivalsCell':'newArrivalsCell'" v-for="(item,index) in newArrivalsList" :key="'na'+index" @mouseenter="currentNewArrivalsIndex = index" @click="toDetailBook(item)">
<img :src="item.picUrl" alt="">
<div class="shadeBookName" v-if="currentNewArrivalsIndex == index">{{item.name}}</div>
......@@ -87,7 +100,7 @@
<div class="bottomLine">
<span :class="currentNewArrivalsIndex == index?'currentBottomLine':'bottomLineCell'" v-for="(item,index) in newArrivalsList" :key="'nal'+index"></span>
</div>
</div>
</div> -->
</div>
</div>
</div>
......@@ -349,6 +362,17 @@ export default {
mounted() {
this.checkWeChatCode()
this.renewTimer()
var swiper = new Swiper('.swiper-container', {
pagination: '.swiper-pagination',
slidesPerView: 5,
paginationClickable: true,
spaceBetween: 24,
nextButton: '.swiper-button-next', //前进按钮
prevButton: '.swiper-button-prev', //后退按钮
loop: true, //循环
autoplay:2000,
autoplayDisableOnInteraction:false,
});
},
beforeDestroy(){
clearInterval(this.timer)
......@@ -557,7 +581,7 @@ export default {
}
.moreBtn{
font-size: 16px;
font-family: Arial;
color: #1C52B7;
cursor: pointer;
}
......@@ -620,6 +644,7 @@ export default {
width: 100%;
height: auto;
position: relative;
width
.bookProduceContent{
width: 100%;
height: 743px;
......@@ -645,7 +670,7 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......@@ -724,7 +749,6 @@ export default {
width: 100%;
height: auto;
font-size: 24px;
font-family: PingFang SC;
font-weight: bold;
color: #FFFFFF;
line-height: 40px;
......@@ -792,7 +816,7 @@ export default {
height: auto;
.newArrivalsContent{
width: 100%;
height: 607px;
height: 510px;
background-image: url('~@/assets/home/con-bg1.png');
background-position: 0 0;
background-repeat: repeat;
......@@ -812,7 +836,7 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......@@ -844,94 +868,75 @@ export default {
.bottomNewArrivalsDetail{
width: 1200px;
height: auto;
margin: 50px auto 0;
.bookCarousel{
margin: 0 auto;
/deep/.swiper-container{
width: 100%;
height: 343px;
position: relative;
height: 395px;
padding-top: 50px;
box-sizing: border-box;
}
/deep/.swiper-slide{
width: 214px;
height: 298px;
transition: all 0.5s;
cursor: pointer;
overflow: hidden;
display: flex;
align-items: center;
.leftArrows{
width: 50px;
height: 60px;
display: inline-block;
position: absolute;
left: 0;
top: 50%;
margin-top: -30px;
background: rgba(0,0,0,0.5);
text-align: center;
line-height: 60px;
font-size: 18px;
color: #fff;
z-index: 22;
}
.rightArrows{
width: 50px;
height: 60px;
display: inline-block;
position: absolute;
right: 0;
top: 50%;
margin-top: -30px;
background: rgba(0,0,0,0.5);
text-align: center;
line-height: 60px;
font-size: 18px;
color: #fff;
z-index: 22;
&:hover{
transform: scale(1.1);
transform-origin: center;
.shadeBookName{
display: inline-block;
}
}
.newArrivalsCell{
img{
width: 214px;
height: 298px;
margin-right: 24px;
transition: all 0.5s;
cursor: pointer;
img{
width: 214px;
height: 298px;
}
}
.currentNewArrivalsCell{
width: 248px;
height: 343px;
margin-right: 24px;
position: relative;
transition: all 0.5s;
cursor: pointer;
img{
width: 248px;
height: 343px;
.shadeBookName{
width: 97%;
height: 110px;
display: none;
position: absolute;
bottom: 0;
left: 0;
background: rgba(0,0,0,0.6);
padding: 25px 28px;
box-sizing: border-box;
text-align: center;
font-size: 14px;
color: #FFFFFF;
line-height: 22px;
animation: shadeOpen 0.5s linear;
}
@keyframes shadeOpen {
0%{
bottom: -110px;
height: 0;
}
.shadeBookName{
width: 248px;
height: 110px;
display: inline-block;
position: absolute;
100%{
bottom: 0;
left: 0;
background: rgba(0,0,0,0.6);
padding: 25px 28px;
box-sizing: border-box;
text-align: center;
font-size: 14px;
color: #FFFFFF;
line-height: 22px;
animation: shadeOpen 0.5s linear;
}
@keyframes shadeOpen {
0%{
bottom: -110px;
height: 0;
}
100%{
bottom: 0;
height: 110px;
}
height: 110px;
}
}
}
/deep/.swiper-button-prev{
width: 50px;
height: 60px;
background: rgba(0,0,0,0.5);
text-align: center;
line-height: 60px;
left:0;
color: #fff;
}
/deep/.swiper-button-next{
width: 50px;
height: 60px;
background: rgba(0,0,0,0.5);
text-align: center;
line-height: 60px;
right:0;
color: #fff;
}
.bottomLineContent{
width: 100%;
height: auto;
......@@ -989,7 +994,7 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(255, 255, 255, 0.05);
line-height: 36px;
......@@ -1189,7 +1194,7 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(34, 34, 34, 0.05);
line-height: 36px;
......@@ -1307,7 +1312,7 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......
src/views/mine/index.vue
浏览文件 @ e24fa73f
......@@ -471,7 +471,7 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......@@ -577,7 +577,7 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(255, 255, 255, 0.05);
line-height: 36px;
......@@ -687,7 +687,7 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......@@ -777,7 +777,7 @@ export default {
height: auto;
display: inline-block;
font-size: 38px;
font-family: Arial;
font-weight: bold;
color: rgba(102, 102, 102, 0.08);
line-height: 36px;
......
src/views/productsWorld/detail.vue 0 → 100644
浏览文件 @ e24fa73f
差异被折叠。
src/views/specialSeries/specialDetFirst.vue
浏览文件 @ e24fa73f
......@@ -282,13 +282,13 @@ export default {
}
.special_tab_name{
font-size: 16px;
font-family: PingFang SC;
font-weight: 500;
color: #222222;
}
.special_tab_name_hover{
font-size: 16px;
font-family: PingFang SC;
font-weight: bold;
color: #1764DF;
}
......@@ -338,20 +338,20 @@ export default {
align-items: center;
.ctl_name{
font-size: 28px;
font-family: PingFang SC;
font-weight: 800;
color: #A91923;
padding-right: 7px;
}
.ctl_name_en{
font-size: 18px;
font-family: Arial;
color: #D0D0D2;
}
.cell_top_right{
cursor: pointer;
font-size: 18px;
font-family: Arial;
color: #A91923;
}
}
......@@ -405,7 +405,7 @@ export default {
text-align: left;
.special_content_name{
font-size: 18px;
font-family: PingFang SC;
font-weight: bold;
color: #222222;
margin-top: 5px;
......@@ -415,7 +415,7 @@ export default {
}
.synopsis_content{
font-size: 14px;
font-family: PingFang SC;
color: #999999;
line-height: 24px;
margin: 18px 0 20px 0;
......@@ -429,7 +429,7 @@ export default {
}
.special_content_detail{
font-size: 14px;
font-family: PingFang SC;
font-weight: bold;
color: #1764DF;
line-height: 24px;
......@@ -476,7 +476,7 @@ export default {
width: 100%;
min-height: 50px;
font-size: 15px;
font-family: PingFang SC;
font-weight: 500;
color: #222222;
line-height: 24px;
......@@ -489,7 +489,7 @@ export default {
}
.detail_author{
font-size: 14px;
font-family: PingFang SC;
font-weight: 500;
color: #8D93A3;
line-height: 24px;
......@@ -541,7 +541,7 @@ export default {
.detail_name{
min-height: 50px;
font-size: 15px;
font-family: PingFang SC;
font-weight: 500;
color: #222222;
line-height: 24px;
......@@ -554,7 +554,7 @@ export default {
}
.detail_author{
font-size: 14px;
font-family: PingFang SC;
font-weight: 500;
color: #8D93A3;
line-height: 24px;
......@@ -616,7 +616,7 @@ export default {
height: auto;
.fr_name{
font-size: 18px;
font-family: PingFang SC;
font-weight: bold;
color: #222222;
line-height: 26px;
......@@ -626,7 +626,7 @@ export default {
}
.fr_author{
font-size: 14px;
font-family: PingFang SC;
color: #999999;
line-height: 22px;
margin-top: 8px;
......@@ -634,7 +634,7 @@ export default {
.fr_synopsis{
margin-top: 17px;
font-size: 14px;
font-family: PingFang SC;
color: #555555;
line-height: 24px;
white-space: wrap;
......
src/views/specialSeries/specialDetSecond.vue
浏览文件 @ e24fa73f
......@@ -234,13 +234,13 @@ export default {
}
.special_tab_name{
font-size: 16px;
font-family: PingFang SC;
font-weight: 500;
color: #222222;
}
.special_tab_name_hover{
font-size: 16px;
font-family: PingFang SC;
font-weight: bold;
color: #1764DF;
}
......@@ -286,7 +286,7 @@ export default {
}
.type_detail_name{
font-size: 18px;
font-family: PingFang SC;
font-weight: bold;
color: #222222;
line-height: 24px;
......@@ -305,7 +305,7 @@ export default {
width: 100%;
min-height: 50px;
font-size: 14px;
font-family: PingFang SC;
color: #888888;
line-height: 26px;
white-space: wrap;
......@@ -320,7 +320,7 @@ export default {
width: 100%;
text-align: right;
font-size: 14px;
font-family: PingFang SC;
color: #888888;
line-height: 28px;
margin-bottom: 12px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论