Skip to content

Commit

Permalink
xiugai
Browse files Browse the repository at this point in the history
  • Loading branch information
chuanghong committed Oct 27, 2016
1 parent b98e42a commit c9fd42a
Show file tree
Hide file tree
Showing 14 changed files with 640 additions and 208 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "Aresn",
"license": "MIT",
"dependencies": {
"vue": "^1.0.25",
"vue": "^1.0.26",
"vue-router": "^0.7.13"
},
"devDependencies": {
Expand All @@ -34,6 +34,7 @@
"style-loader": "^0.13.1",
"swiper": "^3.4.0",
"url-loader": "^0.5.7",
"vue": "^1.0.26",
"vue-hot-reload-api": "^1.2.0",
"vue-html-loader": "^1.2.0",
"vue-loader": "^7.2.0",
Expand Down
191 changes: 191 additions & 0 deletions src/components/accessPop.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
<style scoped>
.popup {
height: 100%;
width: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 99999;
}
.popup-swap {
height: 100%;
width: 100%;
background: rgba(0,0,0,0.8);
}
.box-swap {
height: 304px; /*** 5.66 + 0.3 *2 close-btn height ***/
width: 100%;
position: fixed;
top: 50%;
left: 0;
right: 0;
transform: translateY(-50%);
}
.popup-box {
width: 75% ;
height: 304px;
max-height: 100%;
border-radius: 5px;
position:relative;
top: 30%;
left: 50%;
background: #e5e5e5;
transform: translate(-50%,-30%);
transition: transform 0.8s ease;
-webkit-transition: all 0.4s ease;
}
.popup-box .pop_close_btn {
height: 30px;
width: 30px;
border: 1px solid rgba(0,0,0,.8);
border-radius: 16px; /*** height/2 + border ***/
position: absolute;
right: -15px;
top: -15px;
background: #333432;
}
.popup-box .pop_close_btn::before {
content: '';
position: absolute;
top: 15px;
left: 5px;
height: 1px;
width: 20px;
background: #ffffff;
transform: rotate(-45deg);
-webkit-transform: rotate(-45deg);
}
.popup-box .pop_close_btn::after {
content: '';
position: absolute;
top: 15px;
left: 5px;
height: 1px;
width: 20px;
background: #ffffff;
transform: rotate(45deg);
-webkit-transform: rotate(45deg);
}
.popup-box .pop_close_btn_link_home {
color: #fff;
display: block;
width: 100%;
}
.popup-box .rule-swap .warning {
height: 70px;
width: 70px;
border: 5px solid #ffaa00;
border-radius: 45px;
position: absolute;
top: 25px;
left: 50%;
-webkit-transform: translateX(-50%);
-moz-transform: translateX(-50%);
-ms-transform: translateX(-50%);
-o-transform: translateX(-50%);
transform: translateX(-50%);
}
.popup-box .rule-swap .warning::before {
content: '';
display: block;
height: 27px;
width: 5px;
border-radius: 2px;
position: absolute;
top: 12px;
left:32px;
background: #ffaa00;
}
.popup-box .rule-swap .warning::after {
content: '';
display: block;
height: 8px;
width: 5px;
border-radius: 2px;
position: absolute;
top: 50px;
left:32px;
background: #ffaa00;
}
.popup-box .rule-swap .tip {
text-align: center;
padding-top: 30px;
}
.popup-box .rule-swap .tip p {
font-size: 13px;
line-height: 25px;
}
.popup-box .rule-swap .invite-btn {
display: block;
height: 30px;
width: 80%;
border-radius: 15px;
text-align: center;
color: #fff;
background: #ff6600;
position: absolute;
bottom: 27px;
left:25px;
font-size: 16px;
letter-spacing: 1px;
line-height: 30px;
}
</style>
<template>
<!-- 弹窗 -->
<section id="popup" class="popup">
<!-- 遮罩 -->
<div class="popup-swap"></div>
<!-- 主体 -->
<div class="box-swap">
<div class="popup-box">
<div id="rule-swap" class="rule-swap">
<div class="tip">
<p class="c_gray">
提示
</p>
<slot></slot>
</div>
</div>
</div>
</div>
</section>
</template>
<script>
module.exports = {
data: function () {
return {}
},
ready: function () {
},
beforeDestroy: function () {
},
methods: {
}
}
</script>
21 changes: 11 additions & 10 deletions src/components/banner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@
</style>
<template>
<div class="d_header">
<img src="../images/index_01.png" />
<img src="../images/banner.jpg" />
<div class="header_title">
<p>
<span>{{countDay}}</span>天
</p>
<div>
<p>“在长沙”21天早起计划</p>
<p>“湖南头条”21天早起计划</p>
<span>{{addDay}}</span>开始
</div>
</div>
Expand All @@ -128,7 +128,8 @@
items:[],
clockInNumber:0,
addDay:'',
countDay:0
countDay:0,
uid:0
}
},
Expand All @@ -155,11 +156,11 @@
})
.then(function(resovle){
console.log(resovle)
self.$nextTick(function(){
self.items=resovle.data.logoData;
self.uid=resovle.data.uid;
self.clockInNumber=resovle.data.clockInNumber;
})
self.items=resovle.data.logoData;
self.uid=resovle.data.uid;
self.clockInNumber=resovle.data.clockInNumber;
})
Expand All @@ -178,10 +179,10 @@
})
.then(function(resovle){
console.log(resovle)
self.$nextTick(function(){
self.countDay=resovle.data.countDay;
self.addDay=resovle.data.addDay
})
})
Expand Down
3 changes: 2 additions & 1 deletion src/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Env from './env';

