Skip to content

S
SURPRISED
Commit bd602d8a authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised

parents 7bb78860 9b44faaf
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 12 deletions
css/GT_activities.css
View file @ bd602d8a
...@@ -133,7 +133,7 @@ p{ ...@@ -133,7 +133,7 @@ p{
font-size: 0.3rem; font-size: 0.3rem;
color: #E03234; color: #E03234;
margin-left: 1.91rem; margin-left: 1.91rem;
padding-top: 0.27rem; padding-top: 0.2rem;
} }
.img_bg_p2{ .img_bg_p2{
font-size: 0.14rem; font-size: 0.14rem;
...@@ -148,23 +148,26 @@ p{ ...@@ -148,23 +148,26 @@ p{
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-left: 2.07rem; margin-left: 2.07rem;
margin-top: 0.08rem;
} }
.img_btn p{ .img_btn p{
font-size: 0.14rem; font-size: 0.14rem;
color: #E03234; color: #E03234;
} }
.explain_box{
background: #C72220;
padding: 0.15rem;
}
.explain{ .explain{
width: 90%; width: 100%;
height: 1.1rem;
background: #E03234; background: #E03234;
margin-left: 5%;
overflow: auto; overflow: auto;
} }
.explain p{ .explain p{
font-size: 0.14rem; font-size: 0.12rem;
color: #FFFFFF; color: #FFFFFF;
margin: 0.15rem; margin: 0.15rem;
line-height: 0.2rem;
} }
.img_bg_M .received_img{ .img_bg_M .received_img{
......
html/GT_activities.html
View file @ bd602d8a
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<script type="text/javascript" src="../js/autosize2.js"></script> <script type="text/javascript" src="../js/autosize2.js"></script>
<script type="text/javascript" src="../js/jquery-1.10.2.js"></script> <script type="text/javascript" src="../js/jquery-1.10.2.js"></script>
<title>活动</title> <title>11·18活动主会场</title>
</head> </head>
<body> <body>
...@@ -123,8 +123,11 @@ ...@@ -123,8 +123,11 @@
</div> </div>
<div class="explain"> <div class="explain_box">
<p></p> <div class="explain">
<p></p>
</div>
</div> </div>
</div> </div>
......
js/jquery.dataStatistics.js
View file @ bd602d8a
...@@ -251,7 +251,7 @@ $.fn.dataStatistics = function(options){ ...@@ -251,7 +251,7 @@ $.fn.dataStatistics = function(options){
'couponId' : res.data.couponId, 'couponId' : res.data.couponId,
'title':title, 'title':title,
'price':res.data.preferPrice, 'price':res.data.preferPrice,
'backKey':'reload', 'backType':'reload',
'data':res.data 'data':res.data
} }
} }
...@@ -306,8 +306,17 @@ $.fn.dataStatistics = function(options){ ...@@ -306,8 +306,17 @@ $.fn.dataStatistics = function(options){
layer.msg(res.message) layer.msg(res.message)
} }
}); });
}else { }else { //跳转到跟团游首页
layer.msg('去使用优惠券') let data = {
'action' : 'jump',
'page' : 'teamWalker_2',
'pageData' : {
'backType':'pop',
}
}
if(options.platform == 'App'){
window.postMessage(JSON.stringify(data));
}
} }
}else { }else {
......
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