merage feature/yas

@@ -111,7 +111,7 @@ function getShoppingKey() {
     a.async = 1;
     a.src = j;
     m.parentNode.insertBefore(a, m);
-})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.17/yas.js', '_yas');
+})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.18/yas.js', '_yas');
 
 (function() {
     var uid = getUid();
@@ -121,7 +121,7 @@ function getShoppingKey() {
     window._ozuid = uid; //暴露ozuid
 
     if (window._yas) {
-        window._yas(1 * new Date(), '1.0.17', 'yohobuy_web', uid, '', '');
+        window._yas(1 * new Date(), '1.0.18', 'yohobuy_web', uid, '', '');
     }
 }());
 

@@ -1390,10 +1390,10 @@ function actionSearch() {
  */
 function actionLoginState(_data) {
     var timestamp = new Date().getTime();
-    var noLoginHtml = '<span>Hi~</span>[<a href="//www.yohobuy.com/signin.html" class="list-a login-out ">' +
+    var noLoginHtml = '<span>Hi~</span>[<a href="//www.yohobuy.com/signin.html?refer="'+ window.location.href +' class="list-a login-out ">' +
         '请登录</a>]&nbsp;' +
-        '[<a href="//www.yohobuy.com/reg.html" class="list-a login-out" onclick="">免费注册</a>]';
-    var loginHtml = '<span>Hi~<a href="//www.yohobuy.com/home?t=' + timestamp +
+        '[<a href="//www.yohobuy.com/reg.html?refer="'+ window.location.href +' class="list-a login-out" onclick="">免费注册</a>]';
+    var loginHtml = '<span>Hi~<a href="//www.yohobuy.com/home?ht=' + timestamp +
         '">{{user_name}}</a></span>&nbsp;' +
         '{{#if islogin}}' +
         '[<a href="{{logout}}" class="list-a login-out">退出</a>]' +

@@ -76,8 +76,8 @@ function setLoginStatus(data) {
                     '<a href="//www.yohobuy.com/logout.html">[退出]</a>';
     } else {
         loginHtml = '<span>Hi~</span>&nbsp;' +
-                    '<a href="//www.yohobuy.com/signin.html">[请登录]</a>&nbsp;' +
-                    '<a href="//www.yohobuy.com/reg.html">[免费注册]</a>';
+            '<a href="//www.yohobuy.com/signin.html?refer="' + window.location.href + '>[请登录]</a>&nbsp;' +
+            '<a href="//www.yohobuy.com/reg.html"' + window.location.href + '>[免费注册]</a>';
     }
     $('.header-tool li').eq(0).html(loginHtml);
 }

 {
   "name": "web-yohobuy",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "web yohobuy static",
   "keywords": [],
   "homepage": "",

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.0.0"
+application.version = "5.0.1"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.0.0"
+application.version = "5.0.1"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.0.0"
+application.version = "5.0.1"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.0.0"
+application.version = "5.0.1"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"