let config = {
env: Env,
link:'http://jiangming.kangzishangcheng.net/'
link:'http://daka.jifen.com/index.php'

};
export default config;
Binary file added src/images/banner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/index_01.png
Binary file not shown.
18 changes: 0 additions & 18 deletions src/libs/swiper.jquery.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/styles/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ body {
max-height: 470px;
font-size: inherit;
color: #636f74;
background: url("../images/index_01.png") center 0 / cover;
background: url("../images/banner.jpg") center 0 / cover;
position: relative;
}
.link_to_back {
Expand Down
35 changes: 18 additions & 17 deletions src/styles/reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ select, option{
bottom:0;
width:100%;
height:50px;

z-index:9999;
}

.fixBtn>button{
Expand All @@ -138,6 +138,21 @@ select, option{
font-size:18px;
}

.fixBtn>a{
display: inline-block;
width:100%;
height:100%;
line-height:50px;
text-align: center;
font-size:18px;
font-family: "Microsoft YaHei UI";
color: #ffffff;
}

.fixBtn>a>.iconfont{
font-size:18px;
}

.normalBtn{
width:100%;
height:50px;
Expand All @@ -156,8 +171,6 @@ select, option{
font-size:18px;
}



.start{
background:#55acee;
}
Expand Down Expand Up @@ -229,8 +242,6 @@ select, option{
opacity:0;
}



.e616:before{
content:'\e616';
}
Expand All @@ -243,16 +254,14 @@ select, option{
content:'\e618';
}


.popup-box .rule-swap .invite-btn {
display: block;
height: 30px;
width: 80%;
border-radius: 15px;
text-align: center;
position: absolute;
bottom: 22px;
left:50%;
margin-top:5px;
margin-left:50%;
-webkit-transform: translateX(-50%);
-moz-transform: translateX(-50%);
-ms-transform: translateX(-50%);
Expand All @@ -265,14 +274,12 @@ select, option{
-webkit-transition: background 0.5s ease;
}


.popup-box .rule-swap .tip p {
font-size: 14px;
line-height:25px;
padding:0 10px;
}


.popup-transition{
transition: all 0.5s ease;
-webkit-transition: all 0.5s ease;
Expand All @@ -282,9 +289,3 @@ select, option{

opacity: 0;
}






Loading

0 comments on commit c9fd42a

Please sign in to comment.