Merge branch 'feature/new-product-detail' of http://git.yoho.cn/fe/yohobuy-node …

…into feature/new-product-detail

@@ -346,7 +346,7 @@ const _getSkuDataByProductBaseInfo = (data) => {
             }
             }
 
 
             // 是否显示到货通知
             // 是否显示到货通知
-            size.notify = cur.isSuppled === 'Y' && cur.storage_number === 0 ? 'Y' : 'N';
+            size.notify = size.isSuppled === 'Y' && size.storage_number === 0 ? 'Y' : 'N';
 
 
             goodsGroup.size.push({
             goodsGroup.size.push({
                 name: size.size_name,
                 name: size.size_name,
@@ -842,7 +842,7 @@ const _getDetailDataBySizeInfo = (sizeInfo) => {
         '<img src=': '<img class="lazy img-responsive" width="765" height="200" ' +
         '<img src=': '<img class="lazy img-responsive" width="765" height="200" ' +
         'src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" ' +
         'src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" ' +
         'data-original=',
         'data-original=',
-        '<img border="0" src=': '<img border="0" class="lazy img-responsive" width="200" height="574" ' +
+        '<img border="0" src=': '<img border="0" class="lazy img-responsive" width="756" height="200" ' +
         'src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" ' +
         'src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" ' +
         'data-original='
         'data-original='
     };
     };

@@ -5,7 +5,7 @@
 'use strict';
 'use strict';
 
 
 const api = require('./favorite-api');
 const api = require('./favorite-api');
-const serviceApi = global.yoho.ServiceAPI;
+const serviceApi = global.yoho.SingleAPI;
 
 
 const _ = require('lodash');
 const _ = require('lodash');
 
 
@@ -17,7 +17,7 @@ const cancelFavAsync = _.partial(api.cancelFavAsync, _, _, 'brand');
 
 
 const getShopFavNumAsync = (sid) => {
 const getShopFavNumAsync = (sid) => {
     return serviceApi.get('brower/favorite/queryFavoriteCountByShopIds', {
     return serviceApi.get('brower/favorite/queryFavoriteCountByShopIds', {
-        favIds: [sid],
+        favIds: `[${sid}]`,
         type: 'shop'
         type: 'shop'
     });
     });
 };
 };

@@ -65,6 +65,8 @@
             <span class="sale-tip">{{saleTip}}</span>
             <span class="sale-tip">{{saleTip}}</span>
         {{/if}}
         {{/if}}
 
 
+        <div class="line"></div>
+
         {{> product/price-list}}
         {{> product/price-list}}
 
 
         {{> product/activity-list}}
         {{> product/activity-list}}

 <p class="market-price">
 <p class="market-price">
 
 
     {{#if marketPrice}}
     {{#if marketPrice}}
-        <br>
+        <span class="price-row">
             <span class="title">吊牌价：</span>
             <span class="title">吊牌价：</span>
             <span class="price{{#if hasOtherPrice}} has-other-price{{/if}}">{{marketPrice}}</span>
             <span class="price{{#if hasOtherPrice}} has-other-price{{/if}}">{{marketPrice}}</span>
+        </span>
     {{/if}}
     {{/if}}
 
 
 {{#if salePrice}}
 {{#if salePrice}}
         <br>
         <br>
-    <span>
+    <span class="promotion-price">
         <span class="title">促销价：</span>
         <span class="title">促销价：</span>
         <span class="price">{{salePrice}}</span>
         <span class="price">{{salePrice}}</span>
     </span>
     </span>
@@ -16,10 +17,10 @@
 
 
 {{#if studentsPrice}}
 {{#if studentsPrice}}
         <br>
         <br>
-    <p class="students-price">
+    <span class="students-price">
         <span class="title">学生价</span>
         <span class="title">学生价</span>
         <span class="price">{{studentsPrice}}</span>
         <span class="price">{{studentsPrice}}</span>
-    </p>
+    </span>
 {{/if}}
 {{/if}}
 
 
 {{#if presalePrice}}
 {{#if presalePrice}}

@@ -16,17 +16,17 @@ module.exports = {
     siteUrl: 'http://www.yohobuy.com',
     siteUrl: 'http://www.yohobuy.com',
     cookieDomain: '.yohobuy.com',
     cookieDomain: '.yohobuy.com',
     domains: {
     domains: {
-        favApi: 'http://192.168.102.31:8092/brower',
 
 
-        // api: 'http://api-test3.yohops.com:9999/',
-        // service: 'http://service-test3.yohops.com:9999/',
-        // //
-        api: 'http://api.yoho.cn/',
-        service: 'http://service.yoho.cn/',
+        // test2
+        singleApi: 'http://192.168.102.27:8092/brower',
+        api: 'http://api-test2.yohops.com:9999/',
+        service: 'http://service-test2.yohops.com:9999/',
+
+        //api: 'http://api.yoho.cn/',
+        //service: 'http://service.yoho.cn/',
 
 
          //api: 'http://dev-api.yohops.com:9999/',
          //api: 'http://dev-api.yohops.com:9999/',
          //service: 'http://dev-service.yohops.com:9999/',
          //service: 'http://dev-service.yohops.com:9999/',
-
         search: 'http://192.168.102.216:8080/yohosearch/'
         search: 'http://192.168.102.216:8080/yohosearch/'
     },
     },
     subDomains: {
     subDomains: {

@@ -24,8 +24,8 @@ var Dialog = require('../common/dialog').Dialog;
 
 
 var $main = $('.main'),
 var $main = $('.main'),
     id = $main.data('id'),
     id = $main.data('id'),
-    shopId = $main.data('shop'),
-    brandId = $('#brand-favour').data('id'),
+    shopId = parseInt($main.data('shop')),
+    brandId = parseInt($('#brand-favour').data('id')),
     md5 = $main.data('md5'),
     md5 = $main.data('md5'),
     skn = $main.data('skn'),
     skn = $main.data('skn'),
     deposit = $main.data('deposit') === 'Y',
     deposit = $main.data('deposit') === 'Y',
@@ -523,6 +523,10 @@ bindEvent.add(function() {
             return;
             return;
         }
         }
 
 
+        if (!getUid()) {
+            return window.jumpUrl(window.signinUrl());
+        }
+
         var opt = {  //eslint-disable-line
         var opt = {  //eslint-disable-line
             className: 'notify-goods-wrapper',
             className: 'notify-goods-wrapper',
             closeIcon: true,
             closeIcon: true,

@@ -168,8 +168,6 @@
             font-size: 13px;
             font-size: 13px;
             line-height: 20px;
             line-height: 20px;
             padding-top: 15px;
             padding-top: 15px;
-            padding-bottom: 15px;
-            border-bottom: 1px solid #eaeceb;
         }
         }
 
 
         .brand-name {
         .brand-name {
@@ -181,6 +179,7 @@
             color: black;
             color: black;
             font-size: 13px;
             font-size: 13px;
             letter-spacing: 5px;
             letter-spacing: 5px;
+            line-height: 20px;
         }
         }
 
 
         .market-price {
         .market-price {
@@ -197,6 +196,8 @@
             font-size: 22px;
             font-size: 22px;
             line-height: 24px;
             line-height: 24px;
             font-weight: bold;
             font-weight: bold;
+            display: inline-block;
+            vertical-align: middle;
         }
         }
 
 
         .promotion {
         .promotion {
@@ -227,6 +228,17 @@
             margin-left: 20px;
             margin-left: 20px;
         }
         }
 
 
+        .price-row {
+            display: inline-block;
+            height: 20px;
+            margin-bottom: 16px;
+        }
+
+        .promotion-price {
+            display: inline-block;
+            height: 24px;
+        }
+
         .vip-price {
         .vip-price {
             line-height: 14px;
             line-height: 14px;
             color: #707070;
             color: #707070;
@@ -310,7 +322,7 @@
         }
         }
 
 
         .activity-wrapper {
         .activity-wrapper {
-            margin-top: 22px;
+            margin-top: 16px;
             position: relative;
             position: relative;
             width: 100%;
             width: 100%;
 
 
@@ -545,7 +557,8 @@
             width: 100%;
             width: 100%;
             height: 2px;
             height: 2px;
             border-bottom: 1px solid #eaeceb;
             border-bottom: 1px solid #eaeceb;
-            margin-bottom: 22px;
+            margin-top: 20px;
+            margin-bottom: 20px;
         }
         }
 
 
         .chose-count .title {
         .chose-count .title {
@@ -2279,6 +2292,7 @@
     width: 560px;
     width: 560px;
     height: 560px;
     height: 560px;
     border: 2px solid #b0b0b0;
     border: 2px solid #b0b0b0;
+    background: white;
     display: block;
     display: block;
     position: absolute;
     position: absolute;
     overflow: hidden;
     overflow: hidden;