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

html/coupons.html

@@ -380,9 +380,9 @@
         </div>
         <div class="goToDownLoad">
             <div>
-                <img class="downloadImg" src="../images/login/godownload.png" alt=""/>
+                <img class="downloadImg" src="http://acitvityimage.oytour.com/activity/godownload.png" alt=""/>
                 <span onclick="goDownLoad()">
-                    下载同业App使用<img src="../images/login/arrowR.png" alt=""/>
+                    下载同业App使用<img src="http://acitvityimage.oytour.com/activity/arrowR.png" alt=""/>
                 </span>
             </div>
         </div>

html/login.html

@@ -19,7 +19,7 @@
         position: relative;
         height: 100%;
         background-color: #FFFFFF;
-        background-image: url('../images/login/login_bg.png');
+        background-image: url('http://acitvityimage.oytour.com/activity/login_bg.jpg');
         background-size:cover;
     }
     .login_page .page__bd{
@@ -229,22 +229,22 @@
         <div class="login_denglu">
             <div class='page__bd'>
                 <div class="headBg">
-                <img class="headBgImg" src="../images/login/login_content.png"/>
+                <img class="headBgImg" src="http://acitvityimage.oytour.com/activity/login_content.png"/>
                 <div class='header'>
-                    <img class='header_image' src='../images/login/login_elp.png'>
+                    <img class='header_image' src='http://acitvityimage.oytour.com/activity/login_elp.png'>
                     <span class='header_span'>Welcome</span>
                 </div>
                 <div class='form'>
                     <div class='form_item1'>
                     <div class='form_item_inBox'>
-                        <img class='form_item_ico' src='../images/login/ico_lock1.png'/>
+                        <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_lock1.png'/>
                         <span class="login_Zh">账号</span>
                         <input class='form_item_input' id="UserAccount" type='number' placeholder="请输入手机号"></input>
                     </div>
                     </div>
                     <div class='form_item2'>
                     <div class='form_item_inBox'>
-                        <img class='form_item_ico' src='../images/login/ico_lock2.png'/>
+                        <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_lock2.png'/>
                         <span class="login_Zh">密码</span>
                         <input class='form_item_input' id="passWord" type="password" placeholder="请输入密码"></input>
                     </div>
@@ -265,29 +265,29 @@
         <div class="login_jihuo">
             <div class='page__bd'>
                 <div class="headBg" style="height:60rem;">
-                    <img class="headBgImg" src="../images/login/login_content.png"/>
+                    <img class="headBgImg" src="http://acitvityimage.oytour.com/activity/login_content.png"/>
                     <div class='header'>
-                        <img class='header_image' src='../images/login/login_elp.png'>
+                        <img class='header_image' src='http://acitvityimage.oytour.com/activity/login_elp.png'>
                         <span class='header_span'>Welcome</span>
                     </div>
                     <div class='form'>
                         <div class='form_item1'>
                             <div class='form_item_inBox'>
-                                <img class='form_item_ico' src='../images/login/ico_lock1.png'/>
+                                <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_lock1.png'/>
                                 <span class="login_Zh">账号</span>
                                 <input class='form_item_input' type='number' id="Activation_Account" placeholder="请输入手机号"></input>
                             </div>
                         </div>
                         <div class='form_item2'>
                             <div class='form_item_inBox'>
-                                <img class='form_item_ico' src='../images/login/ico_lock2.png'/>
+                                <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_lock2.png'/>
                                 <span class="login_Zh">密码</span>
                                 <input class='form_item_input' type="password" id="Activation_password" placeholder="请输入密码"></input>
                             </div>
                         </div>
                         <div class='form_item2'>
                             <div class='form_item_inBox'>
-                                <img class='form_item_ico' src='../images/login/ico_yzm.png' style="margin-top:1rem;"/>
+                                <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_yzm.png' style="margin-top:1rem;"/>
                                 <span class="login_Zh">验证码</span>
                                 <input class='form_validate_input' id="Activation_valicode" placeholder="请输入验证码"></input>
                                 <span class="login_yzm" onclick="getCode()">发送验证码</span>
@@ -304,7 +304,7 @@
     </div>
     <div class="login_Agreement">
         <div class="login_AgreeTitle">
-           <img onclick="gobackLogin()" src="../images/login/login_arrowleft.png"/> 用户协议
+           <img onclick="gobackLogin()" src="http://acitvityimage.oytour.com/activity/login_arrowleft.jpg"/> 用户协议
         </div>
         <div class="boxcenter">
             <h1>《用户协议和法律协议》 本协议为您与本APP管理者之间所订立的契约，具有合同的法律效力，请您仔细阅读。</h1>

html/pay.html

@@ -155,11 +155,11 @@
 
             </div>
             <div class="pay_zhifu">
-                <img class="pay_one" src="../images/login/wechat.png" alt="" />
+                <img class="pay_one" src="http://acitvityimage.oytour.com/activity/wechat.png" alt="" />
                 <span class="pay_two">微信支付</span>
                 <div class="pay_three">
                     <!-- <div class="pay_circle"></div> -->
-                    <img src="../images/login/checkbox.png" aly="" />
+                    <img src="http://acitvityimage.oytour.com/activity/checkbox.png" aly="" />
                 </div>
             </div>
         </div>

html/paySuccess.html

@@ -28,7 +28,7 @@
         height:100%;
         position: relative;
         text-align: center;
-        background: url('../images/pay/bg.png') no-repeat;
+        background: url('http://acitvityimage.oytour.com/activity/bg.jpg') no-repeat;
         background-size:100% 100%; 
         padding-top: 3.1rem;
         box-sizing: border-box;
@@ -53,7 +53,7 @@
     }
     .img_bg_M .imgBtn{
         margin-top: 0.08rem;
-        background: url('../images/pay/btn.png') no-repeat;
+        background: url('http://acitvityimage.oytour.com/activity/buy_btn.png') no-repeat;
         background-size:100% 100%; 
         padding: 0.09rem 0.12rem;
 
@@ -127,12 +127,12 @@
                     有效截止日期：
                 </p>
                 <p class="imgBtn" style="font-size: 0.15rem;color: #E03234;">返回活动首页</p>
-                <img class="ylImg" src="../images/pay/yl.png" alt="">
+                <img class="ylImg" src="http://acitvityimage.oytour.com/activity/received@3x.png" alt="">
             </div>
 
             <div class="use_oupon">
                 <div class="use_news">
-                    <img src="../images/tx_bg.png" alt="">
+                    <img src="http://acitvityimage.oytour.com/activity/tx_bg.png" alt="">
                     <div>
                         <p class="use_o"></p>
                         <p class="use_t"></p>
@@ -170,7 +170,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);
+    
 
     let userInfo = {};
     let platform='';
@@ -198,12 +198,11 @@
             async: false,
 
             success: function(res) {
-                console.log("res",res);
                 if (res.resultCode === 1) {
                     // let  activityEndDate = res.data.activityEndDate.replace('T', ' ').replace(/-/g, '/'); //活动结束时间
                     let data=res.data;
                     let activityEndDate = data.activityEndDate.split('T')[0].replace(/-/g, '.'); //活动结束时间
-                    console.log("re",activityEndDate)
+                    
                     let str="";
                     str+=`
                     <div class="img_bg_text" style="position:relative;width: 53%; margin-left: 45%;height: 1.18rem;display: flex;flex-direction: column;align-items: center;padding-top: 0.1rem">