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

src/components/fixedBottom.vue

@@ -27,8 +27,10 @@ export default {
 <style lang="scss" scoped>
   .fixed-btn-main {
     position: fixed;
-    bottom: env(safe-area-inset-bottom);
+    bottom: 0;
+    padding-bottom: env(safe-area-inset-bottom);
     width: 100%;
+    background-color: #fff;
     box-shadow: 0 0 8px 0 rgba($color: #000000, $alpha: 0.1);
   }
 </style>

src/pages/index.vue

@@ -71,6 +71,7 @@
                   v-for="(item, index) in activityList"
                   :key="index">
               <activity-card :value="item"
+                             @clickCard="toActivityDetail"
                              @signUp="toActivityDetail"
                              @clickYBM="toActivityDetail"
                              @clickYQG="toActivityDetail">
@@ -200,6 +201,7 @@ export default {
         this.activityList = this.activityList.concat(data.rows)
         this.isLoadMore = this.total !== this.activityList.length
       }
+      uni.stopPullDownRefresh()
     },
     // 活动类型切换
     tabsChange (index) {