Merge branch 'master' of http://git.topboom0912.com/czj/rebatedine-mini into master

# Conflicts:
#	src/pages/index.vue

src/components/activityCard.vue

@@ -1,11 +1,11 @@
 <template>
-  <view class="activity-card-main u-flex u-col-bottom"
+  <view class="activity-card-main u-flex u-col-top"
         @click.stop="clickCard">
     <image class="card-image"
            lazy-load
            :src="value.imgs | imgFilter(2)"
            mode="aspectFill"></image>
-    <view class="u-flex-1 u-m-l-16 u-p-t-8">
+    <view class="u-flex-1 u-m-l-16 u-p-t-4">
       <view class="card-title u-font-28 bold u-line-1">{{value.title}}</view>
       <view class="card-desc u-flex u-content-color u-m-t-4 u-m-b-12">
         <view>平台：{{value.plat_type | platFilter}}</view>