Commit e00bb42f authored by jsz315's avatar jsz315

去掉转发名片开关,内容页布局修改

parent d74d30eb
This diff is collapsed.
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"server": "cross-env NODE_ENV=production node ./bin/www", "server": "cross-env NODE_ENV=production node ./bin/www",
"lint": "eslint --ext .js src/pages", "lint": "eslint --ext .js src/pages",
"fix": "eslint --fix .js src/pages", "fix": "eslint --fix .js src/pages",
"build-dev": "cross-env NODE_ENV=development node bin/build.js", "build-dev333333": "cross-env NODE_ENV=development node bin/build.js",
"build-prod": "cross-env NODE_ENV=production node bin/build.js", "build-prod": "cross-env NODE_ENV=production node bin/build.js",
"pack": "cross-env NODE_ENV=production node bin/pack.js", "pack": "cross-env NODE_ENV=production node bin/pack.js",
"upload": "cross-env NODE_ENV=development node bin/upload.js", "upload": "cross-env NODE_ENV=development node bin/upload.js",
......
...@@ -30,16 +30,21 @@ ...@@ -30,16 +30,21 @@
} }
.home.nocolor{ .home.nocolor{
// box-shadow: none; // box-shadow: none;
margin-top: 96px; margin-top: 144px;
} }
.go-more{ .go-more{
position: absolute; position: absolute;
width: 99px; width: 237px;
height: 100px; height: 135px;
background: url("http://yun.dui88.com/h5/miniprogram/kejiji/group-go.png") no-repeat center; background: url("//yun.dui88.com/h5/miniprogram/kejiji/web/group-send.png") no-repeat center;
background-size: contain; background-size: contain;
right: 12px; right: 12px;
bottom: 12px; bottom: 6px;
color: #fff;
font-size: 30px;
text-align: center;
line-height: 124px;
font-weight: 600;
} }
.title{ .title{
font-size: 36px; font-size: 36px;
...@@ -60,7 +65,7 @@ ...@@ -60,7 +65,7 @@
} }
.no-bottom{ .no-bottom{
margin-bottom: 0; margin-bottom: 0;
margin-top: 40px; margin-top: 20px;
} }
.f-shadow{ .f-shadow{
position: relative; position: relative;
...@@ -103,7 +108,7 @@ ...@@ -103,7 +108,7 @@
} }
.home{ .home{
border-radius: 20px; border-radius: 20px;
width: 670px; width: 690px;
margin: 30px auto 40px; margin: 30px auto 40px;
padding-top: 16px; padding-top: 16px;
position: relative; position: relative;
...@@ -140,13 +145,13 @@ ...@@ -140,13 +145,13 @@
} }
.bar{ .bar{
border-radius: 20px; border-radius: 20px;
width: 626px; width: 690px;
margin: 10px auto; margin: 10px auto;
height: 150px; height: 150px;
position: relative; position: relative;
.pic{ .pic{
width: 630px; width: 690px;
height: 236px; height: 296px;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
...@@ -155,27 +160,48 @@ ...@@ -155,27 +160,48 @@
background-position: center; background-position: center;
background-size: cover; background-size: cover;
border-radius: 12px; border-radius: 12px;
overflow: hidden;
.pic-title{
width: 100%;
height: 159px;
position: absolute;
left: 0;
bottom: -1px;
background-image: linear-gradient(-180deg, rgba(0,0,0,0.00) 0%, rgba(0,0,0,0.5) 60%);
}
.title-word{
color: #fff;
position: absolute;
left: 30px;
width: 630px;
bottom: 15px;
line-height: 44px;
font-size: 32px;
font-weight: 600;
}
} }
} }
.tip1{ .tip1{
font-size: 32px;
color: #333333;
padding: 8px 24px 8px 72px; padding: 8px 24px 8px 72px;
margin-top: 40px;
margin-bottom: 20px;
font-size: 28px;
color: #333333;
font-weight: 600;
// overflow:hidden; // overflow:hidden;
// text-overflow:ellipsis; // text-overflow:ellipsis;
// display:-webkit-box; // display:-webkit-box;
// -webkit-line-clamp:2; // -webkit-line-clamp:2;
// -webkit-box-orient:vertical; // -webkit-box-orient:vertical;
font-weight: 600;
position: relative; position: relative;
&::after{ &::after{
width: 22px; width: 22px;
height: 32px; height: 32px;
background: url("//yun.dui88.com/h5-mami/webgame/kejiji/webview/img/fire.png") no-repeat center; background: url("//yun.dui88.com/h5/miniprogram/kejiji/web/fires.png") no-repeat center;
background-size: contain; background-size: contain;
position: absolute; position: absolute;
left: 32px; left: 32px;
top: 14px; top: 10px;
display: block; display: block;
content: ""; content: "";
} }
...@@ -223,9 +249,29 @@ ...@@ -223,9 +249,29 @@
} }
.article-container{ .article-container{
padding: 0 40px; padding: 0 40px;
.see-more-btn{
display: block;
height: 90px;
line-height: 90px;
text-align: center;
font-size: 28px;
color: #999999;
margin-bottom: 60px;
border-bottom: 1px solid #EDEDED;
display: flex;
justify-content: center;
align-items: center;
.more-ico{
width: 20px;
height: 20px;
background: url("//yun.dui88.com/h5/miniprogram/kejiji/web/icon_more.png") no-repeat center;
background-size: contain;
margin-left: 10px;
}
}
.content__wrap{ .content__wrap{
padding: 40px 0; padding: 40px 0;
border-top: 1px solid #EDEDED; border-bottom: 1px solid #EDEDED;
.content-info{ .content-info{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -246,7 +292,7 @@ ...@@ -246,7 +292,7 @@
} }
.share-info{ .share-info{
margin-top: 22px; margin-top: 22px;
font-size: 24px; font-size: 26px;
color: #999999; color: #999999;
align-items: flex-end align-items: flex-end
} }
...@@ -271,14 +317,13 @@ ...@@ -271,14 +317,13 @@
} }
.dui-tag{ .dui-tag{
color: #999999; color: #999999;
font-size: 24px; font-size: 26px;
display: inline-block; display: inline-block;
} }
.dui-tag--solid{ .dui-tag--solid{
letter-spacing: 0.12px; letter-spacing: 0.12px;
} }
.header{ .header{
margin-bottom: 24px;
align-items: flex-end; align-items: flex-end;
h3{ h3{
font-size: 40px; font-size: 40px;
...@@ -298,6 +343,9 @@ ...@@ -298,6 +343,9 @@
} }
.activity{ .activity{
// margin-bottom: 50px; // margin-bottom: 50px;
.title{
margin-bottom: 30px;
}
.activity__img{ .activity__img{
width: 170px; width: 170px;
height: 210px; height: 210px;
...@@ -532,4 +580,29 @@ ...@@ -532,4 +580,29 @@
} }
} }
} }
}
.date-time{
position: absolute;
left: 0;
top: 0;
background: url("//yun.dui88.com/h5/miniprogram/kejiji/web/tag-title.png") no-repeat center;
background-size: 100% 100%;
width: 222px;
height: 60px;
color: #fff;
padding-right: 20px;
font-size: 36px;
line-height: 60px;
text-align: center;
font-weight: 600;
.date{
display: flex;
justify-content: center;
align-items: center;
}
.week{
font-size: 28px;
margin-left: 8px;
}
} }
\ No newline at end of file
...@@ -7,12 +7,22 @@ ...@@ -7,12 +7,22 @@
<a class="home nocolor" @click="openShowToday"> <a class="home nocolor" @click="openShowToday">
<div class="f-shadow"> <div class="f-shadow">
<div class="bar"> <div class="bar">
<div class="pic" :style="{'background-image': 'url(' + src + ')'}" ></div> <div class="pic" :style="{'background-image': 'url(' + src + ')'}" >
<div class="pic-title">
<div class="title-word">{{getText(title, 80)}}</div>
</div>
<div class="date-time">
<div class="date">
{{today.month>9?today.month:'0'+today.month}}/{{today.date>9?today.date:'0'+today.date}}
<span class="week">{{today.week}}</span>
</div>
</div>
</div>
</div> </div>
<div class="tip1">{{getText(title, 68)}}</div> <div class="tip1">{{"每天分享早报,持续收获关注"}}</div>
<div class="tip2"><div class="nums">1</div>{{subTitle1}}</div> <!-- <div class="tip2"><div class="nums">1</div>{{subTitle1}}</div>
<div class="tip2"><div class="nums">2</div>{{subTitle2}}</div> <div class="tip2"><div class="nums">2</div>{{subTitle2}}</div> -->
<div class="go-more"></div> <div class="go-more">马上转发</div>
</div> </div>
<div class="guider-bg" v-if="hiding"> <div class="guider-bg" v-if="hiding">
<div class="guider-btn"></div> <div class="guider-btn"></div>
...@@ -25,7 +35,7 @@ ...@@ -25,7 +35,7 @@
<!-- <h3>热门文章</h3> --> <!-- <h3>热门文章</h3> -->
<div class="title no-bottom"> <div class="title no-bottom">
获客爆文 获客爆文
<a @click="openArticlList" class="see-more__link" hover-class="none"><span class="more">查看更多</span></a> <!-- <a @click="openArticlList" class="see-more__link" hover-class="none"><span class="more">查看更多</span></a> -->
</div> </div>
</div> </div>
...@@ -43,6 +53,7 @@ ...@@ -43,6 +53,7 @@
</div> </div>
</div> </div>
</div> </div>
<a @click="openArticlList" class="see-more-btn">查看更多爆文<div class="more-ico"></div></a>
</section> </section>
<section class="activity"> <section class="activity">
...@@ -61,7 +72,7 @@ ...@@ -61,7 +72,7 @@
</div> </div>
</section> </section>
<div class="intercept__modal" v-if="showInterceptModal"> <div class="intercept__modal" v-if="showInterceptModal">
<div class="modal_main"> <div class="modal_main">
<div class="J_close close" @click="closeModal"></div> <div class="J_close close" @click="closeModal"></div>
...@@ -95,6 +106,9 @@ const API = { ...@@ -95,6 +106,9 @@ const API = {
userInfo: '/kjy/mp/user/info' userInfo: '/kjy/mp/user/info'
} }
const tdate = new Date();
function getParam(){ function getParam(){
var param = getUrlParameter("param"); var param = getUrlParameter("param");
try{ try{
...@@ -126,8 +140,12 @@ export default { ...@@ -126,8 +140,12 @@ export default {
weixinQrcode: '', weixinQrcode: '',
showInterceptModal: false, showInterceptModal: false,
sellerId: "", sellerId: "",
loading: false loading: false,
today: {
date: tdate.getDate(),
month: tdate.getMonth() + 1,
week: "星期" +"日一二三四五六".split("")[tdate.getDay()]
}
}; };
}, },
props: { props: {
......
...@@ -302,9 +302,9 @@ ...@@ -302,9 +302,9 @@
} }
} }
.tip1{ .tip1{
font-size: 28px; font-size: 32px;
color: #55565C; color: #55565C;
line-height: 52px; line-height: 60px;
position: relative; position: relative;
} }
.commet{ .commet{
...@@ -359,11 +359,11 @@ ...@@ -359,11 +359,11 @@
position: absolute; position: absolute;
right: 4px; right: 4px;
bottom: 0px; bottom: 0px;
font-size: 24px; font-size: 28px;
color: #A0A0A0; color: #A0A0A0;
padding-right: 28px; padding-right: 28px;
height: 50px; height: 60px;
line-height: 50px; line-height: 60px;
padding-left: 80px; padding-left: 80px;
background: -webkit-gradient(linear, 0 0, 40% 0, from(rgba(255, 255, 255, 0)), to(rgb(255, 255, 255))); background: -webkit-gradient(linear, 0 0, 40% 0, from(rgba(255, 255, 255, 0)), to(rgb(255, 255, 255)));
z-index: 1; z-index: 1;
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
width: 24px; width: 24px;
height: 54px; height: 60px;
display: block; display: block;
content: ""; content: "";
background: url("//yun.dui88.com/h5-mami/webgame/kejiji/img/more.png") no-repeat center; background: url("//yun.dui88.com/h5-mami/webgame/kejiji/img/more.png") no-repeat center;
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
}, },
"exclude": [ "exclude": [
"./src/pages/game/core/ts/core.d.ts",
"./src/pages/game/farm/",
] ]
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment