修改

7bb78860 · zhengke · 4b3926f4 · 7bb78860 · 7bb78860 · 7bb78860
Commit 7bb78860 authored Nov 12, 2019 by zhengke
Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 5 deletions

GT_activities.css css/GT_activities.css +13 -0

GT_activities.html html/GT_activities.html +9 -2

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

No files found.
--- a/css/GT_activities.css
+++ b/css/GT_activities.css
@@ -21,6 +21,19 @@ p{
    padding-top: 0.7rem;
    position: relative;
 }
+.wx_bg{
+    width:100%;
+    height:100%;
+    background: rgba(00,00,00,0.6);
+    position: fixed;
+    top:0;
+    z-index:999;
+    text-align: center;
+}
+.wx_bg img{
+    width:2.5rem;
+    margin-top:50%;
+}
 .box_title{
    width: 80%;
    margin-left: 10%;

--- a/html/GT_activities.html
+++ b/html/GT_activities.html
@@ -21,6 +21,9 @@

 <body>
    <div id="box">
+        <div class="wx_bg" onclick="hideTips()">
+            <img src="../images/qsywx.png" alt=""/>
+        </div>
        <div class="box_title">
            <img src="../images/G@3x.png" alt="" class="G_img">
            <h5>
@@ -149,8 +152,8 @@

    <script>
    // let href = 'http://activity.oytour.com/html/Appmd/draw.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzE5NzA5MDUuMCwiZXhwIjoxNTc0NTYyOTA1LjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6M319.vlAcXCx4C_0KOmfLm4cLRxU28gTHmuMK6jgJtwjsSPM&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=App';
-    // let href = window.location.href;
-    let href='http://127.0.0.1:5500/html/GT_activities.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=App';
+     let href = window.location.href;
+    //let href='http://127.0.0.1:5500/html/GT_activities.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=App';

    // 如果进入页面没有登录的参数 处理跳到h5页面登录
    if(href.split('?')[1]){
@@ -438,6 +441,10 @@
            window.location.href = 'http://activity.oytour.com/html/coupons.html';
        }
    })
+    //点击隐藏提示
+    function hideTips(){
+        $('.wx_bg').css({'display':'none'})
+    }
    </script>
 </body>


--- a/js/jquery.dataStatistics.js
+++ b/js/jquery.dataStatistics.js
@@ -270,7 +270,7 @@ $.fn.dataStatistics = function(options){
 									window.wx.miniProgram.navigateTo({
 										url: `/pages/Home/pay/pay?data=`+JSON.stringify(data),
 									});
-									});
+								});
 							}
 							else if(options.platform == 'H5'){
 								let userInfo = getLocalStorage()
@@ -279,8 +279,10 @@ $.fn.dataStatistics = function(options){
 								data.sProductName=title;
 								data.productId=res.data.couponId;
 								data.dTotalPrice=res.data.preferPrice;
-
-								window.location.href = 'http://127.0.0.1:5500/html/pay.html?sOrderNo='+data.sOrderNo+'&sProductName='+data.sProductName+'&productId='+data.productId+'&dTotalPrice='+data.dTotalPrice+'&CustomerId='+userInfo.customerId;
+								data.customerId=userInfo.customerId;
+								
+								sessionStorage.setItem("payInfo", JSON.stringify(data));
+								window.location.href = 'http://127.0.0.1:5500/html/pay.html';
 							}

 						}else {