Skip to content

Commit 147245b

Browse files
张寸起7insummer
张寸起
authored and
7insummer
committed
feat:更改water-flow组件wx.lin调用方法
1 parent 4cdef26 commit 147245b

File tree

7 files changed

+70
-61
lines changed

7 files changed

+70
-61
lines changed

‎dist/loadmore/index.wxml‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
<view class="loadmore-container l-class">
2-
<!-- 内容插槽 -->
3-
<slot name="content" />
4-
<view bindtap="onLoadmore" wx:if="{{show}}">
5-
<view wx:if="{{custom && type==='end'}}">
6-
<slot name="end" />
7-
</view>
8-
<view wx:elif="{{custom && type==='loading'}}">
9-
<slot name="loading" />
10-
</view>
11-
<view class="loading" wx:else>
12-
<view class="line"
13-
style="{{'background-color:'+color}}"
14-
wx:if="{{line}}"></view>
15-
<view class="rotate" style="border-color: {{color}};width:{{size}}rpx;height:{{size}}rpx" wx:if="{{type=='loading'}}"></view>
16-
<view class="loading-text l-loading-class" style="color:{{color}};font-size:{{size}}rpx" wx:if="{{type=='loading'}}">{{loadingText}}</view>
17-
<view class="loading-text l-end-class" style="{{'color:'+color}};font-size:{{size}}rpx" wx:if="{{type=='end'}}">{{endText}}</view>
18-
<view class="line l-line-class" style="{{'background-color:'+color}}" wx:if="{{line}}"></view>
19-
</view>
1+
<!-- 内容插槽 -->
2+
<slot name="content" />
3+
<view bindtap="onLoadmore" wx:if="{{show}}">
4+
<view wx:if="{{custom && type==='end'}}">
5+
<slot name="end" />
6+
</view>
7+
<view wx:elif="{{custom && type==='loading'}}">
8+
<slot name="loading" />
9+
</view>
10+
<view class="loading" wx:else>
11+
<view class="line"
12+
style="{{'background-color:'+color}}"
13+
wx:if="{{line}}"></view>
14+
<view class="rotate" style="border-color: {{color}};width:{{size}}rpx;height:{{size}}rpx" wx:if="{{type=='loading'}}"></view>
15+
<view class="loading-text l-loading-class" style="color:{{color}};font-size:{{size}}rpx" wx:if="{{type=='loading'}}">{{loadingText}}</view>
16+
<view class="loading-text l-end-class" style="{{'color:'+color}};font-size:{{size}}rpx" wx:if="{{type=='end'}}">{{endText}}</view>
17+
<view class="line l-line-class" style="{{'background-color:'+color}}" wx:if="{{line}}"></view>
2018
</view>
2119
</view>

