Merge branch 'release/1.0' of 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:

@@ -26,8 +26,8 @@
                             {{/stateText}}
                         </div>
                         <div class="desc">
-                            <div class="brand-name">{{brandName}}</div>
-                            <div class="product-name">{{productName}}</div>
+                            <div class="brand-name"><a href="{{url}}" target="_blank">{{brandName}}</a></div>
+                            <div class="product-name"><a href="{{url}}" target="_blank">{{productName}}</a></div>
                             <p class="price">¥{{round salesPrice 2}}</p>
                         </div>
 

@@ -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>

@@ -40,6 +40,7 @@ const shop = {
                     nav: nav
                 };
                 data.banner = result;
+                data.title = result.name;
                 data.shopId = result.shopId;
                 data.mores = {};
                 result.menus.forEach(m => {
@@ -110,7 +111,7 @@ const shop = {
 
         ShopData.getShopHeadData(domain, shopId, uid).then(result => {
             data.banner = result;
-
+            data.title = result.name;
             if (data.banner.banner) {
                 data.banner.banner = data.banner.banner.split('?')[0];
             }

@@ -47,7 +47,7 @@ exports.createPagination = function(pagination, options) {
 
     var template;
 
-    if (!pagination) {
+    if (!pagination || pagination.pageTotal === 1) {
         return '';
     }
 

@@ -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');
+    }
+});

@@ -32,6 +32,14 @@ function doCancel(ids) {
     });
 }
 
+function goodsChoose() {
+    if ($(this).parent('.goods-info', $root).hasClass('choose')) {
+        $(this).parent('.goods-info', $root).removeClass('choose');
+    } else {
+        $(this).parent('.goods-info', $root).addClass('choose');
+    }
+}
+
 
 function eventBind() {
     $('.check-all', $root).check({
@@ -45,14 +53,8 @@ function eventBind() {
         }
     });
 
-    $('.goods-img', $root).click(function() {
-        if ($(this).parent('.goods-info', $root).hasClass('choose')) {
-            $(this).parent('.goods-info', $root).removeClass('choose');
-        } else {
-            $(this).parent('.goods-info', $root).addClass('choose');
-        }
-
-    });
+    $('.choose-icon', $root).click(goodsChoose);
+    $('.goods-img', $root).click(goodsChoose);
 
     $('.btn.cancel', $root).click(function() {
         var id = $(this).parents('.goods-info').data('id');

@@ -325,3 +325,7 @@ a {
     border: 1px solid #f0f0f0;
     text-indent: 5px;
 }
+
+.mr15 {
+    margin-right: 15px;
+}

@@ -30,7 +30,8 @@
 
         .editorial-title {
             width: 100%;
-            min-height: 50px;
+            min-height: 70px;
+            line-height: 1.4;
             padding: $space;
             position: absolute;
             bottom: 0;

@@ -182,7 +182,7 @@
             .go-bag-btn {
                 font-size: 20px;
                 line-height: 1;
-                padding-top: 24px;
+                padding-top: 20px;
                 border-top: 1px solid #ddd;
                 text-align: center;
             }
@@ -234,6 +234,7 @@
 
             .del-good-btn {
                 cursor: pointer;
+                color: #999;
             }
         }
     }

@@ -4,10 +4,11 @@
     }
 
     .cart-header {
-        margin: 10px auto;
+        margin: 12px auto 48px;
         width: 100%;
         padding: 30px;
         border-bottom: 1px solid #eee;
+        padding-bottom: 20px;
 
         .titles {
             position: relative;

@@ -2,8 +2,8 @@ $hoverColor: #379ed6;
 
 .blk-cart-page {
     .pros-group {
-        margin-bottom: 30px;
-        border-top: 1px solid #eee;
+        /*margin-bottom: 30px;
+        border-top: 1px solid #eee;*/
 
         &:first-child {
             border-top: none;

@@ -7,11 +7,11 @@
         </div>
         <div class="info">
             <a href="/product/pro_{{product_id}}_{{goods_id}}/{{cn_alphabet}}.html" class="name" target="_blank">{{product_name}}</a>
-            <p>颜色：{{color_name}} 尺码：{{size_name}}</p>
+            <span style="margin-right:15px;">颜色: {{color_name}}</span> <span>尺码: {{size_name}}</span>
         </div>
         <div class="price">
             <p>¥{{round sales_price 2}} X{{buy_number}}</p>
             <span class="del-good-btn" data-type="{{goods_type}}" data-num="{{buy_number}}" data-num="{{buy_number}}" data-sku="{{product_sku}}" data-pid="{{promotion_id}}">删除</span>
         </div>
     </dd>
-{{/ goods}}
\ No newline at end of file
+{{/ goods}}