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

html/coupons.html

@@ -421,7 +421,7 @@
     function getAllTicket(couponsUseScope,couponsType,couponEffectStatus){
         let msg={
             pageIndex: 1,
-            pageSize: 8,
+            pageSize: 1000,
             useState: 1,
             lineId: 0,
             lineteamId: 0,
@@ -516,7 +516,11 @@
                     }
                     $('.coupons_Content').html(str);
                 }else{
-                    layer.msg(res.message);
+                    layer.msg('登录已过期，请重新登录');
+                    setTimeout(function(){
+                        localStorage.removeItem("u");
+                        window.location.href = 'http://activity.oytour.com/html/login.html';
+                    },2000)
                 }
             },
             error: function (res) {

html/downloadApp.html

@@ -50,7 +50,7 @@
       bottom: 4rem;
       width: 100%; */
     }
-   #tc{
+   .tc{
       position: fixed;
       top: 0;
       height: 100%;
@@ -58,6 +58,12 @@
       width: 100%;
       display: none;
     }
+    .tc .Img{
+      text-align: right;
+      padding-right: 1rem;
+      box-sizing: border-box;
+      margin-top: 1rem;
+    }
   </style>
 </head>
 
@@ -71,7 +77,17 @@
         <img src="../images/dload_logo.png" alt="">
       </div>
     </div>
-    <div id="tc"></div>
+    <div id="tc1" class="tc"></div>
+    <div id="tc2" class="tc">
+      <div class="Img">
+        <div>
+         <img src="../images/down/jt.png" alt="">
+        </div>
+        <div style="margin-top:1rem">
+        <img src="../images/down/font.png" alt="">
+        </div>
+      </div>
+    </div>
   </div>
 	<script type="text/javascript" src="../js/jquery-1.10.2.js"></script>
 	<script type="text/javascript" src="../js/md5.js"></script>
@@ -87,8 +103,7 @@
       var u = navigator.userAgent, app = navigator.appVersion;
       var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; 
       if (ua.match(/MicroMessenger/i) == "micromessenger" && isAndroid) {//不在微信中打开并且不在android
-        $('#tc').css('display', 'block')  
-        layer.msg('请在浏览器中打开！')    
+        $('#tc2').css('display', 'block')    
       }
     } 
     function downLoad(){
@@ -96,13 +111,15 @@
       var ua = navigator.userAgent.toLowerCase();//获取判断用的对象
       
       if (ua.match(/MicroMessenger/i) == "micromessenger") {//在微信中打开
-        $('#tc').css('display', 'block')      
+        $('#tc1').css('display', 'block')      
       }
       var u = navigator.userAgent, app = navigator.appVersion;
         var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //android终端或者uc浏览器
+
         // var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
         if(isAndroid){
           window.location.href='http://imgfile.oytour.com/app/oytourB2B.apk';
+
         }else{
           window.location.href='https://apps.apple.com/us/app/%E5%8D%B0%E8%B1%A1%E5%90%8C%E4%B8%9A/id1471616669?l=zh&ls=1';
         }