Merge remote-tracking branch 'origin/master'

sheep/components/s-seckill-block/s-seckill-block.vue

@@ -1,4 +1,4 @@
-<!-- 装修商品组件：【拼团】商品卡片 -->
+<!-- 装修商品组件：【秒杀】商品卡片 -->
 <template>
   <!-- 商品卡片 -->
   <view>