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

html/Rushbuy.html

@@ -18,7 +18,7 @@
         .main {
             width: 100%;
             height: 100%;
-            background: url(../images/gongxi4.png) no-repeat;
+            background: url(../images/gongxi4.jpg) no-repeat;
             background-size: 100%;
             background-color: #8d54cc;
             position: relative;
@@ -238,7 +238,7 @@
     <script type="text/javascript" src="../js/jquery-1.10.2.js"></script>
     <script type="text/javascript" src="../js/md5.js"></script>
     <script type="text/javascript" src="../js/layer/layer.js"></script>
-    <script type="text/javascript" src="../js/mian.js?r=12312312312"></script>
+    <script type="text/javascript" src="../js/mian.js?r=123123123192"></script>
     <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
 
     <script>
@@ -408,7 +408,6 @@
                         } else {
                             layer.msg(res.message)
                         }
-                        layer.msg(res.message)
 
                         // window.location.reload()
 

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="../images/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="../images/checkbox.png" aly="" />
                 </div>
             </div>
         </div>
@@ -191,7 +191,9 @@
             payBtn = false;
             changesecond = '00:00';
             $(".daojishi").html(changesecond);
-            $('.pay_btn').css({'background-color':'gray'});
+            $('.pay_btn').css({
+                'background-color': 'gray'
+            });
             $(".pay_btn").attr("disabled", true);
             setTimeout("goActive()", 2000);
             return;
@@ -229,11 +231,13 @@
         }
         return result;
     };
-    function goActive(){
+
+    function goActive() {
         window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
         // window.location.href = 'http://127.0.0.1:5500/html/paySuccess.html';
 
     }
+
     function pay() {
         if (!localStorage.openid) {
             window.location.href = 'https://activity.oytour.com/html/GT_activities.html';