Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -1085,6 +1085,9 @@
             },
             },
             {
             {
                 is_advance: true //再到着
                 is_advance: true //再到着
+            },
+            {
+                is_soon_sold_out: true //即将售罄
             }
             }
         ],
         ],
         
         

@@ -82,22 +82,22 @@ headerNavHammer.on('tap', function(e) {
     }
     }
 });
 });
 
 
-formHammer = new Hammer(document.getElementById('img-form'));
+if (document.getElementById('img-form') !== null) {
+    formHammer = new Hammer(document.getElementById('img-form'));
 
 
-formHammer.on('tap', function(e) {
-    if ($(e.target).hasClass('upload-img-remove')) {
-        $uploadImgList.html('');
-        imgStr = '';
-        setTimeout(function() {
-            $imgAdd.show();
-        }, 50);
+    formHammer.on('tap', function(e) {
+        if ($(e.target).hasClass('upload-img-remove')) {
+            $uploadImgList.html('');
+            imgStr = '';
+            setTimeout(function() {
+                $imgAdd.show();
+            }, 50);
 
 
-    }
-});
+        }
+    });
+}
 
 
 // 点赞与取消点赞
 // 点赞与取消点赞
-// suggestContentHammer = new Hammer(document.getElementById('suggest-content'));
-
 $likeBtn.bind('click', function() {
 $likeBtn.bind('click', function() {
     var id = $(this).closest('.suggest-item').attr('data-id'),
     var id = $(this).closest('.suggest-item').attr('data-id'),
         $that = $(this);
         $that = $(this);

@@ -110,7 +110,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
 
 
     //发表意见
     //发表意见
     .create-new-suggest {
     .create-new-suggest {
-        display: block;
+        display: inline-block;
         color: #444;
         color: #444;
         width: 100%;
         width: 100%;
         height: pxToRem(88px);
         height: pxToRem(88px);

@@ -69,6 +69,10 @@ $basicBtnC:#eb0313;
               border: 1px solid #000;
               border: 1px solid #000;
               color: #000;
               color: #000;
           }
           }
+          .soonSoldOut-tag{
+              background-color:#ffac5b;
+              color:#fff;
+          }
 }
 }
 .good-detail-page {
 .good-detail-page {
     overflow: hidden;
     overflow: hidden;

@@ -2,6 +2,7 @@
 <div class="good-detail-page yoho-page">
 <div class="good-detail-page yoho-page">
     <div class="banner-container">
     <div class="banner-container">
         <div class="tag-container">
         <div class="tag-container">
+            <p class="good-tag soonSoldOut-tag">即将售罄</p>
             {{# tags}}
             {{# tags}}
                 {{# is_new}}
                 {{# is_new}}
                     <p class="good-tag new-tag">NEW</p>
                     <p class="good-tag new-tag">NEW</p>
@@ -18,6 +19,9 @@
                 {{# is_limited}}
                 {{# is_limited}}
                     <p class="good-tag limit-tag">限量商品</p>
                     <p class="good-tag limit-tag">限量商品</p>
                 {{/ is_limited}}
                 {{/ is_limited}}
+                {{# is_soon_sold_out}}
+                    <p class="good-tag soonSoldOut-tag">即将售罄</p>
+                {{/ is_soon_sold_out}}
             {{/ tags}}
             {{/ tags}}
         </div>
         </div>
         {{# bannerTop}}
         {{# bannerTop}}
@@ -102,7 +106,7 @@
 
 
     <div id="productDesc"></div>
     <div id="productDesc"></div>
     {{> product/recommend-for-you}}
     {{> product/recommend-for-you}}
-    
+
     {{#cartInfo}}
     {{#cartInfo}}
     <div class="cart-bar">
     <div class="cart-bar">
         {{#if numInCart}}
         {{#if numInCart}}