Merge remote-tracking branch 'origin/master' into release/6.4.1

@@ -59,6 +59,8 @@ function _getShopData(channel, params, shopInfo) {
     params.domain && delete params.domain;
     params.shopId && delete params.shopId;
 
+    resData.shopBaseUrl = baseUrl;
+
     return co(function* () {
         let result = yield Promise.props({
             header: headerModel.requestHeaderData(channel), // 头部数据
@@ -110,7 +112,7 @@ function _getShopData(channel, params, shopInfo) {
                     showDiscount: false,
                     gender: gender
                 }),
-                href: `/product/shoplist?navBar=1&shopId=${shopId}`
+                href: `${baseUrl}/nb1`
             };
 
             _.set(allGoods, 'sort.newPage', true); // 启用新的分页导航
@@ -435,7 +437,10 @@ function _getShopListData(channel, params, shopInfo) {
                 {shop_id: shopId, query: ''}), 'shop') : Promise.resolve({})
         });
 
-        let resData = {headerData: Object.assign(result.header.headerData, {header: true})};
+        let resData = {
+            headerData: Object.assign(result.header.headerData, {header: true}),
+            shopBaseUrl: baseUrl
+        };
         let shopName = '';
 
         // 店铺装修

@@ -39,7 +39,7 @@
             抱歉！没有找到相关的商品
         </p>
         <div class="search-again clearfix">
-            <form method="GET" action="/product/shoplist">
+            <form method="GET" action="{{@root.shopBaseUrl}}">
                 <input id="no-result-input" name="query" type="text" placeholder="换个关键词试试">
                 <input type="hidden" name="shopId" value="{{@root.shopId}}">
                 <button class="search-again-btn" type="submit">

 <div class="shop-search">
-    <form action="/product/shoplist" method="get" id="shop-search-form">
+    <form action="{{shopBaseUrl}}" method="get" id="shop-search-form">
         <span>
             <input type="hidden" name="shopId" value="{{shopId}}">
             <input id="shop-query-key" type="text" name="query" class="shop-query-key" autocomplete="off" x-webkit-speech="" lang="zh-CN" placeholder="关键词搜索"{{# shopKey}} value="{{.}}"{{/ shopKey}}>
         </span>
         <span class="iconfont shop-query-submit">&#xe60f;</span>
     </form>
-</div>
\ No newline at end of file
+</div>