mali-applet-ui 1.0.47 → 1.0.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -137,6 +137,7 @@ export default {
137
137
  border: 1px solid #e5e5e5;
138
138
  border-radius: $ml-border-radius;
139
139
  font-size: 32rpx;
140
+ background: #ffffff;
140
141
  &+.ml-button {
141
142
  margin-left: $ml-button-interval-margin;
142
143
  }
@@ -78,7 +78,6 @@ export default {
78
78
  }
79
79
  &.align-center {
80
80
  text-align: center;
81
- padding: 16rpx 0;
82
81
  }
83
82
  &.align-right {
84
83
  text-align: right;
@@ -12,8 +12,14 @@
12
12
  </slot>
13
13
  </view>
14
14
  <view v-else-if="showPage" class="ml-load-more-warpper">
15
- <view v-if="loadStatus === 'more'" class="ml-load-more-status-more">上拉显示更多</view>
16
- <view v-if="loadStatus === 'noMore'" class="ml-load-more-status-no-more">没有更多数据了</view>
15
+ <view v-if="loading" class="ml-load-more-loading">
16
+ <ml-icon name="loading" roll />
17
+ <text class="ml-load-more-loading-text">正在加载中...</text>
18
+ </view>
19
+ <template v-else>
20
+ <view v-if="loadStatus === 'more'" class="ml-load-more-status-more">上拉显示更多</view>
21
+ <view v-if="loadStatus === 'noMore'" class="ml-load-more-status-no-more">没有更多数据了</view>
22
+ </template>
17
23
  </view>
18
24
  </view>
19
25
  </template>
@@ -196,10 +202,17 @@ export default {
196
202
  }
197
203
  .ml-load-more-warpper {
198
204
  text-align: center;
205
+ padding-bottom: 20rpx;
206
+ color: rgb(119, 119, 119);
207
+ .ml-load-more-loading {
208
+ padding: 20rpx;
209
+ .ml-load-more-loading-text {
210
+ padding-left: 10rpx;
211
+ }
212
+ }
199
213
  .ml-load-more-status-more,
200
214
  .ml-load-more-status-no-more {
201
215
  padding: 20rpx;
202
- color: rgb(119, 119, 119);
203
216
  }
204
217
  }
205
218
  </style>
@@ -38,6 +38,5 @@ export default {
38
38
  position: relative;
39
39
  flex-grow: 1;
40
40
  font-size: $ml-base-font-size;
41
- overflow: auto;
42
41
  }
43
42
  </style>
@@ -1,6 +1,8 @@
1
1
  <template>
2
- <view v-if="selectTab === name" class="ml-tab-pane" :class="className">
3
- <slot></slot>
2
+ <view class="ml-tab-pane" :class="className">
3
+ <view v-if="selectTab === name">
4
+ <slot></slot>
5
+ </view>
4
6
  </view>
5
7
  </template>
6
8
 
@@ -94,6 +96,5 @@ export default {
94
96
  .ml-tab-pane {
95
97
  display: block;
96
98
  flex-grow: 1;
97
- overflow: auto;
98
99
  }
99
- </style>
100
+ </style>
@@ -79,8 +79,6 @@ export default {
79
79
  .ml-tabs-content {
80
80
  display: flex;
81
81
  flex-direction: column;
82
- flex-grow: 1;
83
- overflow: auto;
84
82
  }
85
83
  .ml-tabs-nav-item {
86
84
  position: relative;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mali-applet-ui",
3
- "version": "1.0.47",
3
+ "version": "1.0.49",
4
4
  "description": "码里云小程序组件库",
5
5
  "files": [
6
6
  "lib",