|
@@ -37,13 +37,13 @@ export default class Index extends Component {
|
37
|
37
|
console.log('活动列表')
|
38
|
38
|
})
|
39
|
39
|
}
|
40
|
|
-
|
41
|
|
- componentDidShow () {
|
|
40
|
+
|
|
41
|
+ componentDidShow() {
|
42
|
42
|
// // this.onPullDownRefresh()
|
43
|
43
|
// console.log('----', this)
|
44
|
44
|
this.loadData(1)
|
45
|
45
|
}
|
46
|
|
-
|
|
46
|
+
|
47
|
47
|
componentWillUnmount() {
|
48
|
48
|
const { recordId } = this.state
|
49
|
49
|
recordId && updatePoint(recordId)
|
|
@@ -82,6 +82,11 @@ export default class Index extends Component {
|
82
|
82
|
url: '/pages/activity/detail/assemble?id=' + item.id
|
83
|
83
|
})
|
84
|
84
|
return
|
|
85
|
+ case 'live':
|
|
86
|
+ Taro.navigateTo({
|
|
87
|
+ url: '/onlineSelling/pages/live/index?id=' + item.id
|
|
88
|
+ })
|
|
89
|
+ return;
|
85
|
90
|
default:
|
86
|
91
|
Taro.navigateTo({
|
87
|
92
|
url: '/pages/activity/detail/index?id=' + item.id
|
|
@@ -99,7 +104,7 @@ export default class Index extends Component {
|
99
|
104
|
|
100
|
105
|
// debugger
|
101
|
106
|
rest && rest()
|
102
|
|
-
|
|
107
|
+
|
103
|
108
|
this.refreshing = false
|
104
|
109
|
}
|
105
|
110
|
|
|
@@ -111,9 +116,9 @@ export default class Index extends Component {
|
111
|
116
|
|
112
|
117
|
loadData = (page) => {
|
113
|
118
|
this.loadList(page).then(res => {
|
114
|
|
- const {records, list, total, current, pages} = res || {}
|
|
119
|
+ const { records, list, total, current, pages } = res || {}
|
115
|
120
|
const _list = records || list || []
|
116
|
|
- const newList = current <= 1 ? _list: this.state.list.concat(_list)
|
|
121
|
+ const newList = current <= 1 ? _list : this.state.list.concat(_list)
|
117
|
122
|
|
118
|
123
|
this.setState({
|
119
|
124
|
list: newList,
|