修改

html/GT_activities.html

@@ -433,6 +433,10 @@
                 });
             });
         }
+        //跳转到h5优惠券
+        if(platform == 'H5'){
+            window.location.href = 'http://activity.oytour.com/html/coupons.html';
+        }
     })
     </script>
 </body>

html/login.html

@@ -219,7 +219,7 @@
         float:left;
     }
     .layui-layer-content{
-        font-size:2rem!important;
+        font-size:1.8rem!important;
         padding:2rem 1rem!important;
     }
 </style>
@@ -282,7 +282,7 @@
                             <div class='form_item_inBox'>
                                 <img class='form_item_ico' src='../images/login/ico_lock2.png'/>
                                 <span class="login_Zh">密码</span>
-                                <input class='form_item_input' id="Activation_password" placeholder="请输入密码"></input>
+                                <input class='form_item_input' type="password" id="Activation_password" placeholder="请输入密码"></input>
                             </div>
                         </div>
                         <div class='form_item2'>
@@ -294,7 +294,7 @@
                             </div>
                         </div>    
                     </div>
-                    <button class="login_btn">激活并登录</button>
+                    <button class="login_btn" onclick="Activation()">激活并登录</button>
                 </div>
                 <div class="jihuoDiv">
                     <span class="jilijihuo" onclick="backToLogin()">返回登录</span>
@@ -384,8 +384,10 @@
                     let accountId=res.data.accountId;
                     let token=res.data.token;
                     let secretKey=res.data.secretKey;
-                    window.location.href = 'http://activity.oytour.com/html/GT_activities.html?customerId='+customerId+'&accountId='+accountId+'&token='+token+'&secretKey='+secretKey+'&platform=H5';
-
+                    //window.location.href = 'http://activity.oytour.com/html/GT_activities.html?customerId='+customerId+'&accountId='+accountId+'&token='+token+'&secretKey='+secretKey+'&platform=H5';
+                    window.location.href = 'http://127.0.0.1:5500/html/GT_activities.html?customerId='+customerId+'&accountId='+accountId+'&token='+token+'&secretKey='+secretKey+'&platform=H5';
+                }else{
+                    layer.msg(res.message);
                 }
             },
             error: function (res) {
@@ -445,15 +447,18 @@
     }
     //点击激活
     function Activation(){
-        if ($('#Activation_Account').val() == "")
+        if ($('#Activation_Account').val() == ""){
             layer.msg('请输入账号！');
             return 
-        if ($('#Activation_password').val() == "")
+        }
+        if ($('#Activation_password').val() == ""){
             layer.msg('请输入密码！');
             return
-        if ($('#Activation_valicode').val() == "")
+        }
+        if ($('#Activation_valicode').val() == ""){
             layer.msg('请输入验证码！');
             return
+        }
         let activeMsg= {
             account: $('#Activation_Account').val(),
             mobileNumber: $('#Activation_Account').val(),
@@ -464,7 +469,7 @@
             type: "POST",
             url: `${getApiUrl().urlPost}`,
             contentType: "application/json",
-            data: getAjaxData('b2b_post_AccountActivation', msg),
+            data: getAjaxData('b2b_post_AccountActivation', activeMsg),
             async: false,
             success: function (res) {
                 if (res.resultCode === 1) {
@@ -474,6 +479,8 @@
                         password: $('#Activation_password').val()
                     };
                     Login(msg)
+                }else{
+                    layer.msg(res.message);
                 }
             },
             error: function (res) {