Merge remote-tracking branch 'origin/master'

admin

2019-05-24 d126b83f5d65f612ec93475b976fc5b5e2d6132a

 fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java

@@ -258,7 +258,7 @@
   }



   private void closeWebPage(PrintWriter out) {

      String script = "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.finishPage();}</script>";

      String script = "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.finishPage();}</script>";

      out.print(script);

   }