shenxin il y a 5 ans
Parent
commit
4205a30a57
2 fichiers modifiés avec 33 ajouts et 34 suppressions
  1. 32 34
      src/pages/classification.vue
  2. 1 0
      src/pages/order.vue

+ 32 - 34
src/pages/classification.vue

@@ -1,25 +1,22 @@
 <template>
   <view class="class-main">
     <network-error />
-    <u-sticky
-      :enable="enable"
-      offset-top="0"
-      h5-nav-height="0"
-      @fixed="stickyFixed"
-      @unfixed="unStickyFixed"
-    >
+    <u-sticky :enable="enable"
+              offset-top="0"
+              h5-nav-height="0"
+              @fixed="stickyFixed"
+              @unfixed="unStickyFixed">
       <view class="class-tabs">
-        <u-tabs
-          is-scroll
-          :list="list"
-          name="category_name"
-          :current="currentTab"
-          height="72"
-          font-size="28"
-          active-color="#111111"
-          inactive-color="#111111"
-          :gutter="32"
-          :bar-style="{
+        <u-tabs is-scroll
+                :list="list"
+                name="category_name"
+                :current="currentTab"
+                height="72"
+                font-size="28"
+                active-color="#111111"
+                inactive-color="#111111"
+                :gutter="32"
+                :bar-style="{
             bottom: '16rpx',
             marginLeft: '-8rpx',
             width: '56rpx',
@@ -28,21 +25,21 @@
             backgroundColor: '#FD5B36',
             boxShadow: '0px 1px 1px 0px rgba(255, 102, 50, 0.3)'
           }"
-          @change="changeTab"
-        >
+                @change="changeTab">
         </u-tabs>
       </view>
     </u-sticky>
     <block v-if="isLocation">
-      <view class="activity-list" :style="{marginTop: `${activityListMT}rpx`}">
+      <view class="activity-list"
+            :style="{marginTop: `${activityListMT}rpx`}">
         <block v-if="activityList.length !== 0">
-          <view class="activity-card u-border-bottom" v-for="(item, index) in activityList" :key="index">
-            <activity-card
-              :value="item"
-              @sign-up="toActivityDetail"
-              @click-ybm="toActivityDetail"
-              @click-yqg="toActivityDetail"
-            >
+          <view class="activity-card u-border-bottom"
+                v-for="(item, index) in activityList"
+                :key="index">
+            <activity-card :value="item"
+                           @sign-up="toActivityDetail"
+                           @click-ybm="toActivityDetail"
+                           @click-yqg="toActivityDetail">
             </activity-card>
           </view>
           <view class="touch-bottom u-font-22 line-32 u-text-center">{{isLoadMore ? '加载中...' : '到底了~'}}</view>
@@ -162,6 +159,7 @@ export default {
         this.activityList = this.activityList.concat(data.rows)
         this.isLoadMore = this.total !== this.activityList.length
       }
+      uni.stopPullDownRefresh()
     },
     changeTab (index) {
       this.currentTab = index
@@ -193,7 +191,8 @@ export default {
     padding: 0;
     background-color: #fff;
   }
-  .no-location, .activity-list {
+  .no-location,
+  .activity-list {
     padding: 0 28px;
     min-height: 100vh;
     background-color: #fff;
@@ -202,7 +201,7 @@ export default {
     }
     .touch-bottom {
       padding: 30px 0;
-      color: #BABBBC;
+      color: #babbbc;
     }
   }
   .back-color {
@@ -213,11 +212,10 @@ export default {
     padding-top: 252px;
   }
 }
-
 </style>
 
 <style >
-  .class-tabs >>> .u-tab-item {
-    z-index: 10;
-  }
+.class-tabs >>> .u-tab-item {
+  z-index: 10;
+}
 </style>

+ 1 - 0
src/pages/order.vue

@@ -143,6 +143,7 @@ export default {
         this.total = data.total_count
         this.isLoadMore = this.total !== this.orderList.length
       }
+      uni.stopPullDownRefresh()
     },
     // 取消报名
     async joinActivity (id) {