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

bd602d8a · zhengke · 7bb78860 · 9b44faaf · bd602d8a · bd602d8a
Commit bd602d8a authored Nov 12, 2019 by zhengke
Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 12 deletions

GT_activities.css css/GT_activities.css +9 -6

GT_activities.html html/GT_activities.html +6 -3

jquery.dataStatistics.js js/jquery.dataStatistics.js +12 -3

No files found.
--- a/css/GT_activities.css
+++ b/css/GT_activities.css
@@ -133,7 +133,7 @@ p{
    font-size: 0.3rem;
    color: #E03234;
    margin-left: 1.91rem;
-    padding-top: 0.27rem;
+    padding-top: 0.2rem;
 }
 .img_bg_p2{
    font-size: 0.14rem;
@@ -148,23 +148,26 @@ p{
    align-items: center;
    justify-content: center;
    margin-left: 2.07rem;
+    margin-top: 0.08rem;
 }
 .img_btn p{
    font-size: 0.14rem;
    color: #E03234;
 }
+.explain_box{
+    background: #C72220;
+    padding: 0.15rem;
+}
 .explain{
-    width: 90%;
-    height: 1.1rem;
+    width: 100%;
    background: #E03234;
-    margin-left: 5%;
    overflow: auto;
 }
 .explain p{
-    font-size: 0.14rem;
+    font-size: 0.12rem;
    color: #FFFFFF;
    margin: 0.15rem;
-
+    line-height: 0.2rem;
 }

 .img_bg_M .received_img{

--- a/html/GT_activities.html
+++ b/html/GT_activities.html
@@ -16,7 +16,7 @@

    <script type="text/javascript" src="../js/autosize2.js"></script>
    <script type="text/javascript" src="../js/jquery-1.10.2.js"></script>
-    <title>活动</title>
+    <title>11·18活动主会场</title>
 </head>

 <body>
@@ -123,8 +123,11 @@

            </div>

-            <div class="explain">
-                <p></p>
+            <div class="explain_box">
+                <div class="explain">
+                    <p></p>
+                </div>
+

            </div>
        </div>

--- a/js/jquery.dataStatistics.js
+++ b/js/jquery.dataStatistics.js
@@ -251,7 +251,7 @@ $.fn.dataStatistics = function(options){
 									'couponId' : res.data.couponId,
 									'title':title,
 									'price':res.data.preferPrice,
-									'backKey':'reload',
+									'backType':'reload',
 									'data':res.data
 								}
 							}
@@ -306,8 +306,17 @@ $.fn.dataStatistics = function(options){
 						layer.msg(res.message)
 					}
 				});
-			}else {
-				layer.msg('去使用优惠券')
+			}else { //跳转到跟团游首页
+				let data = {
+					'action' : 'jump',
+					'page' : 'teamWalker_2',
+					'pageData' : {
+						'backType':'pop',
+					}
+				}
+				if(options.platform == 'App'){
+					window.postMessage(JSON.stringify(data));
+				}

 			}
 		}else {