新增判断

html/GT_activities.html

@@ -149,17 +149,24 @@
 
     <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;
-    // alert("href",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 param = href.split('?')[1].split("&") ? href.split('?')[1].split("&") : null;
+    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].indexOf('customerId') == -1 || href.split('?')[1].indexOf('accountId') == -1 ||
-        href.split('?')[1].indexOf('token') == -1||href.split('?')[1].indexOf('secretKey') == -1||
-        href.split('?')[1].indexOf('platform') == -1){
+    if(href.split('?')[1]){
+        if(href.split('?')[1].indexOf('customerId') == -1 || href.split('?')[1].indexOf('accountId') == -1 ||
+            href.split('?')[1].indexOf('token') == -1||href.split('?')[1].indexOf('secretKey') == -1||
+            href.split('?')[1].indexOf('platform') == -1){
+            window.location.href = 'http://activity.oytour.com/html/login.html';
+        }
+    }
+    else{
         window.location.href = 'http://activity.oytour.com/html/login.html';
+
     }
+    
+    let param = href.split('?')[1].split("&") ? href.split('?')[1].split("&") : null;
+
     // console.log(href.split('?')[1].split("&").indexOf('customerId'))
     let userInfo ={
         customerId: param[0].split('=')[1],
@@ -418,16 +425,10 @@
         }
         // 跳转到小程序
         if(platform == 'xcx'){
-            // let data = {
-
-            //     'action' : 'jump', // showToast->一个提示信息 showHud->一个黑色的loading
-            //     'page' : 'mycoupon',
-            //     'pageData' : {
-
-            //     }
-            // }
-            window.wx.miniProgram.navigateTo({
-                url: `/pages/member/Coupon/Coupon`,
+            wx.miniProgram.getEnv(function (res) {
+                window.wx.miniProgram.navigateTo({
+                    url: `/pages/member/Coupon/Coupon`,
+                });
             });
         }
     })