Merge remote-tracking branch 'origin/release-20170915' into release-20170915

pages/index.vue

@@ -5,7 +5,7 @@
     </div>
     <div v-if="!isMobile">
      <!-- <christmas v-if="isOpen" @listenopen="listenOpen" :hasNewYear="hasNewYear"></christmas>-->
-      <new-year></new-year>
+     <!-- <new-year></new-year>-->
       <carousel>
         <kind-category @loadchild="loadProductKinds"></kind-category>
       </carousel>