Authored by 陈峰

Merge branch 'release/app-download' into 'master'

处理下载页 跳转下载



See merge request !171
1 { 1 {
2 "name": "m-yohobuy-node", 2 "name": "m-yohobuy-node",
3 - "version": "5.3.19", 3 + "version": "5.3.20",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -11,6 +11,27 @@ var appPath = url; @@ -11,6 +11,27 @@ var appPath = url;
11 var ifr; 11 var ifr;
12 12
13 setTimeout(function() { 13 setTimeout(function() {
  14 + //记录唤醒时间
  15 + var openTime = +new Date();
  16 +
  17 + window.setTimeout(function() {
  18 + if (ifr) {
  19 + document.body.removeChild(ifr);
  20 + }
  21 +
  22 + //如果setTimeout 回调超过2500ms,则弹出下载
  23 + if ((+new Date()) - openTime > 500) {
  24 + if (isiOS) {
  25 + url = 'http://itunes.apple.com/us/app/id490655927?ls=1&mt=8';
  26 + } else {
  27 + url = 'http://yoho-apps.qiniudn.com/YohoBuy_YOHO.apk';
  28 + }
  29 +
  30 + location.href = url;
  31 + // window.open(url);
  32 + }
  33 + }, 1000);
  34 +
14 if (isiOS) { 35 if (isiOS) {
15 window.location.href = appPath; 36 window.location.href = appPath;
16 } else { 37 } else {