Merge branch 'test' of http://git.dev.yoho.cn/web/yohobuy into test

@@ -69,7 +69,9 @@
             kids: true,
             kids: true,
             lifeStyle: true,
             lifeStyle: true,
             //对应页面有就传，没有就不传
             //对应页面有就传，没有就不传
-            navBack: true,
+            navBack: {
+                backUrl: '' //需要指定回退路径的传此值，若使用默认history.back(-1)的就不传
+            },
             navTitle: '',
             navTitle: '',
             navHome: ''
             navHome: ''
         }
         }

 {{#pageHeader}}
 {{#pageHeader}}
 <header id="yoho-header" class="yoho-header{{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}">
 <header id="yoho-header" class="yoho-header{{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}">
-    {{#if navBack}}
-    <a href="javascript:history.go(-1);" class="iconfont nav-back">&#xe610;</a>
-    {{/if}}
+    {{#navBack}}
+    <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a>
+    {{/navBack}}
     {{#navHome}}
     {{#navHome}}
     <a href="{{.}}" class="iconfont nav-home">&#xe611;</a>
     <a href="{{.}}" class="iconfont nav-home">&#xe611;</a>
     {{/navHome}}
     {{/navHome}}