Skip to content

W
www.fudou6.com
Commit 154aa487 authored by superman's avatar superman
Browse files
Options

Merge branch 'express' of gitlab.yanky.cn:liaili/www.fudou6.com into express 

# Conflicts:
#	npm-debug.log
parents 41190f81 9e8c0751
Show whitespace changes
Inline Side-by-side
Showing with 150 additions and 8 deletions
public/javascripts/product.js
View file @ 154aa487
......@@ -13,6 +13,7 @@
var balance = $('.balance').html();
var total = $('.total').html();
var progress = $('.progress-bar i');
var $modalBoxErweima = $('.modal-box-erweima');
progress.width(progress.data('width'));
/**
* 验证用户姓名
......@@ -79,5 +80,16 @@
$modalBox.fadeOut(300);
});
/**
* 点击二维码弹窗
*/
$('.login-app').on('click',function(e){
e.preventDefault();
$modalBoxErweima.fadeIn(300);
})
$('.modal-dialog-close').on('click',function(e){
e.preventDefault();
$modalBoxErweima.fadeOut(300);
})
})();
public/stylesheets/index.less
View file @ 154aa487
......@@ -404,6 +404,8 @@
/*product end*/
.screen() {
.media(@screen-width-small, @container-width-small);
.media(@screen-width, @container-width);
......
public/stylesheets/product.css
View file @ 154aa487
......@@ -220,7 +220,7 @@ body {
background: #ff4a4b;
position: relative;
}
.modal-box .modal-dialog div:nth-child(1) b {
.modal-box .modal-dialog div:nth-child(1) a {
display: inline-block;
width: 46px;
height: 46px;
......@@ -260,6 +260,55 @@ body {
text-align: center;
}
/* .modal-box end */
/* .modal-box-erweima start */
.modal-box-erweima {
display: none;
position: fixed;
left: 0;
top: 0;
bottom: 0;
right: 0;
background: rgba(0, 0, 0, 0.5);
}
.modal-box-erweima .modal-dialog {
width: 450px;
height: 450px;
position: fixed;
left: 50%;
top: 300px;
margin-left: -225px;
border-radius: 10px;
background: #fff;
overflow: hidden;
}
.modal-box-erweima .modal-dialog > div {
text-align: center;
}
.modal-box-erweima .modal-dialog > div:nth-child(1) {
height: 50px;
background: #ff4a4b;
position: relative;
}
.modal-box-erweima .modal-dialog > div:nth-child(2) {
padding-top: 40px;
}
.modal-box-erweima .modal-dialog > div:nth-child(2) p {
font-size: 26px;
}
.modal-box-erweima .modal-dialog .modal-dialog-close {
width: 30px;
height: 30px;
font-size: 20px;
text-align: center;
line-height: 30px;
position: absolute;
right: 16px;
top: 10px;
border-radius: 50%;
border: 2px solid #fff;
color: #fff;
}
/* .modal-box-erweima end */
@media screen and (min-width: 769px) {
body .intro,
body .appointment,
......
public/stylesheets/product.less
View file @ 154aa487
......@@ -233,7 +233,7 @@ body {
height: 80px;
background: #ff4a4b;
position: relative;
b {
a {
display: inline-block;
width: 46px;
height: 46px;
......@@ -281,6 +281,58 @@ body {
/* .modal-box end */
/* .modal-box-erweima start */
.modal-box-erweima {
display: none;
position: fixed;
left:0;
top:0;
bottom: 0;
right: 0;
background: rgba(0,0,0,.5);
.modal-dialog {
width: 450px;
height: 450px;
position: fixed;
left:50%;
top:300px;
margin-left: -225px;
border-radius: 10px;
background: #fff;
overflow: hidden;
& > div {
text-align: center;
&:nth-child(1){
height: 50px;
background: #ff4a4b;
position: relative;
}
&:nth-child(2) {
padding-top: 40px;
p {
font-size: 26px;
}
}
}
.modal-dialog-close {
width: 30px;
height: 30px;
font-size: 20px;
text-align: center;
line-height: 30px;
position: absolute;
right:16px;
top:10px;
border-radius: 50%;
border: 2px solid #fff;
color: #fff;
}
}
}
/* .modal-box-erweima end */
.screen() {
.media(@screen-width-small, @container-width-small);
.media(@screen-width, @container-width);
......
public/stylesheets/products.less
View file @ 154aa487
......@@ -262,3 +262,4 @@
body {
.screen();
}
public/stylesheets/style.css
View file @ 154aa487
......@@ -518,10 +518,11 @@ hr.line-separate:after {
}
#footer address {
font-style: normal;
color: #aeaeae;
}
#footer address,
#footer address a {
color: #00a4d8;
cursor: pointer;
}
#footer .copyright {
margin-top: 80px;
......
public/stylesheets/style.less
View file @ 154aa487
......@@ -118,8 +118,10 @@ hr.line-separate {
}
address {
font-style: normal;
&, a {
color: #aeaeae;
a {
color: #00a4d8;
cursor: pointer;
}
}
.copyright {
......
views/index.hbs
View file @ 154aa487
<div class="banner">
https://res.fudou6.com/c/4/20160802/acpNi5waWNfaGQ=_280x280.jpg<div class="banner">
<div class="banner-box">
<h1>海量资源 轻松抢单</h1>
<p>
......@@ -106,3 +106,4 @@
{{/each}}
</ul>
</div>
views/layout.hbs
View file @ 154aa487
......@@ -44,8 +44,16 @@
<h2>400-879-9900</h2>
<!--<hr class="line-separate"/>-->
<p class="copyright">Copyright2016 <span>shuniu</span> All Right Reserved&copy;2014-2015 杭州枢纽科技有限公司 版权所有</p>
<<<<<<< HEAD
<address>
浙江省杭州市余杭区良睦路1288号梦想小镇5-305
<br>上海市浦东新区福山路458号同盛大厦1808室 <br>
<a href="mailto:hr@shuniu.com">E-mail:hr@shuniu.com</a>
</address>
=======
<address>浙江省杭州市余杭区良睦路1288号梦想小镇5-305 E-mail: <a href="mailto:hr@shuniu.com">hr@shuniu.com</a></address>
<address>上海市浦东新区福山路458号同盛大厦1808室</address>
>>>>>>> 546ba5723d0162ab25246abb551367aad882f2e0
</footer>
<script src="/javascripts/jquery-1.8.3.min.js"></script>
{{#if env}}
......
views/product.hbs
View file @ 154aa487
......@@ -28,7 +28,8 @@
</td>
{{#unless @index}}
<td rowspan={{rowspan}}>
<a href="http://a.app.qq.com/o/simple.jsp?pkgname=com.fudou6.app" target="_blank">登录富豆APP可见</a>
<!--<a href="http://a.app.qq.com/o/simple.jsp?pkgname=com.fudou6.app" target="_blank">登录富豆APP可见</a>-->
<a href="javascript:;" class="login-app">登录富豆APP可见</a>
</td>
{{/unless}}
</tr>
......@@ -153,7 +154,7 @@
<div class="modal-box">
<div class="modal-dialog">
<div>
<b id="modalBoxHidden">&times;</b>
<a id="modalBoxHidden">&times;</a>
</div>
<div>
<i></i>
......@@ -162,3 +163,16 @@
<p>富豆工作人员将第一时间与您取得联系!</p>
</div>
</div>
<div class="modal-box-erweima">
<div class="modal-dialog">
<div>
<a class="modal-dialog-close">&times</a>
</div>
<div>
<a href="javascript:;">
<img src="https://res.fudou6.com/c/4/20160802/acpNi5waWNfaGQ=_280x280.jpg" alt="erweima"/>
</a>
<p>扫描二维码,下载富豆优投</p>
</div>
</div>
</div>
\ 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