Merge branch 'hotfix/delCartTmp' into gray

@@ -869,7 +869,7 @@ const _getMaterialDataBySizeInfo = (sizeInfo) => {
         })),
         washTips: {
             tip: _.get(sizeInfo, 'washRemindTipsBo.remindTips', ''),
-            img: _.get(sizeInfo, 'washRemindTipsBo.img', '')
+            img: _.replace(_.get(sizeInfo, 'washRemindTipsBo.img', ''), 'http:', '')
         }
     };
 };

@@ -143,7 +143,7 @@
                             <span id="open-soon" class="buy-btn item-buy dis">即将开售</span>
                         {{/ openSoon}}
                         {{#if notForSale}}
-                            <span class="buy-btn dis"> <i class="iconfont">&#xe61c;</i> 非买品 </span>
+                            <span class="buy-btn dis"> <i class="iconfont">&#xe61c;</i> 非卖品 </span>
                         {{/if}}
                         {{#if addToCart}}
                             <span id="add-to-cart" class="buy-btn item-buy add-to-cart"> <i class="iconfont">

@@ -61,7 +61,7 @@ module.exports = function(imageUrl, opts) {
         } else {
             query = 'imageView2/2/interlace/1/q/' + (params.q || 75);
         }
-        return uri + '?' + query;
+        return uri + '?' + query + '|imageslim';
     } else {
         return imageUrl;
     }

@@ -1265,7 +1265,8 @@ function loadConsult() {
     var consultsTpl = require('hbs/product/consult-item.hbs');
     var $consultsUl = $('#consults-ul'),
         $consultNum = $('.consult-num'),
-        loadingConsults = false;
+        loadingConsults = false,
+        passFlag = true;
 
     // 顾客咨询
     function loadConsults(nowPage) {
@@ -1399,17 +1400,17 @@ function loadConsult() {
             learn: '及时了解回复内容'
         };
 
-        var pass = true;
-
         if (content === '') {
             $textArea.attr('placeholder', '请输入咨询内容');
             $textArea.addClass('err');
-            pass = false;
+            return;
         }
-        if (pass === false) {
+        if (passFlag === false) {
             return;
         }
 
+        passFlag = false;
+
         $.ajax({
             type: 'POST',
             url: '/product/detail/consult',
@@ -1440,6 +1441,8 @@ function loadConsult() {
                 // 跳转登录页
                 location.href = data.data.refer;
             }
+
+            passFlag = true;
         });
     });
 

@@ -61,7 +61,7 @@ module.exports = {
             } else {
                 query = 'imageView2/2/interlace/1/q/' + (params.q || 75);
             }
-            return uri + '?' + query;
+            return uri + '?' + query + '|imageslim';
         } else {
             return '';
         }