Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/pages/news/index.js

 import Taro, { Component } from '@tarojs/taro';
 import ListView from '@components/ListView'
-import NewsItem from './item'
 import './index.scss'
-import { savePoint, updatePoint } from '@services/common'
 import { queryNewsList } from '@services/news'
+import NewsItem from './item'
+import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 
-let pageIndex = 1
-
 @connect(state => state.city)
 export default class Index extends Component {
 
   config = {
-    navigationBarTitleText: '资讯列表'
+    navigationBarTitleText: '热门活动'
   }
 
   state = {
     hasMore: true,
     isEmpty: false,
     recordId: null,
-    pageIndex:1
+    pageIndex: 1
   }
 
+  refreshing = false
+
   componentWillMount() {
     // App.zhuge.track('查看资讯列表页面')
     savePoint({
       })
       console.log('资讯列表')
     })
-    Taro.showLoading()
-  } 
+  }
+
+  componentDidShow() {
+    // // this.onPullDownRefresh()
+    // console.log('----', this)
+    this.loadData(1)
+  }
 
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
-  componentDidShow(){
-    this.onPullDownRefresh()
-  }
 
   loadList(pageNumber) {
     const { curCity: { id: cityId } } = this.props
     const payload = { pageSize: 10, pageNumber }
 
-    const { params: { buildingId } } = this.$router
-
-    console.log(payload)
-
+    const { params: { buildingId, from } } = this.$router
     if (cityId) {
       payload.cityId = cityId
     }
-
-    // 从项目详情过来
+    // 从个人中心过来
+    console.log(this.router, "from")
+    if (from === 'mine') {
+      payload.mine = true
+    }
+    // // 从项目详情过来
     if (buildingId) {
       payload.buildingId = buildingId
     }
-
+    // return queryActivityList(payload)
     return queryNewsList(payload)
   }
 
   handleItemClick = (item) => {
-    Taro.navigateTo({ 
+    Taro.navigateTo({
       url: '/pages/news/detail/index?id=' + item.newsId
     })
   }
 
-  onPullDownRefresh = async (rest) => {
-    const { records: list, total } = await this.loadList(1);
-    this.setState({
-      list,
-      isEmpty: total == 0,
-      hasMore: list.length >= total ? false : true,
-      pageIndex:1
-    })
+  onPullDownRefresh = (rest) => {
+    // debugger
+    if (this.refreshing) return
+    this.refreshing = true
+
+    this.loadData(1)
+
+    // debugger
     rest && rest()
-    Taro.hideLoading()
+
+    this.refreshing = false
   }
 
   onScrollToLower = async (fn) => {
-    const { list } = this.state;
-    pageIndex++
-    const { records, total } = await this.loadList(this.state.pageIndex+1);
-    const newList = list.concat(records)
-    this.setState({
-      list: newList,
-      hasMore: newList.length >= total ? false : true,
-      pageIndex:this.state.pageIndex+1
-    });
+    const { pageIndex } = this.state;
+    this.loadData(pageIndex + 1)
     fn && fn();
   }
 
+  loadData = (page) => {
+    this.loadList(page).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.list.concat(_list)
+      console.log(res, '---res-------')
+      this.setState({
+        list: newList,
+        isEmpty: total == 0,
+        hasMore: current < pages,
+        pageIndex: current >= pages ? pages : current
+      })
+    })
+  }
+
   render() {
     const { isEmpty, hasMore, list } = this.state
-
     return (
-      <View className="page">
-        <ListView
-          needInit
-          isEmpty={isEmpty}
-          emptyText="暂无资讯~"
-          hasMore={hasMore}
-          className="list"
-          onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
-          onScrollToLower={fn => this.onScrollToLower(fn)}
-        >
-          {list.map(item => (
-            <NewsItem
-              key={item.newsId}
-              data={item}
-              onClick={this.handleItemClick}
-            ></NewsItem>
-          ))}
-        </ListView>
-      </View>
+      <ListView
+        className="wrap"
+        needInit
+        isEmpty={isEmpty}
+        emptyText="暂无资讯~"
+        hasMore={hasMore}
+        onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
+        onScrollToLower={fn => this.onScrollToLower(fn)}
+      >
+        <View className="list">
+          {
+            list.map(item => (
+              <NewsItem
+                key={item.newsId}
+                data={item}
+                onClick={this.handleItemClick}
+              ></NewsItem>
+            ))
+          }
+        </View>
+      </ListView>
     );
   }
 }

src/pages/news/index.scss

 @import "@styles/theme.scss";
 
-.page {
-  background: #fff;
+.wrap {
+  background: white;
   position: relative;
+  height:100vh;
 }
 .list{
-  padding:0 40px;
-  height:100vh;
-  background:white;
-  margin-top:30px;
+  padding:30px;
 }
+

src/pages/project/h5Page.js

 
   state = {
     recordId: undefined, // 埋点ID
-    avatarVisible: true,
+    avatarVisible: false,
     phoneVisible: false,
     webViewVisible: false,
     pageInfo: {},
   }
   componentWillMount() {
     ready.queue(() => {
-
+      Taro.showLoading()
       if (this.$router.params.scene) {
 
         getQrCodeParams(this.$router.params.scene).then((_, codeParams) => {
       console.log(hFiveId, "hFiveId")
       // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
       getHFiveDetail(hFiveId).then(res => {
-        if(res.status==1){
+        Taro.hideLoading()
+        if (res.status == 1) {
           this.setState({
             pageInfo: res
           })
-        }else{
+        } else {
           Taro.showModal({
             title: '提示',
             content: '活动已下架',
-            showCancel:false,
-          }).then(()=>{
+            showCancel: false,
+          }).then(() => {
             Taro.switchTab({
               url: '/pages/project/index'
             })
       })
       const { userInfo: { person: { avatarurl, phone } } } = this.props
       console.log(this.props, "this.propsthis.propsthis.props")
+
       if (avatarurl && avatarurl.indexOf('wx.qlogo.cn') != -1) {
         console.log(avatarurl, "有头像哦~")
         this.setState({
           avatarVisible: false,
         })
+        Taro.hideLoading()
         console.log(phone, "phone#########")
         // 头像手机号都有
         if (phone) {
           })
         }
       } else {
+        Taro.hideLoading()
         if (phone) {
           this.setState({
             phoneVisible: false,
+            avatarVisible: true,
           })
         }
       }
       lang: 'zh_CN',
       success: res => {
         const payload = Object.assign(res, { sessionKey })
-        console.log(res,"获取用户信息返回值")
+        console.log(res, "获取用户信息返回值")
         // 用户信息保存至服务器
         dispatchUpdateUserInfo(payload).then(res => {
           this.onAvatarSuccess();
       }
       reportClient(payload).then(res => {
         console.log('恭喜您绑定成功')
-      }).catch(err => {
-        console.error(err)
-        this.setState({ bound: true })
       })
+      // .catch(err => {
+      //   console.error(err)
+
+      // })
     }
   }
 

src/pages/project/index.js

     if (curCity.id) {
       payload.cityId = curCity.id
     }
+    this.setState({
+      newsList: []
+    })
     queryNewsList(payload).then(res => {
       this.setState({
         newsList: res.records || []