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

html/paySuccess.html

@@ -156,7 +156,7 @@
     let href = window.location.href;
     // let href = 'https://127.0.0.1:5500/html/GT_activities.html';
     // let href='https://127.0.0.1:5500/html/GT_activities.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=xcx';
-    console.log("href",href);
+    // console.log("href",href);
 
     let userInfo = {};
     let platform='';
@@ -171,7 +171,9 @@
         }
         platform = param[4].split('=')[1] 
     }else{
-
+        if (localStorage.u){
+            userInfo = JSON.parse(localStorage.u);
+        }
     }
     localStorage.userInfo = JSON.stringify(userInfo)
     $.ajax({
@@ -222,9 +224,13 @@
 
     $('.imgBtn').click(function() {
         if(platform=="xcx"){
-            window.location.href = `https://activity.oytour.com/html/GT_activities.html?customerId=${userInfo.customerId}&accountId=${userInfo.accountId}&token={userInfo.token}&platform=xcx`;
+            // window.location.href = `http://127.0.0.1:5500/html/GT_activities.html?customerId=${userInfo.customerId}&accountId=${userInfo.accountId}&token=${userInfo.token}&secretKey=${userInfo.secretKey}&platform=xcx`;
+            window.location.href = `https://activity.oytour.com/html/GT_activities.html?customerId=${userInfo.customerId}&accountId=${userInfo.accountId}&token=${userInfo.token}&secretKey=${userInfo.secretKey}&platform=xcx`;
 
         }
+        else{
+            window.location.href="https://activity.oytour.com/html/GT_activities.html"
+        }
     })
     $('.click_use').click(function() {
         if(platform=="xcx"){
@@ -233,6 +239,8 @@
                     url: `/pages/member/Coupon/Coupon`,
                 });
             });
+        }else{
+            window.location.href="https://activity.oytour.com/html/coupons.html"
         }
     })
 </script>