merge

@@ -18,7 +18,7 @@ const query = require(cRoot + '/query');
 router.get('/list', list.index); // 列表页面
 router.get('/list/new', list.newPage); // 新品列表页
 
-router.get(/\/item\/([\d]+)_([\d]+).html/, item.index); // 商品详情页
+router.get(/\/pro_([\d]+)_([\d]+)\/(.*)/, item.index); // 商品详情routers
 router.post('/item/togglecollect', fav.product); // 商品详情页
 
 router.get('/shop/:domain/list', shop.list);

@@ -115,7 +115,7 @@
                                     </span>
                                 {{/if}}
                             {{/unless}}
-                            <span id="sold-out" class="btn disable hide">已售罄</span>
+                            <span id="sold-out" class="btn disable{{#unless soldOut}} hide{{/unless}}">已售罄</span>
                             <span id="collect-product" class="btn white{{#if productFav}} coll{{/if}}">
                                 <span class="collecting">
                                     <i class="iconfont">&#xe644;</i>

@@ -7,12 +7,15 @@
 'use strict';
 const _ = require('lodash');
 const header = require('../models/header');
+const helpers = global.yoho.helpers;
 
 module.exports = () => {
     return (req, res, next) => {
         res.display = (path, data) => {
             let isHead = true;
 
+            data.siteUrl = helpers.urlFormat('');
+
             // 判断是否隐藏公共布局
             if (_.isBoolean(data.layout) && !data.layout) {
                 isHead = false;

 <div class="blk-footer">
     <div class="center-content">
         <ul class="about-us clearfix">
-            <li><a href="#">BLK首页</a></li>
-            <li><a href="#">客户服务</a></li>
-            <li><a href="#">支付方式</a></li>
-            <li><a href="#">配送方式</a></li>
-            <li><a href="#">售后服务</a></li>
+            <li><a href="{{siteUrl}}">BLK首页</a></li>
+            <li><a href="{{siteUrl}}/help">客户服务</a></li>
+            <li><a href="{{siteUrl}}/#">支付方式</a></li>
+            <li><a href="{{siteUrl}}/#">配送方式</a></li>
+            <li><a href="{{siteUrl}}/#">售后服务</a></li>
         </ul>
         <div class="record-info">
             <p>

@@ -17,18 +17,18 @@
                 <li>
                     {{#if userName}}
                         Hi~
-                        <a href="//www.yohoblk.com/me">{{userName}}</a>
-                        <a href="//www.yohoblk.com/passport/logout">[退出]</a>
+                        <a href="{{../siteUrl}}/me">{{userName}}</a>
+                        <a href="{{../siteUrl}}/passport/logout">[退出]</a>
                     {{^}}
-                        <a href="//www.yohoblk.com/passport/login">登录</a> | 
-                        <a href="//www.yohoblk.com/passport/reg/index">注册</a>
+                        <a href="{{../siteUrl}}/passport/login">登录</a> | 
+                        <a href="{{../siteUrl}}/passport/reg">注册</a>
                     {{/if}}
                 </li>
                 <li>
-                    <a href="#">个人中心</a>
+                    <a href="{{../siteUrl}}/me">个人中心</a>
                 </li>
                 <li>
-                    <a href="#">帮助中心</a>
+                    <a href="{{../siteUrl}}/help">帮助中心</a>
                 </li>
                 <li class="tag-phone">
                     <span class="tools-icon icon-phone"></span>

@@ -4,14 +4,14 @@
         <ul class="header-tools right clearfix">
             {{#if userName}}
                 Hi~
-                <a href="//www.yohoblk.com/me">{{userName}}</a>
-                <a href="//www.yohoblk.com/passport/logout">[退出]</a>
+                <a href="{{siteUrl}}/me">{{userName}}</a>
+                <a href="{{siteUrl}}/passport/logout">[退出]</a>
             {{^}}
-                <a href="//www.yohoblk.com/passport/login">登录</a> | 
-                <a href="//www.yohoblk.com/passport/reg/index">注册</a>
+                <a href="{{siteUrl}}/passport/login">登录</a> | 
+                <a href="{{siteUrl}}/passport/reg">注册</a>
             {{/if}}
-            <li><a href="//www.yohoblk.com">首页</a></li>
-            <li><a href="//www.yohoblk.com/help">帮助中心</a></li>
+            <li><a href="{{siteUrl}}">首页</a></li>
+            <li><a href="{{siteUrl}}/help">帮助中心</a></li>
             <li>客服电话<span>400-9889-9646</span></li>
         </ul>
     </div>