Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -106,7 +106,7 @@ const getUserReturn = (uid, page) => {
                     let cnAlphabet = good.cnAlphabet ? good.cnAlphabet : '';
 
                     good.hidePrice = true;
-                    good.goodUrl = helpers.urlFormat(`/product/pro_${good.productId}_${good.goodsId}/${cnAlphabet}.html`); // eslint-disable-line
+                    good.goodUrl = helpers.urlFormat(`/product/pro_${good.productId}_${good.goodsId}/${cnAlphabet}.html`); // eslint-disable-line
                 });
             });
         }
@@ -596,7 +596,7 @@ const getChangeGoodsList = (orderCode, uid) => {
                     good.showCheckbox = true;
                     good.hidePrice = true;
                     good.buyNumber = 1;
-                    good.goodUrl = helpers.urlFormat(`/product/pro_${good.productId}_${good.goodsId}/${cnAlphabet}.html`); //eslint-disable-line
+                    good.goodUrl = helpers.urlFormat(`/product/pro_${good.productId}_${good.goodsId}/${cnAlphabet}.html`); //eslint-disable-line
                 });
             }
         }
@@ -669,7 +669,7 @@ const _setExchangeDetailData = (data) => {
                 list.reminder = true;
                 list.inDoor = true;
                 list.auditSuccess = true;
-                list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
+                list.view = `/me/order/detail/?orderCode=${data.orderCode}`;
             }
 
             break;
@@ -677,7 +677,7 @@ const _setExchangeDetailData = (data) => {
             if (data.deliveryTpyeName === '寄回换货') {
                 list.takeGoods = true;
                 list.auditSuccess = true;
-                list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
+                list.view = `/me/order/detail/?orderCode=${data.orderCode}`;
             } else {
                 list.takeGoods = true;
             }
@@ -687,14 +687,14 @@ const _setExchangeDetailData = (data) => {
                 send: true,
                 doubt: true,
                 auditSuccess: true,
-                view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
+                view: `/me/order/detail/?orderCode=${data.orderCode}`
             });
             break;
         case 40:
             Object.assign(list, {
                 finish: true,
                 auditSuccess: true,
-                view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
+                view: `/me/order/detail/?orderCode=${data.orderCode}`
             });
             break;
         case 91:

@@ -152,6 +152,7 @@
                     <p class="subtext">color: {{newColorName}}<br>size: {{newSizeName}}</p>
                 </div>
             </div>
