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

html/Rushbuy.html

@@ -25,10 +25,17 @@
      opacity: 0;
      text-align: center;
    }
+   .main .box.nomove{
+    top: 40%;
+    opacity: 1;
+   }
    .main .box.move{
     top: 40%;
     opacity: 1;
     transition: all linear .5s;
+    -moz-transition: all linear .5s; /* Firefox 4 */
+    -webkit-transition: all linear .5s; /* Safari and Chrome */
+    -o-transition: all linear .5s; /* Opera */
    }
    .main .box .hongbao{
      width: 80%;
@@ -65,24 +72,29 @@
   <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
 
   <script>
-
-    let RushbuyTime = JSON.parse(localStorage.RushbuyTime)
-    $(
-      function(){
+    let buyIf = {}
+    if (localStorage.buyInfo) {
+      buyIf = JSON.parse(localStorage.buyInfo)
+    }else {
+      history.go(-1)
+    }
+    if (buyIf.platform == 'app') {
+      move(1)
+    } else {
+      move(2)
+    }
+    let RushbuyTime = localStorage.RushbuyTime ? JSON.parse(localStorage.RushbuyTime) : {RushbuyTime: ''}
     $('#RushbuyTime').html(`有效期截止:` + RushbuyTime.RushbuyTime)
+    function move(t){
+      if (t === 1) {
+        $('.box').addClass('nomove')
+      } else {
         setTimeout(function(){
           $('.box').addClass('move')
         }, 500)
       }
-    )
-    let buyIf = {}
-    if (localStorage.buyInfo) {
-       buyIf = JSON.parse(localStorage.buyInfo)
-    }else {
-      window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
     }
     $('.anniu').click(function () {
-
       var loadingFlag;
       if (buyIf.platform == 'app') {
           window.postMessage(JSON.stringify({'action': 'showHud', 'message': '抢购中...'}));