Merge branch 'master' into release/5.1

@@ -537,7 +537,7 @@ const _getProductComfort = (data) => {
  * 基础商品描述
  * 基础商品描述
  */
  */
 const _getBasicDescription = (productDescBo) => {
 const _getBasicDescription = (productDescBo) => {
-    let sex = (function(gender) {
+    let sex = (function (gender) {
         if (gender === 1) {
         if (gender === 1) {
             return '男款';
             return '男款';
         } else if (gender === 2) {
         } else if (gender === 2) {
@@ -639,7 +639,7 @@ const _getSizeData = (sizeInfo) => {
     let boyReference = _.get(sizeInfo, 'productExtra.boyReference', false);
     let boyReference = _.get(sizeInfo, 'productExtra.boyReference', false);
     let girlReference = _.get(sizeInfo, 'productExtra.girlReference', false);
     let girlReference = _.get(sizeInfo, 'productExtra.girlReference', false);
     let gender = _.get(sizeInfo, 'productDescBo.gender', 3);
     let gender = _.get(sizeInfo, 'productDescBo.gender', 3);
-    let referenceName = (function() {
+    let referenceName = (function () {
         if (gender === 3 && boyReference) {
         if (gender === 3 && boyReference) {
             return '参考尺码(男)';
             return '参考尺码(男)';
         } else if (gender === 3 && girlReference) {
         } else if (gender === 3 && girlReference) {
@@ -890,7 +890,7 @@ const _getSizeAttrByMaxSortId = (maxSortId, sizeList) => {
     }
     }
 
 
     // 不同分类，取得属性值不同
     // 不同分类，取得属性值不同
-    let attributeIds = (function(id) {
+    let attributeIds = (function (id) {
         if (id === 1 && id === 2) {
         if (id === 1 && id === 2) {
             return [3, 4];
             return [3, 4];
         } else if (id === 3) {
         } else if (id === 3) {
@@ -1145,7 +1145,11 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => {
         // 上市期
         // 上市期
         if (propOrigin('expect_arrival_time')) {
         if (propOrigin('expect_arrival_time')) {
             result.arrivalDate = `${propOrigin('expect_arrival_time')}`;
             result.arrivalDate = `${propOrigin('expect_arrival_time')}`;
+
+            if (propOrigin('format_sales_price', '0') !== '0') {
                 result.presalePrice = propOrigin('format_sales_price');
                 result.presalePrice = propOrigin('format_sales_price');
+            }
+
             delete result.salePrice;
             delete result.salePrice;
             result.hasOtherPrice = false;
             result.hasOtherPrice = false;
         }
         }

@@ -119,7 +119,7 @@
         <ul class="left-list">
         <ul class="left-list">
             {{#each list}}
             {{#each list}}
                 <li>
                 <li>
-                    <a target="_blank" href="{{url}}"><img src="{{img}}" alt="{{title}}" /></a>
+                    <a target="_blank" href="{{url}}"><img src="{{img}}" alt="{{title}}" width="100%" /></a>
                 </li>
                 </li>
             {{/each}}
             {{/each}}
         </ul>
         </ul>