+            {{#if evidenceImages}}
             <div class="reason-info">
                 <span>问题描述：{{remark}}</span>
                 <div class="reason-img">照片凭证：
@@ -164,6 +165,7 @@
                     </div>
                 </div>
             </div>
+            {{/if}}
             {{/ goodsList}}
         </div>
     </div>

@@ -184,7 +184,7 @@ const setSeoInfo = (goodInfo, nav) => {
  * @return { Object } 面包屑导航数据
  */
 const setPathNav = (data, name, channel) => {
-    let resData = {};
+    let navs = [];
     let link = channel,
         gender;
 
@@ -203,11 +203,11 @@ const setPathNav = (data, name, channel) => {
             break;
     }
 
+    navs.push({
+        link: helpers.urlFormat(`/${link}`),
+        name: `${_.toUpper(channel)}首页`
+    });
     if (!_.isEmpty(data)) {
-        let navs = [{
-            link: helpers.urlFormat(`/${link}`),
-            name: `${_.toUpper(channel)}首页`
-        }];
         let sort = _.get(data, 'sort[0]', {});
 
         if (!_.isEmpty(sort)) {
@@ -222,27 +222,27 @@ const setPathNav = (data, name, channel) => {
 
             // 二级分类
             if (!_.isEmpty(sort.sub)) {
+                let subSort = sort.sub[0];
+
                 navs.push({
                     link: helpers.urlFormat('/product/list', {
                         msort: sort.sort_id,
-                        misort: sort.sub.sort_id,
+                        misort: subSort.sort_id,
                         gender: gender
                     }),
-                    name: sort.sub[0].sort_name,
-                    pathTitle: sort.sub[0].sort_name
+                    name: subSort.sort_name,
+                    pathTitle: subSort.sort_name
                 });
             }
         }
-
-        navs.push({
-            name: name,
-            pathTitle: name
-        });
-
-        resData.nav = navs;
     }
 
-    return resData;
+    navs.push({
+        name: name,
+        pathTitle: name
+    });
+
+    return {nav: navs};
 };
 
 /**

@@ -202,7 +202,7 @@
                             {{# basic}}
                                 <li>
                                     <label class="title">{{key}}<span></span></label>
-                                    : <span class="info">{{value}}</span>
+                                    ：<span class="info">{{value}}</span>
                                 </li>
                             {{/ basic}}
                         </ul>
@@ -211,7 +211,7 @@
                                 {{# comfort}}
                                     <li>
                                         <label class="title">{{name}}<span></span></label>
-                                        : <span class="min-des info">{{minDes}}</span>
+                                        ：<span class="min-des info">{{minDes}}</span>
                                         {{# blocks}}
                                             <span class="comfort-block{{#if cur}} cur{{/if}}"></span>
                                         {{/ blocks}}

@@ -23,8 +23,11 @@ module.exports = {
     cookieDomain: 'yohoblk.com',
     domains: {
         singleApi: 'http://192.168.102.31:8092/',
-        api: 'http://api.yoho.yohoops.org/',
-        service: 'http://service.yoho.yohoops.org/',
+        api: 'http://api-test2.yohops.com:9999/',
+        service: 'http://service-test2.yohops.com:9999/',
+
+        // api: 'http://api.yoho.yohoops.org/',
+        // service: 'http://service.yoho.yohoops.org/',
         search: 'http://192.168.102.216:8080/yohosearch/'
     },
     useOneapm: false,
@@ -131,7 +134,7 @@ if (isProduction) {
     Object.assign(module.exports, {
         appName: 'www.yohoblk.com for test',
         domains: {
-            singleApi: 'http://192.168.102.31:8092/brower',
+            singleApi: 'http://192.168.102.31:8092/',
             api: 'http://testapi.yoho.cn:28078/',
             service: 'http://testservice.yoho.cn:28077/',
             search: 'http://192.168.102.216:8080/yohosearch/'

@@ -10,6 +10,7 @@ const LoginService = require('../../apps/passport/models/login-service');
  */
 module.exports = () => {
     return (req, res, next) => {
+        req.user.uid = 8039837;
 
         // 从 SESSION 中获取到当前登录用户的 UID
         if (req.session && _.isNumber(req.session._LOGIN_UID)) {

@@ -259,7 +259,6 @@ if ($('.chapter-right').find('a').text() === '') {
 
 $('.comments-list').find('li:last').css('border-bottom', 'none');
 
-// $('.good-info').find('.price')
 $('.good-info').each(function() {
     var $this = $(this).find('.price');
 
@@ -267,3 +266,9 @@ $('.good-info').each(function() {
         $this.html($this.text() + '.00');
     }
 });
+
+$('.good-info').each(function(i, ele) {
+    if (i % 4 === 3) {
+        $(ele).css('margin-right', '0');
+    }
+});

@@ -48,6 +48,7 @@ function getResponse(cb) {
 
         if (num > 20 || res) {
             uping = false;
+            $filename.val('');
             clearInterval(inter);
         }
 
@@ -63,9 +64,11 @@ function getResponse(cb) {
 }
 
 $filename.change(function() {
-    uping = true;
-    $upload.submit();
-    getResponse(callback);
+    if ($(this).val()) {
+        uping = true;
+        $upload.submit();
+        getResponse(callback);
+    }
 });
 
 exports.up = up;

@@ -317,7 +317,7 @@
                 height: 12px;
                 border: 1px solid #1d1d1d;
                 display: inline-block;
-                margin: 0 4px;
+                margin: 0 3px;
                 position: relative;
                 top: 1px;
             }
@@ -428,7 +428,7 @@
             }
 
             img {
-                margin-top: -7px;
+                margin-top: -5px;
                 display: inline-block;
                 border: 1px solid #fff;
                 border-radius: 50%;
@@ -477,7 +477,7 @@
 
             .cn {
                 font-size: 14px;
-                line-height:24px;
+                line-height: 24px;
             }
 
             .en {