Merge branch 'master' into fix_0206

@@ -143,6 +143,7 @@
     var url = 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.home","params":{"gender":"1","channel":"2"}}';
     var url = 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.home","params":{"gender":"1","channel":"2"}}';
     var u = navigator.userAgent.toLowerCase();
     var u = navigator.userAgent.toLowerCase();
     var isiOS = u.indexOf('os') > -1 || u.indexOf('iphone') > -1 || u.indexOf('mac') > -1 || u.indexOf('ipad') > -1;
     var isiOS = u.indexOf('os') > -1 || u.indexOf('iphone') > -1 || u.indexOf('mac') > -1 || u.indexOf('ipad') > -1;
+    var isWechat = /micromessenger/i.test(navigator.userAgent || '');
     var version, type, appid, td, params;
     var version, type, appid, td, params;
 
 
     params = queryString();
     params = queryString();
@@ -236,7 +237,7 @@
     function downloadApp() {
     function downloadApp() {
         var url;
         var url;
         var channel = window.cookie('_Channel');
         var channel = window.cookie('_Channel');
-        var isWechat = /micromessenger/i.test(navigator.userAgent || '');
+
         if(isWechat){
         if(isWechat){
             url = 'http://union.yoho.cn/union/downapp.html';
             url = 'http://union.yoho.cn/union/downapp.html';
         }
         }