‎dist/water-flow/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ Component({
2222
this._init();
2323
},
2424

25+
pageLifetimes: {
26+
show() {
27+
this._init();
28+
}
29+
},
2530
/**
2631
* 组件的方法列表
2732
*/

‎examples/dist/loadmore/index.wxml‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
<view class="loadmore-container l-class">
2-
<!-- 内容插槽 -->
3-
<slot name="content" />
4-
<view bindtap="onLoadmore" wx:if="{{show}}">
5-
<view wx:if="{{custom && type==='end'}}">
6-
<slot name="end" />
7-
</view>
8-
<view wx:elif="{{custom && type==='loading'}}">
9-
<slot name="loading" />
10-
</view>
11-
<view class="loading" wx:else>
12-
<view class="line"
13-
style="{{'background-color:'+color}}"
14-
wx:if="{{line}}"></view>
15-
<view class="rotate" style="border-color: {{color}};width:{{size}}rpx;height:{{size}}rpx" wx:if="{{type=='loading'}}"></view>
16-
<view class="loading-text l-loading-class" style="color:{{color}};font-size:{{size}}rpx" wx:if="{{type=='loading'}}">{{loadingText}}</view>
17-
<view class="loading-text l-end-class" style="{{'color:'+color}};font-size:{{size}}rpx" wx:if="{{type=='end'}}">{{endText}}</view>
18-
<view class="line l-line-class" style="{{'background-color:'+color}}" wx:if="{{line}}"></view>
19-
</view>
1+
<!-- 内容插槽 -->
2+
<slot name="content" />
3+
<view bindtap="onLoadmore" wx:if="{{show}}">
4+
<view wx:if="{{custom && type==='end'}}">
5+
<slot name="end" />
6+
</view>
7+
<view wx:elif="{{custom && type==='loading'}}">
8+
<slot name="loading" />
9+
</view>
10+
<view class="loading" wx:else>
11+
<view class="line"
12+
style="{{'background-color:'+color}}"
13+
wx:if="{{line}}"></view>
14+
<view class="rotate" style="border-color: {{color}};width:{{size}}rpx;height:{{size}}rpx" wx:if="{{type=='loading'}}"></view>
15+
<view class="loading-text l-loading-class" style="color:{{color}};font-size:{{size}}rpx" wx:if="{{type=='loading'}}">{{loadingText}}</view>
16+
<view class="loading-text l-end-class" style="{{'color:'+color}};font-size:{{size}}rpx" wx:if="{{type=='end'}}">{{endText}}</view>
17+
<view class="line l-line-class" style="{{'background-color:'+color}}" wx:if="{{line}}"></view>
2018
</view>
2119
</view>

‎examples/dist/water-flow/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ Component({
2222
this._init();
2323
},
2424

25+
pageLifetimes: {
26+
show() {
27+
this._init();
28+
}
29+
},
2530
/**
2631
* 组件的方法列表
2732
*/

‎examples/pages/components/layout/pages/water-flow/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { product } from './data.js'
1+
import { product } from './data.js';
22
Page({
33

44
/**
@@ -11,8 +11,8 @@ Page({
1111
/**
1212
* 生命周期函数--监听页面加载
1313
*/
14-
onLoad: function (options) {
15-
wx.lin.renderWaterFlow(product.slice(0,3),true)
14+
onLoad: function () {
15+
wx.lin.renderWaterFlow(product);
1616
},
1717

1818
/**
@@ -63,4 +63,4 @@ Page({
6363
onShareAppMessage: function () {
6464

6565
}
66-
})
66+
});

‎src/loadmore/index.wxml‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
<view class="loadmore-container l-class">
2-
<!-- 内容插槽 -->
3-
<slot name="content" />
4-
<view bindtap="onLoadmore" wx:if="{{show}}">
5-
<view wx:if="{{custom && type==='end'}}">
6-
<slot name="end" />
7-
</view>
8-
<view wx:elif="{{custom && type==='loading'}}">
9-
<slot name="loading" />
10-
</view>
11-
<view class="loading" wx:else>
12-
<view class="line"
13-
style="{{'background-color:'+color}}"
14-
wx:if="{{line}}"></view>
15-
<view class="rotate" style="border-color: {{color}};width:{{size}}rpx;height:{{size}}rpx" wx:if="{{type=='loading'}}"></view>
16-
<view class="loading-text l-loading-class" style="color:{{color}};font-size:{{size}}rpx" wx:if="{{type=='loading'}}">{{loadingText}}</view>
17-
<view class="loading-text l-end-class" style="{{'color:'+color}};font-size:{{size}}rpx" wx:if="{{type=='end'}}">{{endText}}</view>
18-
<view class="line l-line-class" style="{{'background-color:'+color}}" wx:if="{{line}}"></view>
19-
</view>
1+
<!-- 内容插槽 -->
2+
<slot name="content" />
3+
<view bindtap="onLoadmore" wx:if="{{show}}">
4+
<view wx:if="{{custom && type==='end'}}">
5+
<slot name="end" />
6+
</view>
7+
<view wx:elif="{{custom && type==='loading'}}">
8+
<slot name="loading" />
9+
</view>
10+
<view class="loading" wx:else>
11+
<view class="line"
12+
style="{{'background-color:'+color}}"
13+
wx:if="{{line}}"></view>
14+
<view class="rotate" style="border-color: {{color}};width:{{size}}rpx;height:{{size}}rpx" wx:if="{{type=='loading'}}"></view>
15+
<view class="loading-text l-loading-class" style="color:{{color}};font-size:{{size}}rpx" wx:if="{{type=='loading'}}">{{loadingText}}</view>
16+
<view class="loading-text l-end-class" style="{{'color:'+color}};font-size:{{size}}rpx" wx:if="{{type=='end'}}">{{endText}}</view>
17+
<view class="line l-line-class" style="{{'background-color:'+color}}" wx:if="{{line}}"></view>
2018
</view>
2119
</view>

‎src/water-flow/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ Component({
2222
this._init();
2323
},
2424

25+
pageLifetimes: {
26+
show() {
27+
this._init();
28+
}
29+
},
2530
/**
2631
* 组件的方法列表
2732
*/

0 commit comments

Comments
 (0)