许静 5 anos atrás
pai
commit
f31998016c

+ 2
- 2
config/dev.js Ver arquivo

@@ -9,8 +9,8 @@ module.exports = {
9 9
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10 10
     // HOST: '"https://lt.pawoma.cn"',
11 11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    HOST: '"http://192.168.0.84:8080"',
13
-    WSS_HOST: '"ws://192.168.0.84:8080"',
12
+    HOST: '"http://192.168.0.172:8080"',
13
+    WSS_HOST: '"ws://192.168.0.172:8080"',
14 14
   },
15 15
   weapp: {},
16 16
   h5: {}

+ 1
- 1
src/pages/activity/detail/assemble.js Ver arquivo

@@ -597,7 +597,7 @@ export default class Detail extends Component {
597 597
 
598 598
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
599 599
                 <View style="padding:0 40rpx">
600
-                  <Image src={detail.descImg} style="width:100%"></Image>
600
+                  <Image src={detail.descImg} mode="widthFix" style="width:100%;margin-bottom:20px"></Image>
601 601
                 </View>
602 602
 
603 603
                 {

+ 1
- 1
src/pages/activity/detail/assistance.js Ver arquivo

@@ -609,7 +609,7 @@ export default class Detail extends Component {
609 609
                 </View>
610 610
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
611 611
                 <View style="padding:0 40rpx">
612
-                  <Image src={detail.activityInstructions} style="width:100%;margin-bottom:20px"></Image>
612
+                  <Image src={detail.activityInstructions} mode="widthFix" style="width:100%;margin-bottom:20px;"></Image>
613 613
                 </View>
614 614
 
615 615
               </ScrollView>

+ 11
- 6
src/pages/activity/index.js Ver arquivo

@@ -37,13 +37,17 @@ export default class Index extends Component {
37 37
       console.log('活动列表')
38 38
     })
39 39
   }
40
- 
41
-  componentDidShow () {
40
+  onPageScroll(e) {
41
+    console.log(e,"e")
42
+    //这个就是滚动到的位置,可以用这个位置来写判断
43
+  }
44
+
45
+  componentDidShow() {
42 46
     // // this.onPullDownRefresh()
43 47
     // console.log('----', this)
44 48
     this.loadData(1)
45 49
   }
46
-  
50
+
47 51
   componentWillUnmount() {
48 52
     const { recordId } = this.state
49 53
     recordId && updatePoint(recordId)
@@ -99,7 +103,7 @@ export default class Index extends Component {
99 103
 
100 104
     // debugger
101 105
     rest && rest()
102
-    
106
+
103 107
     this.refreshing = false
104 108
   }
105 109
 
@@ -111,9 +115,9 @@ export default class Index extends Component {
111 115
 
112 116
   loadData = (page) => {
113 117
     this.loadList(page).then(res => {
114
-      const {records, list, total, current, pages} = res || {}
118
+      const { records, list, total, current, pages } = res || {}
115 119
       const _list = records || list || []
116
-      const newList = current <= 1 ? _list: this.state.list.concat(_list)
120
+      const newList = current <= 1 ? _list : this.state.list.concat(_list)
117 121
 
118 122
       this.setState({
119 123
         list: newList,
@@ -133,6 +137,7 @@ export default class Index extends Component {
133 137
         isEmpty={isEmpty}
134 138
         emptyText="暂无活动~"
135 139
         hasMore={hasMore}
140
+        onPageScroll={fn=>this.onPageScroll(fn)}
136 141
         onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
137 142
         onScrollToLower={fn => this.onScrollToLower(fn)}
138 143
       >