banner

src/app.js

@@ -93,6 +93,11 @@ class App extends Component {
       'pages/signin/index',
       'pages/card/fans/index',
       'pages/person/feedback/index',
+
+      'pages/checkin/index',
+      'pages/checkin/checkinsuccess/index',
+      // 'pages/checkin/unregistered/index',
+  
     ],
     window: {
       backgroundTextStyle: 'light',

src/components/authorize/index.js

@@ -26,6 +26,7 @@ export default class Index extends Component {
         })
         return
       }else{
+        this.props.dispatchUpdateUserInfoNew(this.state.user.id)
         Taro.reLaunch({
             url: '/pages/person/index'
          })

src/constants/api.js

@@ -150,6 +150,10 @@ export const API_HELP_DETAIL = resolvePath('helpActivity')
 export const API_HELP_CREATE = resolvePath('helpInitiateRecord')
 export const API_HELP_FRIEND = resolvePath('helpRecord')
 
+//签到
+export const API_CHECKIN_DETAILS = resolvePath('buildingDynamiceEnlistInfo')
+export const API_CHECKIN_ACTIVE = resolvePath('buildingDynamicCheckin')
+
 // 拼团
 export const API_GROUP_DETAIL = resolvePath('taShareActivity')
 export const API_GROUP_CREATE = resolvePath('taShareRecord')

src/constants/checkin.js

@@ -0,0 +1,2 @@
+export const CHECKIN_DETAILS = 'CHECKIN_DETAILS'
+export const CHECKIN_ACTIVE = 'CHECKIN_ACTIVE'

src/pages/activity/detail/assemble.js

@@ -79,8 +79,14 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.groupActivityId) {
-      const id = this.$router.params.id
-      const recordId = this.$router.params.recordId
+      let id = this.$router.params.id
+      let recordId = this.$router.params.recordId
+     
+      if (!id) {
+        const router = Taro.getStorageSync('router')
+        id = router.query.id
+        recordId = router.query.recordId
+      }
 
       this.setState({ id, recordId }, () => {
         this.loadDetail()

src/pages/activity/detail/assistance.js

@@ -79,8 +79,14 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.helpActivityId) {
-      const id = this.$router.params.id
-      const initiateId = this.$router.params.initiateId
+      let id = this.$router.params.id
+      let initiateId = this.$router.params.initiateId
+
+      if (!id) {
+        const router = Taro.getStorageSync('router')
+        id = router.query.id
+        initiateId = router.query.initiateId
+      }
 
       this.setState({ id, initiateId }, () => {
         this.loadDetail()
@@ -166,6 +172,7 @@ export default class Detail extends Component {
 
   // 请求详情
   loadDetail() {
+    debugger
     const { id, initiateId } = this.state
     const { userInfo } = this.props
 

src/pages/activity/detail/index.js

@@ -321,7 +321,7 @@ export default class Detail extends Component {
                   <View className="detail-top">
                     <View className="detail-top__row">
                       <Text className="row-label">活动时间：</Text>
-                      <Text className="row-content">{dayjs(detail.createDate).format('YYYY-MM-DD hh:mm:ss')}</Text>
+                      <Text className="row-content">{dayjs(detail.startDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
                     </View>
                     <View className="detail-top__row">
                       <Text className="row-label">活动地址：</Text>
@@ -329,7 +329,7 @@ export default class Detail extends Component {
                     </View>
                     <View className="detail-top__row">
                       <Text className="row-label">报名截止：</Text>
-                      <Text className="row-content">{dayjs(detail.enlistEnd).format('YYYY-MM-DD hh:mm:ss')}</Text>
+                      <Text className="row-content">{dayjs(detail.enlistEnd).format('YYYY-MM-DD HH:mm:ss')}</Text>
                     </View>
                   </View>
                   <View className="detail-con">
@@ -365,11 +365,11 @@ export default class Detail extends Component {
                   <Text className="txt">收藏</Text>
                 </Button>
                 {
-                  detail.enlisted >= detail.enlistNum ? (<Button disabled='true' className='submit-btn hasSigned'>报名人数已满</Button>) : ( phone ? (
+                  parseInt(detail.isEnlist) !=0 && (parseInt(detail.isEnlist) == 2 ? (<Button disabled='true' className='submit-btn hasSigned'>报名人数已满</Button>) : (( phone ? (
                     <Button disabled={isSign} className={`submit-btn ${isSign ? 'hasSigned' : ''}`} onClick={this.handleSignup}>{isSign ? '已报名' : '立即报名'}</Button>
                   ) : (
                   <Button disabled={isSign} className='submit-btn' open-type="getPhoneNumber" onGetphonenumber={this.handleGetPhone}>{isSign ? '已报名' : '立即报名'}</Button>
-                  ))
+                  ))))
                 }
                 {/* {phone ? (
                   <Button disabled={isSign} className={`submit-btn ${isSign ? 'hasSigned' : ''}`} onClick={this.handleSignup}>{isSign ? '已报名' : '立即报名'}</Button>

src/pages/activity/detail/poster.js

@@ -99,17 +99,17 @@ export default class Index extends Component {
         x: 100,
         y: 1065,
         text: '橙蕉',
-        fontSize: 28,
-        color: 'black',
+        fontSize: 34,
+        color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
         width: 120,
         zIndex: 11
       },
       {
-        x: 240,
+        x: 190,
         y: 1065,
-        text: '报名活动',
+        text: '热门活动',
         fontSize: 26,
         color: '#999',
         baseLine: 'middle',

src/pages/activity/index.js

@@ -19,7 +19,8 @@ export default class Index extends Component {
     list: [],
     hasMore: true,
     isEmpty: false,
-    recordId: null
+    recordId: null,
+    pageIndex:1
   }
 
   componentWillMount() {
@@ -87,7 +88,8 @@ export default class Index extends Component {
     this.setState({
       list: _list,
       isEmpty: total == 0,
-      hasMore: _list.length >= total ? false : true
+      hasMore: _list.length >= total ? false : true,
+      pageIndex:1
     })
     rest && rest()
   }
@@ -95,12 +97,13 @@ export default class Index extends Component {
   onScrollToLower = async (fn) => {
     const { list } = this.state;
     pageIndex++
-    const { records, list: list1, total } = await this.loadList(pageIndex);
+    const { records, list: list1, total } = await this.loadList(this.state.pageIndex+1);
     const _list = records || list1 || []
     const newList = list.concat(_list)
     this.setState({
       list: newList,
-      hasMore: newList.length >= total ? false : true
+      hasMore: newList.length >= total ? false : true,
+      pageIndex:this.state.pageIndex+1
     });
     fn && fn();
   }

src/pages/agent/become/index.js

@@ -114,7 +114,7 @@ export default class Index extends Component {
     const { userInfo: { person: { phone } } } = this.props
     return (
       <View className='page'>
-        <Image src={require('@assets/shop/banner1.jpg')} className='banner' mode='widthFix'></Image>
+        <Image src={require('@assets/agent/banner.png')} className='banner' mode='widthFix'></Image>
         <View className='become_agent'>
           <View className='agent_type'>
             <Text className='agent_title'>经纪人类型</Text>

src/pages/agent/client/index.js

@@ -12,7 +12,8 @@ export default class Index extends Component {
 
   state = {
     list: [],
-    status: ['报备', '到访', '认购', '签约'],//客户状态
+    status: ['报备', '到访', '认购', '签约'],//报备客户状态
+    recomstatus: ['推荐', '到访', '认购', '签约'],//推荐客户状态
     verifyStatus:['待审核', '审核同意', '审核不同意'],
     floorList: '',
     floor: '',
@@ -108,7 +109,11 @@ export default class Index extends Component {
                     <Image className='bg' src={item.verifyStatus==2?require('@assets/person/card1.png'):require('@assets/person/card2.png')}></Image>
                     <View className='client'>
                       <View className='client__status2'>
-                          <Text>{item.verifyStatus==1?status[item.status-1]:verifyStatus[item.verifyStatus]}</Text>
+                        {
+                          //报备1 ，推荐2
+                          item.reportRecommendStatus == 1 ? (<Text>{status[item.status-1]}</Text>) : ( <Text>{item.verifyStatus==1?recomstatus[item.status-1]:verifyStatus[item.verifyStatus]}</Text>)
+                        }
+                          {/* <Text>{item.verifyStatus==1?status[item.status-1]:verifyStatus[item.verifyStatus]}</Text> */}
                       </View>
                       <View className='client__top'>
                         <View className='client__infor'>

src/pages/agent/invitation/index.js

@@ -13,7 +13,8 @@ export default class Index extends Component {
     list: [],
     hasMore: true,
     isEmpty: false,
-    recordId:null
+    recordId:null,
+    pageIndex:1
   }
   loadList(pageNumber) {
     // const {
@@ -28,7 +29,8 @@ export default class Index extends Component {
     this.setState({
       list,
       isEmpty: total == 0,
-      hasMore: list.length >= total ? false : true
+      hasMore: list.length >= total ? false : true,
+      pageIndex:1
     })
     rest && rest()
   }
@@ -37,11 +39,12 @@ export default class Index extends Component {
     const { list } = this.state;
     pageIndex++
     console.log(pageIndex)
-    const { records, total } = await this.loadList(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
+      hasMore: newList.length >= total ? false : true,
+      pageIndex:this.state.pageIndex+1
     });
     fn && fn();
   }

src/pages/agent/progress/index.js

@@ -170,7 +170,7 @@ export default class Index extends Component {
               }
             </View>
             <View className='step__txt'>
-              <View className='txt'>报备<View className='tip'></View></View>
+              <View className='txt'>{item.reportRecommendStatus == 1 ? '报备' : '推荐'}<View className='tip'></View></View>
               <View className='txt'>到访<View className='tip'></View></View>
               <View className='txt'>认购<View className='tip'></View></View>
               <View className='txt'>签约<View className='tip'></View></View>

src/pages/card/fans/index.js

@@ -15,7 +15,8 @@ export default class Index extends Component {
     list: [],
     hasMore: true,
     isEmpty: false,
-    recordId:null
+    recordId:null,
+    pageIndex:1
   }
   componentDidMount() {
     // App.zhuge.track('查看粉丝页面')
@@ -68,7 +69,8 @@ export default class Index extends Component {
     this.setState({
       list,
       isEmpty: total == 0,
-      hasMore: list.length >= total ? false : true
+      hasMore: list.length >= total ? false : true,
+      pageIndex:1
     })
     rest && rest()
   }
@@ -77,11 +79,12 @@ export default class Index extends Component {
     const { list } = this.state;
     pageIndex++
     console.log(pageIndex)
-    const { records, total } = await this.loadList(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
+      hasMore: newList.length >= total ? false : true,
+      pageIndex:this.state.pageIndex+1
     });
     fn && fn();
   }

src/pages/card/index.js

@@ -324,7 +324,7 @@ export default class Index extends Component {
   handleModalConfirm() {
     const {
       cardInfo: { id, projects },
-      userInfo: { person: { phone } }
+      userInfo: { person: { phone, tel } }
     } = this.props
 
     const buildingId = projects[0]
@@ -332,7 +332,7 @@ export default class Index extends Component {
     const payload = {
       realtyConsultant: id, //报备人 置业顾问
       buildingId,
-      phone
+      phone: phone || tel
     }
     reportClient(payload).then(res => {
       this.hideModal()

src/pages/card/list/index.js

@@ -17,7 +17,8 @@ export default class Index extends Component {
     list: [],
     hasMore: true,
     isEmpty: false,
-    recordId: null
+    recordId: null,
+    pageIndex:1
   }
   componentWillMount() {
     savePoint({
@@ -97,7 +98,8 @@ export default class Index extends Component {
     this.setState({
       list,
       isEmpty: total == 0,
-      hasMore: list.length >= total ? false : true
+      hasMore: list.length >= total ? false : true,
+      pageIndex:1
     })
     rest && rest()
   }
@@ -105,11 +107,12 @@ export default class Index extends Component {
   onScrollToLower = async (fn) => {
     const { list } = this.state;
     pageIndex++
-    const { records, total } = await this.loadList(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
+      hasMore: newList.length >= total ? false : true,
+      pageIndex:this.state.pageIndex+1
     });
     fn && fn();
   }
@@ -136,7 +139,7 @@ export default class Index extends Component {
               <View className='item-main' key={item.id} onClick={this.handleConsuItemClick.bind(this, item)}>
                 <View className="item">
                   <View className="flex">
-                    <Image className="avatar" mode="aspectFill" src={item.avatar || item.photo}></Image>
+                  <Image className="avatar" mode="aspectFill" src={item.photo || item.avatar}></Image>
 
                     <View className='info'>
                       <View className='name-info'>

src/pages/card/poster.js

@@ -106,7 +106,7 @@ export default class Index extends Component {
       },
       {
         x: 100,
-        y: 750,
+        y: 755,
         text: '进入',
         fontSize: 26,
         color: '#999',
@@ -116,19 +116,19 @@ export default class Index extends Component {
         zIndex: 100
       },
       {
-        x: 160,
-        y: 750,
+        x: 170,
+        y: 755,
         text: '橙蕉',
-        fontSize: 28,
-        color: 'black',
+        fontSize: 34,
+        color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
         width: 120,
         zIndex: 100
       },
       {
-        x: 300,
-        y: 750,
+        x: 260,
+        y: 755,
         text: '查看主页',
         fontSize: 26,
         color: '#999',

src/pages/card/register/index.js

@@ -22,6 +22,7 @@ export default class Cards extends Component {
     }
   }
   toCardPage(id) {
+    this.props.dispatchUpdateUserInfoNew(id)
     Taro.navigateTo({ url: `/pages/card/index?id=${id}` })
   }
   doSubmit(payload) {

src/pages/checkin/checkinsuccess/index.js

@@ -0,0 +1,38 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+
+
+
+
+export default class checkinsuccess extends Component {
+
+  toshop () {
+    wx.switchTab({
+      url: '/pages/shop/index'
+    });
+  }
+
+  render () {
+
+    return (
+      <View className="checkin" style="width:100vw;height:100vh;background:rgba(245,245,245,1);" >
+        <View style="text-align: center;">
+          <Image className="img" src={require('@assets/checkin/checkinsuccessfully.png')}  ></Image>
+        </View>
+        <View>
+          <Text className="text1" style="">+20积分</Text>
+          <Text className="text2" style="">恭喜您签到成功!</Text>
+        </View>
+        <View >
+          
+          <Text  className="text3" onClick={this.toshop} style="">您已签到成功,快去参加活动吧更多好礼在积分商城等着你> </Text>
+        </View>
+        {/* </Text>
+
+        <Text style="position: absolute; font-size:16px;font-weight:400;color:rgba(153,153,153,1);line-height:22px;top:327px;left:81px"> */}
+
+      </View>
+
+    );
+  }
+}

src/pages/checkin/checkinsuccess/index.scss

@@ -0,0 +1,46 @@
+.checkin {
+  width: 100vw;
+  height: 100vh;
+  background: rgba(245, 245, 245, 1);
+
+  View {
+    .img {
+      width: 750px;
+      height: 898px
+    }
+  }
+
+  .text1 {
+    position: absolute;
+    font-size: 36px;
+    font-weight: 400;
+    color: rgba(255, 39, 68, 1);
+    line-height: 50px;
+    top: 380px;
+    left: 308px
+  }
+
+  .text2 {
+    position: absolute;
+    font-size: 36px;
+    font-weight: 400;
+    color: rgba(187, 156, 121, 1);
+    line-height: 50px;
+    top: 438px;
+
+
+    left: 246px
+  }
+
+  .text3 {
+    position: absolute;
+    font-size: 32px;
+    font-weight: 400;
+    color: rgba(153, 153, 153, 1);
+    line-height: 44px;
+    top: 600px;
+    left: 162px;
+    width: 426px
+  }
+
+}

src/pages/checkin/index.js

@@ -0,0 +1,133 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import { AtDivider, AtList, AtListItem, AtGrid, AtButton } from 'taro-ui'
+
+import achievePhone from '@components/achievePhone'
+import { checkinDetails, checkinActive } from '@services/checkin'
+
+// import { checkinActive } from '@services/checkin'
+
+export default class checkin extends Component {
+
+  state = {
+    id:'',
+    // ischeck:''
+    // isLogin: false,
+    // user: {},
+    // isAgent: false,//经纪人
+    // consultant: false,//置业顾问
+    // tourist: false,//普通用户
+    data: {},
+  }
+
+  componentWillMount () {
+    console.log(this.$router.params,'22222')
+
+    const { id, type } = this.$router.params
+
+    console.log(id, type)
+    this.getcheckinDetails(id, type)
+    // this.getcheckinDetails()
+
+  }
+  // dynamicId
+  getcheckinDetails (id, type) {
+    console.log('1111')
+    // const id = '39a0e51e6fea9cb758abed08dd7fb16b'
+    Taro.showLoading()
+    checkinDetails(id, type).then(res => {
+      Taro.hideLoading()
+      this.setState({
+        data: res
+      })
+      console.log('1111', res)
+    })
+  }
+
+  checkinActive () {
+
+    //  alert('签到成功')
+    const enlistId = this.state.data.enlist.enlistId
+    Taro.showLoading()
+    checkinActive(enlistId).then(res => {
+      Taro.hideLoading()
+      Taro.navigateTo({
+        url: '/pages/checkin/checkinsuccess/index'
+      })
+    }).catch((err) => {
+      console.log('签到失败')
+      // Taro.navigateTo({
+      //   url: '/pages/checkin/checkinsuccess/index'
+      // })
+    })
+
+
+  }
+
+  toactivity () {
+    Taro.navigateTo({
+      // url: '/pages/checkin/checkinsuccess/index'
+    })
+  }
+
+  render () {
+    const { data, style } = this.props
+
+
+
+    return (
+      <View className="checkin" style="width:100vw;height:100vh;" >
+
+        {/* <checkinsuccess></checkinsuccess> */}
+        {/* <achievePhone></achievePhone> */}
+        <View>
+          <Image className="img" src={this.state.data.dynamic.imgUrl}  ></Image>
+        </View>
+        <View style="margin-bottom:20px"  >
+          <View className="text1"> <Text>{this.state.data.dynamic.title}</Text></View>
+        </View >
+
+        {this.state.data.enlist != null && <View>
+          <View style="text-align: center;">
+            <Text className="line">- - - - - - - - - </Text>
+            <Text className="text2">活动报名信息</Text>
+            <Text className="line">- - - - - - - - - </Text>
+          </View>
+
+          <View className="text3">
+            <View className='at-row'>
+              <View className='at-col at-col-3'>用户名：</View>
+              <View className='at-col at-col-9'>{this.state.data.person.name || this.state.data.person.nickname}</View>
+            </View>
+            <View className='at-row'>
+              <View className='at-col at-col-3'>手机号：</View>
+              <View className='at-col at-col-9'>{this.state.data.person.tel || this.state.data.person.phone}</View>
+            </View>
+            <View className='at-row'>
+              <View className='at-col at-col-3'>参与人数：</View>
+              <View className='at-col at-col-9'>{this.state.data.enlist.attendNum}</View>
+            </View>
+          </View>
+
+
+
+          {!this.state.data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkin.png')} onClick={this.checkinActive}   ></Image>}
+          {this.state.data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkined.png')}></Image>}
+        </View>}
+        {this.state.data.enlist == null && <View className="unregistered">
+          <View>
+            <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>
+          </View>
+          <View className="message">
+            <Text className="messageText" >您还未报名当前活动,请先前往活动报名页报名成功后再进行扫码签到~ </Text>
+
+          </View>
+
+          <AtButton type='primary' className="toactivebutton">立即前往</AtButton>
+          {/* <Image src={require('@assets/checkin/checkin.png')}  style="position: absolute; width:110px;height:110px ;bottom:12vh;left:132.5px"  ></Image> */}
+        </View>}
+      </View>
+
+    );
+  }
+}

src/pages/checkin/index.scss

@@ -0,0 +1,122 @@
+@import "@styles/theme.scss";
+@import "~taro-ui/dist/style/components/flex.scss";
+@import "~taro-ui/dist/style/components/list.scss";
+@import "~taro-ui/dist/style/components/icon.scss";
+// @import "~taro-ui/dist/style/components/grid.scss";
+
+.img {
+  width: 750px;
+  height: 426px;
+  margin-bottom: 40px
+}
+
+.text1 {
+  // float: left;
+
+  font-size: 36px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: rgba(51, 51, 51, 1);
+  line-height: 50px;
+  font-weight: bold;
+  padding-left: 80px;
+  // padding-top: 40px;
+  margin-bottom: 40px;
+}
+
+.text2 {
+  width: 200px;
+  height: 48px;
+  font-size: 34px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: rgba(187, 156, 121, 1);
+  line-height: 48px;
+  letter-spacing: -0.82px;
+  padding: 0 36px;
+  margin-bottom: 20px;
+}
+
+.line {
+  // width:300px;height:50px;
+  // text-align:center;
+  // padding-top:30px;
+  // border-bottom:2px dashed #000;
+
+  // border-style:solid;
+  width: 200px;
+  height: 2px;
+  border: 3px solid rgba(0, 0, 0, 0.12);
+  border: none;
+}
+
+.text3 {
+
+  margin-left: 40px;
+}
+
+.at-row {
+  margin-top: 20px;
+  font-size: 32px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+  line-height: 44px;
+}
+
+.unregistered {
+  .img1 {
+    width: 220px;
+    height: 220px;
+    margin-left: 264px;
+    margin-top: 40px
+  }
+
+  .message {
+    width: 660px;
+    text-align: center;
+    margin-top: 40px;
+
+    .messageText {
+
+      position: absolute;
+      font-size: 36px;
+      font-weight: 400;
+      color: rgba(187, 156, 121, 1);
+      line-height: 56px;
+      width: 660px;
+      text-align: center;
+      top: 860px;
+      left: 46px
+    }
+  }
+
+
+
+}
+
+.toactivebutton {
+  width: 360px;
+  height: 100px;
+  background: rgba(187, 156, 121, 1);
+  border-radius: 12px;
+  position: absolute;
+  left: 196px;
+  top: 1000px;
+  font-size: 36px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 1);
+  line-height: 100px;
+  text-align: center;
+
+}
+
+.checkinImg {
+  position: absolute;
+  width: 220px;
+  height: 220px;
+  bottom: 12vh;
+  left: 265px
+}
+

src/pages/news/detail/poster.js

@@ -99,17 +99,17 @@ export default class Index extends Component {
         x: 100,
         y: 1065,
         text: '橙蕉',
-        fontSize: 28,
-        color: 'black',
+        fontSize: 34,
+        color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
         width: 120,
         zIndex: 11
       },
       {
-        x: 240,
+        x: 190,
         y: 1065,
-        text: '报名活动',
+        text: '查看资讯',
         fontSize: 26,
         color: '#999',
         baseLine: 'middle',

src/pages/news/index.js

@@ -18,7 +18,8 @@ export default class Index extends Component {
     list: [],
     hasMore: true,
     isEmpty: false,
-    recordId: null
+    recordId: null,
+    pageIndex:1
   }
 
   componentWillMount() {
@@ -72,7 +73,8 @@ export default class Index extends Component {
     this.setState({
       list,
       isEmpty: total == 0,
-      hasMore: list.length >= total ? false : true
+      hasMore: list.length >= total ? false : true,
+      pageIndex:1
     })
     rest && rest()
   }
@@ -80,11 +82,12 @@ export default class Index extends Component {
   onScrollToLower = async (fn) => {
     const { list } = this.state;
     pageIndex++
-    const { records, total } = await this.loadList(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
+      hasMore: newList.length >= total ? false : true,
+      pageIndex:this.state.pageIndex+1
     });
     fn && fn();
   }

src/pages/news/index.scss

@@ -1,8 +1,7 @@
 @import "@styles/theme.scss";
 
 .page {
-  // background: $page-bg;
-  background: #fff;
+  background: $page-bg;
   position: relative;
 }
 .list{

src/pages/news/item.js

@@ -16,7 +16,7 @@ export default class NewsItem extends Component {
         <Image className="item-img" mode="aspectFill" src={data.newsImg}></Image>
         <View className="item-con">
           <View className="item-con__title">{data.newsName}</View>
-          <View className="item-con__date">于{dayjs(data.createDate).format('YYYY-MM-DD hh:mm:ss')}发布</View>
+          <View className="item-con__date">{dayjs(data.createDate).format('YYYY-MM-DD')}</View>
         </View>
       </View>
     );

src/pages/news/item.scss

@@ -1,14 +1,17 @@
 @import "@styles/theme.scss";
 .item {
-  border-bottom: solid 2px $border-color-light;
+  padding: 50px 0;
+  border-bottom: solid 1px $border-color-light;
   display: flex;
   justify-content: space-between;
   align-items: center;
+	margin:0 30px;
+
   &-img {
-    width: 300px;
-    height: 160px;
-    margin-right: 24px;
-    border-radius: 4px;
+    width: 400px;
+    height: 200px;
+    margin-right: 30px;
+    border-radius: 10px;
   }
 
   &-con {
@@ -19,14 +22,14 @@
     height: 200px;
 
     &__title {
-      font-size: 28px;
-			margin-top: 32px;
+      font-size: $font-size-title;
+			margin-top: 20px;
     }
 
     &__date {
-      font-size: 24px;
-      color: #999;
-			margin-bottom: 32px;
+      font-size: $font-size-content;
+      color: $text-color-lighter;
+			margin-bottom: 20px;
     }
   }
 }

src/pages/person/login/index.js

@@ -3,7 +3,8 @@ import { connect } from '@tarojs/redux'
 import './index.scss'
 import { getCodeMessage,putRegister} from '@services/getCode'
 import { Input, Button } from '@tarojs/components'
-
+import * as actions from '@actions/user'
+@connect(state => state.user, { ...actions })
 export default class Index extends Component {
   config = {
     navigationBarTitleText: '个人中心'
@@ -84,6 +85,7 @@ export default class Index extends Component {
       code:code
     }
     putRegister(payload).then(res => {
+      this.props.dispatchUpdateUserInfoNew(res.personId)
         Taro.showLoading({
           title: '登录中...',
           duration: 1000

src/pages/person/myGuest/editGuest/index.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro'
 import { connect } from '@tarojs/redux'
 import {customerGet,customerEdit} from '@services/report'
+import { getItemList } from '@services/item'
 import './index.scss'
 
 export default class editGuest extends Component {
@@ -13,7 +14,8 @@ export default class editGuest extends Component {
     projectStates: ['报备', '认筹', '签约', '到访', '无效'],
     projectState:'报备',
     priceRanges:['0-10000元/㎡','10000-20000元/㎡','20000-30000元/㎡','30000-50000元/㎡','50000-70000元/㎡','70000-100000元/㎡',,'100000元/㎡以上'],
-    clickFlag:false
+    clickFlag:false,
+    floorList:''
   }
   config = {
     navigationBarTitleText: '客户详情',
@@ -25,6 +27,7 @@ export default class editGuest extends Component {
       customerId:customerId
     },function(){
       this.loadGuest(customerId)
+      this.loadProject()
     })
   }
 
@@ -106,9 +109,24 @@ export default class editGuest extends Component {
       url: '/pages/person/myGuest/index'
     })
   }
-
+  loadProject(){
+    getItemList().then(res => {
+      this.setState({
+        floorList: res
+      })
+    })
+  }
+  getName(dict, id,data) {
+    dict = dict.records || []
+    if(data == 'intention'){
+      return  (dict.filter(({ intention: target }) => id === target)[0] || {}).buildingName
+    }else{
+      return  (dict.filter(({ buildingId: target }) => id === target)[0] || {}).buildingName
+    }
+    
+  }
   render() {
-    const {TaCustomer}=this.state
+    const {TaCustomer,floorList}=this.state
     return (
       <View className='content'>
           <Image src={TaCustomer.picture} className='head_img'></Image>
@@ -124,7 +142,7 @@ export default class editGuest extends Component {
           <View className='col_box'>
               <Text className='star'>*</Text>
               <Text className='col_name1'>意向项目:</Text>
-              <Input disabled className='col_message' value={TaCustomer.intention}/>
+              <Input disabled className='col_message' value={TaCustomer.intention ? this.getName(floorList,TaCustomer.intention,'intention') :this.getName(floorList,TaCustomer.buildingId,'buildingId') }/>
           </View>
           <View className='col_box'>
               <Text className='star'>*</Text>
@@ -134,7 +152,7 @@ export default class editGuest extends Component {
           <View className='col_box'>
               <Text className='star'>*</Text>
               <Text className='col_name1'>客户电话:</Text>
-              <Input disabled className='col_message' value='18651884578'/>
+              <Input disabled className='col_message' value={TaCustomer.phone || TaCustomer.tel}/>
           </View>
           <View className='col_box'>
               <Text className='col_name2'>物业类型:</Text>

src/pages/person/myGuest/index.js

@@ -124,7 +124,7 @@ export default class myGuest extends Component {
                     <View className="col_top_right" onClick={this.goEdit.bind(this,item.customerId)}>编辑</View>
                   </View>
                   <View className="col_bottom1">
-                      <View className="col_name">备注信息:{item.describe}</View>
+                      <View className="col_name">备注信息:{item.describe ? item.describe :'暂无'}</View>
                   </View>
                   <View className="col_bottom1">
                     <View className="col_name">预约到访时间:{dayjs(item.createDate).format('YYYY-MM-DD hh:mm:ss')}</View>

src/pages/person/spread/index.js

@@ -31,7 +31,7 @@ export default class Index extends Component {
       }
       const { userInfo: { person: { personId, personType, agentCode, avatarurl, nickname } } } = this.props
       const payload = {
-        "scene": personType == ROLE_CODE['CONSULTANT'] ? `id=${personId}&from=card_share&recommender=${personId}` : `id=${personId}&from=card_share&recommender=${personId}&agentCode=${agentCode}`,
+        "scene": personType == ROLE_CODE['CONSULTANT'] ? `id=${personId}&from=card_share&recommender=${personId}` : `id=${personId}&from=share&recommender=${personId}&agentCode=${agentCode}`,
         "page": personType == ROLE_CODE['CONSULTANT'] ? 'pages/card/index' : 'pages/agent/become/index',
       }
       getMiniQrcode(payload).then(qrcode => {

src/pages/policy/index.js

@@ -18,7 +18,8 @@ export default class Index extends Component {
     list: [],
     hasMore: true,
     isEmpty: false,
-    recordId: null
+    recordId: null,
+    pageIndex:1
   }
 
 
@@ -39,7 +40,8 @@ export default class Index extends Component {
     this.setState({
       list,
       isEmpty: total == 0,
-      hasMore: list.length >= total ? false : true
+      hasMore: list.length >= total ? false : true,
+      pageIndex:1
     })
     rest && rest()
   }
@@ -47,11 +49,12 @@ export default class Index extends Component {
   onScrollToLower = async (fn) => {
     const { list } = this.state;
     pageIndex++
-    const { records, total } = await this.loadList(pageIndex);
+    const { records, total } = await this.loadList(this.state.pageIndex+1);
     const policyList = list.concat(records)
     this.setState({
       list: policyList,
-      hasMore: policyList.length >= total ? false : true
+      hasMore: policyList.length >= total ? false : true,
+      pageIndex:this.state.pageIndex+1
     });
     fn && fn();
   }

src/pages/project/detail/index.js

@@ -310,7 +310,7 @@ export default class Index extends Component {
           avatarurl: _avatarurl,//访问者头像
           poster: posters[0].posterImg,
           price: price,
-          buildingRestaurant: buildingRestaurant,
+          posterDescription: posters[0].posterDescription,
           buildingName: posters[0].posterTitle,//标题
           createDate: createDate,//时间
           buildingTag: buildingTag,//标签,
@@ -544,7 +544,9 @@ export default class Index extends Component {
                         </View>
                         <View className='row'>
                           <Text className='row-label'>项目参考价格：</Text>
-                          <Text className='row-txt'>约{item.price}/m²</Text>
+                          {
+                            item.price ? <Text className='row-txt'>约{item.price}元/m²</Text> : <Text className='row-txt'>待定</Text>
+                          }
                         </View>
                         <View className='row'>
                           <Text className='row-label'>产权：</Text>
@@ -652,7 +654,7 @@ export default class Index extends Component {
                   consultants.slice(0, 3).map(item => (
                     <View className="item" key={item.id} onClick={this.handleConsuItemClick.bind(this, item)}>
                       <View className="flex">
-                        <Image className="avatar" mode="aspectFill" src={item.avatar || item.photo}></Image>
+                        <Image className="avatar" mode="aspectFill" src={item.photo || item.avatar}></Image>
                         <View className='name-txt'>
                           <Text className="name">{item.userName}</Text>
                           <Text className='txt'>{item.description || ' '}</Text>
@@ -781,18 +783,20 @@ export default class Index extends Component {
                         <View className='house-type__name'><Text style="color:#FA5431;margin-right:10px">{item.buildingArea}</Text>{item.apartmentName}</View>
                         <View className='construction__area'>
                           <Text>建面{item.buildingArea}m²</Text>
-                          <Text>套内{item.insideArea}m²</Text>
+                          {
+                            item.insideArea ? <Text>套内{item.insideArea}m²</Text> : <Text>套内待定</Text>
+                          }
                         </View>
                       </View>
                     </View>
                   ))}
-
                 </View>
               </ScrollView>
             </View>
           )
         }
       </Block>
+
     )
   }
   renderActivities() {
@@ -812,7 +816,7 @@ export default class Index extends Component {
                 <View className="house-type__list" style="margin-top:10px">
                   {
                     activityList.map(item => (
-                      <View className="news-item" key={item.dynamicId} onClick={this.handActivityItemClick.bind(this,item.dynamicId)}>
+                      <View className="news-item" key={item.dynamicId} onClick={this.handActivityItemClick.bind(this, item.dynamicId)}>
                         <Image src={item.imgUrl} className="news-item__pic"></Image>
                         <View className="news-item__title">{item.title}</View>
                       </View>

src/pages/project/detail/poster.js

@@ -39,7 +39,7 @@ export default class Index extends Component {
     const texts = [
       {
         x: 30,
-        y: 820,
+        y: 740,
         text: data.buildingName,
         fontSize: 36,
         color: 'black',
@@ -51,8 +51,8 @@ export default class Index extends Component {
         zIndex: 999
       },{
         x: 30,
-        y: 890,
-        text: data.price,
+        y: 820,
+        text: data.price ? '约'+data.price+'元/m²' : '待定',
         fontSize: 36,
         color: 'red',
         baseLine: 'middle',
@@ -62,9 +62,22 @@ export default class Index extends Component {
         width: 560,
         zIndex: 999
       },
+      ,{
+        x: 30,
+        y: 890,
+        text: data.posterDescription,
+        fontSize: 28,
+        color: '#999',
+        baseLine: 'middle',
+        lineNum: 2,
+        lineHeight: 48,
+        // textAlign: 'center',
+        width: 560,
+        zIndex: 999
+      },
       {
         x: 30,
-        y: 1010,
+        y: 1015,
         text: '长按识别小程序码',
         fontSize: 26,
         color: '#999',
@@ -75,7 +88,7 @@ export default class Index extends Component {
       },
       {
         x: 30,
-        y: 1065,
+        y: 1070,
         text: '进入',
         fontSize: 26,
         color: '#999',
@@ -86,19 +99,19 @@ export default class Index extends Component {
       },
       {
         x: 100,
-        y: 1065,
+        y: 1070,
         text: '橙蕉',
-        fontSize: 28,
-        color: 'black',
+        fontSize: 34,
+        color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
         width: 120,
         zIndex: 11
       },
       {
-        x: 240,
-        y: 1065,
-        text: '报名活动',
+        x: 190,
+        y: 1070,
+        text: '项目详情',
         fontSize: 26,
         color: '#999',
         baseLine: 'middle',
@@ -117,9 +130,9 @@ export default class Index extends Component {
       },
       {
         url: data.qrcode,
-        width: 160,
-        height: 160,
-        y: 950,
+        width: 150,
+        height: 150,
+        y: 970,
         x: 450,
         zIndex: 999
       },
@@ -127,7 +140,7 @@ export default class Index extends Component {
         url: data.avatarurl || require('@assets/default-avatar.png'),
         width: 130,
         height: 130,
-        y: 630,
+        y: 550,
         x: 20,
         borderRadius: 130,
         zIndex: 999
@@ -137,9 +150,9 @@ export default class Index extends Component {
     const blocks = [
       {
         x: 0,
-        y: 936,
+        y: 966,
         width: 640,
-        height: 200,
+        height: 160,
         backgroundColor: 'rgba(248,248,248,1)',
         zIndex: 1
       }

src/pages/project/item/index.js

@@ -25,7 +25,11 @@ export default class Index extends Component {
           <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>
           <View className='item__right'>
             <View className='item__right__title'>{data.name}</View>
-            <View className='item__right__price row'><Text className='price__txt'>均价{data.price || 0}</Text></View>
+            <View className='item__right__price row'>
+              {
+                data.price ? <Text className='price__txt'>均价{data.price}元/m²</Text> : <Text className='price__txt'>待定</Text>
+              }
+            </View>
           </View>
 
           <View className='item__right__region row'><Text className="location-icon iconfont icon-daohangdizhi"></Text>{data.buildingArea}</View>

src/pages/project/list/index.js

@@ -21,7 +21,8 @@ export default class Index extends Component {
     hasMore: true,
     isEmpty: false,
     recordId: null,
-    filterOpt: {}
+    filterOpt: {},
+    pageIndex:1
   }
 
   componentWillMount() {
@@ -62,7 +63,8 @@ export default class Index extends Component {
     this.setState({
       list,
       isEmpty: total == 0,
-      hasMore: list.length >= total ? false : true
+      hasMore: list.length >= total ? false : true,
+      pageIndex:1
     })
     rest && rest()
   }
@@ -70,11 +72,14 @@ export default class Index extends Component {
   onScrollToLower = async (fn) => {
     const { list } = this.state;
     pageIndex++
-    const { records, total } = await this.loadList(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
+      hasMore: newList.length >= total ? false : true,
+      pageIndex:this.state.pageIndex+1
+    },()=>{
+      console.log('pageIndex:'+this.state.pageIndex)
     });
     fn && fn();
   }

src/pages/report/index.js

@@ -17,7 +17,8 @@ export default class Index extends Component {
     list: [],
     hasMore: true,
     isEmpty: false,
-    recordId: null
+    recordId: null,
+    pageIndex:1
   }
 
   loadList(pageNumber) {
@@ -38,7 +39,8 @@ export default class Index extends Component {
     this.setState({
       list,
       isEmpty: total == 0,
-      hasMore: list.length >= total ? false : true
+      hasMore: list.length >= total ? false : true,
+      pageIndex:1
     })
     rest && rest()
   }
@@ -46,11 +48,12 @@ export default class Index extends Component {
   onScrollToLower = async (fn) => {
     const { list } = this.state;
     pageIndex++
-    const { records, total } = await this.loadList(pageIndex);
+    const { records, total } = await this.loadList(this.state.pageIndex+1);
     const reportList = list.concat(records)
     this.setState({
       list: reportList,
-      hasMore: reportList.length >= total ? false : true
+      hasMore: reportList.length >= total ? false : true,
+      pageIndex:this.state.pageIndex+1
     });
     fn && fn();
   }

src/services/checkin.js

@@ -0,0 +1,22 @@
+import { fetch } from '@utils/request'
+import {
+  API_CHECKIN_DETAILS,
+  API_CHECKIN_ACTIVE
+} from '@constants/api'
+
+
+
+/**
+ * 获取签到详情
+ */
+export const checkinDetails = (id, type) => fetch({ url: `${API_CHECKIN_DETAILS}/${id}?type=${type}`, method: 'GET' })
+
+
+
+/**
+ * 签到
+ * @param {*} enlistId 
+ */
+export const checkinActive = enlistId => fetch({ url: `${API_CHECKIN_ACTIVE}/${enlistId}`, method: 'PUT' })
+
+// /wx/buildingDynamicCheckin/{enlistId} 扫码活动签到 PUT