Merge branch 'release/newSearch' of git.yoho.cn:fe/yohobuywap-node into release/newSearch

@@ -8,11 +8,13 @@ const co = require('bluebird').coroutine;
 
 
 
 
 function humanNum_wan(num) {
 function humanNum_wan(num) {
-    if (num > 9999) {
-        num = (num / 10000).toFixed(2) + '万'
-    }
-
     return num;
     return num;
+
+    // if (num > 9999) {
+    //     num = (num / 10000).toFixed(2) + '万'
+    // }
+
+    // return num;
 }
 }
 
 
 exports.beforeIn = (req, res, next) => {
 exports.beforeIn = (req, res, next) => {
@@ -87,7 +89,7 @@ exports.crazyWheel = (req, res, next) => {
     }
     }
 
 
     vipDayModel.getJoinNum(1).then(result => {
     vipDayModel.getJoinNum(1).then(result => {
-        let joins =  result && result.data || 0;
+        let joins = result && result.data || 0;
 
 
         res.render('vip_day/crazy_wheel', {
         res.render('vip_day/crazy_wheel', {
             title: '疯狂大转盘',
             title: '疯狂大转盘',
@@ -111,7 +113,7 @@ exports.crazyLuck = (req, res, next) => {
         let joinNum = yield vipDayModel.getJoinNum(2);
         let joinNum = yield vipDayModel.getJoinNum(2);
 
 
         coins = (coins && coins.data && coins.data.total) || 0;
         coins = (coins && coins.data && coins.data.total) || 0;
-        joinNum = (joinNum && joinNum.data) || 0
+        joinNum = (joinNum && joinNum.data) || 0;
 
 
         res.render('vip_day/crazy_luck', {
         res.render('vip_day/crazy_luck', {
             title: '拼手气',
             title: '拼手气',

@@ -8,6 +8,7 @@
  *
  *
  * 希望能与 微信 JS-SDK 一样方便
  * 希望能与 微信 JS-SDK 一样方便
  */
  */
+var $ = require('yoho-jquery');
 var tip = require('./plugin/tip');
 var tip = require('./plugin/tip');
 
 
 /* 空方法 */
 /* 空方法 */
@@ -16,11 +17,22 @@ var emptyFn = function() { };
 /* 提示信息 */
 /* 提示信息 */
 var tipInfo = '暂不支持，请在YOHO!BUY应用中打开';
 var tipInfo = '暂不支持，请在YOHO!BUY应用中打开';
 
 
-var yoho = {
+var qs = window.queryString;
+
+var yoho, $appLink;
+
+$appLink = $('#yoho-app-link');
+
+if (!$appLink.length) {
+    $('body').append('<a id="yoho-app-link" href="javascript:;" style="display:none !important;"></a>');
+    $appLink = $('#yoho-app-link');
+}
+
+yoho = {
     /**
     /**
      * 判断是否是 APP
      * 判断是否是 APP
      */
      */
-    isApp: /YohoBuy/i.test(navigator.userAgent || ''),
+    isApp: /YohoBuy/i.test(navigator.userAgent || '') || qs.app_version,
     isiOS: /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(navigator.userAgent || ''),
     isiOS: /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(navigator.userAgent || ''),
     isAndroid: /Android/i.test(navigator.userAgent || ''),
     isAndroid: /Android/i.test(navigator.userAgent || ''),
 
 
@@ -73,12 +85,85 @@ var yoho = {
         }, 500);
         }, 500);
     },
     },
 
 
+    parseUrl: function(url) {
+        var query = {},
+            hashs,
+            hash,
+            i;
+
+        url = (url || '').split('?');
+        hashs = url[1].split('&');
+
+        if (hashs && hashs.length) {
+            for (i = 0; i < hashs.length; i++) {
+                hash = hashs[i].split('=');
+                console.log(hashs[i]);
+                query[hash[0]] = hash[1];
+            }
+        }
+
+        return {
+            path: url[0],
+            query: query
+        };
+    },
+
     getUid: function() {
     getUid: function() {
-        if (window.queryString.app_version) {
-            return window.queryString.uid || 0;
+        if (yoho.isApp) {
+            return qs.uid;
+        }
+
+        return window.gitUid();
+    },
+
+    goLogin: function(refer, data) {
+        var url;
+
+        url = 'http://m.yohobuy.com/signin.html?refer=' + encodeURIComponent(refer);
+        refer = yoho.parseUrl(refer || location.href);
+
+        if (yoho.isApp) {
+            url = url + '&openby:yohobuy=' + (data || JSON.stringify({
+                action: 'go.weblogin',
+                params: {
+                    priority: 'N',
+                    jumpurl: {
+                        url: refer.path,
+                        param: refer.query
+                    }
+                }
+            }));
+        }
+
+        $appLink.attr('href', url);
+        $appLink[0].click();
+        return false;
+    },
+
+    goH5: function(link, data) {
+        var url = link;
+
+        if (!link) {
+            return;
+        }
+        link = yoho.parseUrl(link || location.href);
+
+        if (yoho.isApp) {
+            url = url + '&openby:yohobuy=' + (data || JSON.stringify({
+                action: 'go.h5',
+                params: {
+                    islogin: 'N',
+                    type: 0,
+                    updateflag: Date.now() + '',
+                    url: link.path,
+                    param: link.query
+                }
+            }));
         }
         }
 
 
-        return window.getUid() || 0;
+        $appLink.attr('href', url);
+        $appLink[0].click();
+        return false;
     }
     }
 };
 };