Merge branch 'release/5.1' of git.yoho.cn:fe/yohobuywap-node into release/5.1

@@ -229,7 +229,12 @@ function updateConformButtonClassAndText() {
         if ($chosed.closest('.zero-stock').length === 2) {
             $('#chose-btn-sure').css('background-color', '#c0c0c0').html('已售罄');
         } else {
-            $('#chose-btn-sure').css('background-color', '#eb0313').html(isEdit ? '确认' : '立即购买');
+            if ($('.seckill-time').length >= 1) {
+                $('#chose-btn-sure').css('background-color', '#eb0313').html(isEdit ? '确认' : '立即购买');
+            } else {
+                $('#chose-btn-sure').css('background-color', '#eb0313').html(isEdit ? '确认' : '加入购物车');
+            }
+
         }
     }