Merge branch 'release/5.3' into gray

@@ -78,11 +78,11 @@
     </section>
 
     {{#if isJit}}
-    {{> me/order/jit-more}}
+    {{> home/order/jit-more}}
     {{/if}}
     <section class="block goods-bottom">
         {{#each goods}}
-        {{> me/order/good}}
+        {{> home/order/good}}
         {{/each}}
         <div class="goods-num">共{{num}}件商品  合计<span>{{goodsPrice}}</span></div>
     </section>
@@ -168,7 +168,7 @@
             实付金额
             <span>¥{{round price 2}}</span>
         </div>
-    
+
         {{#if returnYohoCoin}}
         <div class="yoho-coin">
             共返有货币: {{yohoCoinNum}}个

@@ -15,7 +15,7 @@ exports.get = (req, res, next) => {
 
             req.session.captcha = codeStr;
 
-            data.src = result.data.verifiedGraphicCode;
+            data.src = result.data.verifiedGraphicCode.replace(/^http:/, '');
 
             return res.json(data);
         }

@@ -16,21 +16,21 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//127.0.0.1:5001',
     domains: {
-        api: 'http://api-test3.yohops.com:9999/',
-        service: 'http://service-test3.yohops.com:9999/',
-        liveApi: 'http://testapi.live.yohops.com:9999/',
-        singleApi: 'http://api-test3.yohops.com:9999/',
-        imSocket: 'ws://im.yohobuy.com:10240',
-        imCs: 'http://im.yohobuy.com/api',
-        imServer: 'http://im.yohobuy.com/server'
+        // api: 'http://api-test3.yohops.com:9999/',
+        // service: 'http://service-test3.yohops.com:9999/',
+        // liveApi: 'http://testapi.live.yohops.com:9999/',
+        // singleApi: 'http://api-test3.yohops.com:9999/',
+        // imSocket: 'ws://im.yohobuy.com:10240',
+        // imCs: 'http://im.yohobuy.com/api',
+        // imServer: 'http://im.yohobuy.com/server'
 
-        // api: 'http://api.yoho.cn/',
-        // service: 'http://service.yoho.cn/',
-        // liveApi: 'http://api.live.yoho.cn/',
-        // singleApi: 'http://single.yoho.cn/',
-        // imSocket: 'ws://imsocket.yohobuy.com:10000',
-        // imCs: 'https://imhttp.yohobuy.com/api',
-        // imServer: 'https://imhttp.yohobuy.com/server'
+        api: 'http://api.yoho.cn/',
+        service: 'http://service.yoho.cn/',
+        liveApi: 'http://api.live.yoho.cn/',
+        singleApi: 'http://single.yoho.cn/',
+        imSocket: 'ws://imsocket.yohobuy.com:10000',
+        imCs: 'https://imhttp.yohobuy.com/api',
+        imServer: 'https://imhttp.yohobuy.com/server'
     },
     subDomains: {
         host: '.m.yohobuy.com',

@@ -58,7 +58,14 @@ module.exports = () => {
 
                     // 已经废弃，只是对老页面做兼容 --start
                 case 'sale': // sale 跳转到 m.yohobuy.com/product/sale
-                    res.redirect(301, helpers.urlFormat('/product/sale', req.query, 'default'));
+                    if (_.keys(req.query).length) {
+                        req.query.title = '专区活动';
+
+                        delete req.query['openby:yohobuy'];
+                        res.redirect(301, helpers.urlFormat('/', req.query, 'list'));
+                    } else {
+                        res.redirect(301, helpers.urlFormat('/product/sale', req.query, 'default'));
+                    }
                     return;
                 case 'cart': // 购物车 跳转到 m.yohobuy.com/cart/index/index
                     res.redirect(301, helpers.urlFormat('/cart/index/index', req.query, 'default'));

@@ -5,7 +5,7 @@
     </header>
     <section class="order-goods">
         {{# goods}}
-            {{> me/order/good}}
+            {{> home/order/good}}
         {{/ goods}}
     </section>
     <footer class="footer">
@@ -63,6 +63,6 @@
                 </a>
             </div>
         {{/if}}
-        
+
     {{/if}}
-</div>
\ No newline at end of file
+</div>

@@ -6,6 +6,6 @@
     </div>
 {{^}}
     {{#each orders}}
-        {{> me/order/order}}
+        {{> home/order/order}}
     {{/each}}
-{{/if}}
\ No newline at end of file
+{{/if}}

@@ -44,9 +44,6 @@ plusstar = {
 
         // 事情委托机制
         $tabUlDom.bind('click', function(event) {
-            if (!window._yas || !window._yas.sendCustomInfo) {
-                return;
-            }
 
             $liDom = $(event.target).closest('li');
 
@@ -59,6 +56,9 @@ plusstar = {
             that.ParentLiDom = $liDom;// 保留当前tab先中的对象
             that.tabNav($liDom.data('code'));
 
+            if (!window._yas || !window._yas.sendCustomInfo) {
+                return;
+            }
             // 点击潮流优选上方的TAB按钮时
             window._yas.sendCustomInfo({
                 op: 'YB_FASHION_TAB_C',

@@ -96,10 +96,10 @@ C_ID = window._ChannelVary[window.cookie('_Channel')];
             },
             dataType: 'json',
             success: function(data) {
-                $('.con').text(data.intro);
                 if (data.collected) {
                     $('.brand-header .btn-col').addClass('coled');
                 }
+                $('.con').html(data.intro);
             },
             error: function() {
                 tip.show('网络断开连接了~');
@@ -116,7 +116,7 @@ C_ID = window._ChannelVary[window.cookie('_Channel')];
                 if (data.is_favorite === 'Y') {
                     $('.brand-header .btn-col').addClass('coled');
                 }
-                $('.con').text(data.shop_intro);
+                $('.con').html(data.shop_intro);
             },
             error: function() {
                 tip.show('网络断开连接了~');
@@ -410,7 +410,7 @@ function search(opt) {
             }
 
             yasparm = {
-                C_ID: C_ID, 
+                C_ID: C_ID,
                 BRAND_ID: setting.shop_id,
                 PAGE_NUM: setting.page,
                 FILTER_VALUE: opt ? JSON.stringify(filext).replace(/\{|\}|\"/g, '') : '',
@@ -440,7 +440,7 @@ function search(opt) {
                     }, 200);
                 }
             } else {
-                
+
 
                 if (nav.reload) {
 
@@ -452,8 +452,8 @@ function search(opt) {
                         } else if ($(goodInfo).hasClass('total')) {
                             total = $(goodInfo).data('id');
                         }
-                    }); 
-                   
+                    });
+
                     yasparm = Object.assign(yasparm, {
                         PRD_LIST: JSON.stringify(goodIds).replace(/\[|\]/g, ''),
                         RES_QTY: total
@@ -906,10 +906,10 @@ $('#goods-container').on('click', '.good-info', function() {
                 PRD_NUM: PRD_NUM,
                 PAGE_NUM: Math.ceil(PRD_NUM / 60),
                 FILTER_VALUE: FILTER_VALUE,
-                SORT_TYPE: argument ? argument.type : '' 
+                SORT_TYPE: argument ? argument.type : ''
             })
         }, true);
     }
 
     // return false;
-});
\ No newline at end of file
+});

@@ -381,7 +381,7 @@ var chat = {
                 break;
             case allTypes.ROBOT_SEND:
                 viewData.from = 'rebot';
-                viewData.avatar = socketConf.defaultUserHead;
+                viewData.avatar = socketConf.rebotUserHead;
                 break;
 
             default:

-/* global gDomains */
+/* global gDomains, gAssetURI */
 /**
  * socket config
  *
@@ -9,6 +9,7 @@
 var config = {
     servers: [gDomains.imSocket],
     defaultUserHead: '//img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif',
+    rebotUserHead: `${gAssetURI}/img/service/chat/im-robot.png`,
     recType: {
         ENTER: 1,                 // 用户进入
         LINK_SUCCESS: 2,          // 连线人工客服回应