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

src/components/empty-page/index.scss

@@ -13,5 +13,6 @@
   &__text{
     font-size:30px;
     color: $text-color-light;
+    line-height: 3;
   }
 }

src/pages/activity/detail/assemble.js

@@ -75,6 +75,7 @@ export default class Detail extends Component {
     consultData: {}, // 分享的置业顾问信息
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     reportedCustomer: false,
+    qrcodeParams: '',
   }
 
   componentWillMount() {
@@ -122,7 +123,7 @@ export default class Detail extends Component {
 
       if (!id) {
         getQrCodeParams(this.$router.params.scene).then(res => {
-          this.setState({ id: res.id, recordId: res.recordId }, () => {
+          this.setState({ id: res.id, recordId: res.recordId, qrcodeParams: res }, () => {
             this.loadDetail()
           })
         }).catch(err => {
@@ -264,14 +265,14 @@ export default class Detail extends Component {
   }
 
   loadDetail() {
-    let { id, recordId, ltTicker } = this.state
+    let { id, recordId, ltTicker, qrcodeParams } = this.state
     const { userInfo } = this.props
 
     Taro.showLoading()
     const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant
-    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
-    const recommender = this.$router.params.recommender || router.query.recommender || ""
+    const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
+    const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
+    const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
     getGroupDetail(id, recordId).then(res => {
       this.stopTicker()
 

src/pages/activity/detail/assistance.js

@@ -75,6 +75,7 @@ export default class Detail extends Component {
     consultData: {}, // 分享的置业顾问信息
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     reportedCustomer: false,
+    qrcodeParams: '',
   }
 
   componentWillMount() {
@@ -124,7 +125,7 @@ export default class Detail extends Component {
 
       if (!id) {
         getQrCodeParams(this.$router.params.scene).then(res => {
-          this.setState({ id: res.id, initiateId: res.initiateId }, () => {
+          this.setState({ id: res.id, initiateId: res.initiateId, qrcodeParams: res, }, () => {
             this.loadDetail()
           })
         }).catch(err => {
@@ -267,14 +268,14 @@ export default class Detail extends Component {
 
   // 请求详情
   loadDetail() {
-    let { id, initiateId, ltTicker } = this.state
+    let { id, initiateId, ltTicker, qrcodeParams } = this.state
     const { userInfo } = this.props
 
     Taro.showLoading()
     const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant
-    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
-    const recommender = this.$router.params.recommender || router.query.recommender || ""
+    const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
+    const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
+    const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
     getHelpDetail(id, initiateId).then(res => {
       this.stopTicker()
 
@@ -482,7 +483,7 @@ export default class Detail extends Component {
       if (this.toggleGrantAvatar()) {
         const detail = this.state.detail
         const person = this.props.userInfo.person
-  
+
         createHelpActivity({
           buildingId: detail.buildingId,
           helpActivityId: detail.helpActivityId,
@@ -508,19 +509,19 @@ export default class Detail extends Component {
         })
       } else {
         reject()
-      }  
+      }
     }
 
     return new Promise((resolve, reject) => {
       const { userInfo: { miniApp: { tpls } } } = this.props
       const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HELP && x.isSubscribe == true))[0].tplId
-      
+
       wx.requestSubscribeMessage({
         tmplIds: [tplId],
-        success(res) {},
-        fail(res) {},
+        success(res) { },
+        fail(res) { },
         complete() {
-          makeHelp(resolve, reject)  
+          makeHelp(resolve, reject)
         }
       })
     });
@@ -543,12 +544,12 @@ export default class Detail extends Component {
         const that = this
         wx.requestSubscribeMessage({
           tmplIds: [tplId],
-          success(res) {},
-          fail(res) {},
+          success(res) { },
+          fail(res) { },
           complete() {
             that.toggleActionVisible()
           }
-        })        
+        })
       }
     }
   }

src/pages/activity/detail/index.js

@@ -51,6 +51,7 @@ export default class Detail extends Component {
     consultData: {}, // 分享的置业顾问信息
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     reportedCustomer: false,
+    qrcodeParams: '',
   }
 
   componentWillMount() {
@@ -59,7 +60,7 @@ export default class Detail extends Component {
       const id = this.$router.params.id || router.query.id
       if (!id) {
         getQrCodeParams(this.$router.params.scene).then(res => {
-          this.setState({ id: res.id }, () => {
+          this.setState({ id: res.id, qrcodeParams: res }, () => {
             this.loadDetail()
           })
         }).catch(err => {
@@ -94,12 +95,12 @@ export default class Detail extends Component {
   }
 
   loadDetail() {
-    const { id } = this.state
+    const { id, qrcodeParams } = this.state
     Taro.showLoading()
     const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant
-    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
-    const recommender = this.$router.params.recommender || router.query.recommender || ""
+    const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
+    const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
+    const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
 
     queryActivityDetail(id).then(res => {
       Taro.hideLoading()

src/pages/card/fans/index.js

@@ -1,12 +1,10 @@
 import Taro, { Component } from '@tarojs/taro';
-import './index.scss'
 import { queryCardFansList } from '@services/card'
 import { queryItemFansList } from '@services/item'
-
+import EmptyPage from '@components/empty-page'
 import FansItem from './item'
 import ListView from '@components/ListView'
 import { savePoint, updatePoint } from '@services/common'
-import emptyImg from '@assets/empty.png'
 let pageIndex = 1
 export default class Index extends Component {
   config = {
@@ -17,9 +15,11 @@ export default class Index extends Component {
     hasMore: true,
     isEmpty: false,
     recordId: null,
-    pageIndex: 1
+    pageIndex: 1,
+    noReacord: false,
   }
   componentDidMount() {
+    Taro.showLoading()
     this.loadList();
 
     // App.zhuge.track('查看粉丝页面')
@@ -63,15 +63,28 @@ export default class Index extends Component {
     }
     if (type === "card") {
       queryCardFansList(id, payload).then(res => {
+        const { records } = res
+
         this.setState({
-          list: res.records
+          list: records,
+          noReacord: records.length ? false : true
         })
+        Taro.hideLoading()
+      }).catch(err => {
+        Taro.hideLoading()
+        console.log(err, '我的主页')
       })
     } else {
       queryItemFansList(id, payload).then(res => {
+        const { records } = res
         this.setState({
-          list: res.records
+          list: records,
+          noReacord: records.length ? false : true
         })
+        Taro.hideLoading()
+      }).catch(err => {
+        Taro.hideLoading()
+        console.log(err, '我的主页')
       })
     }
     // return type === "card" ? queryCardFansList(id, payload) : queryItemFansList(id, payload)
@@ -106,7 +119,7 @@ export default class Index extends Component {
   // }
 
   render() {
-    const { hasMore, isEmpty, list } = this.state
+    const { hasMore, isEmpty, list, noReacord } = this.state
     return (
       // <ListView
       //   needInit
@@ -120,24 +133,14 @@ export default class Index extends Component {
       //   {list.map(item => <FansItem key={item.uvId} data={item} />)}
       // </ListView>
       <View>
-        {/* {
-          list.length &&
+        {!noReacord ?
           <View>
-
-            {list.map(item => <FansItem key={item.uvId} data={item} />)}
-            <View style="text-align:center;line-height:160rpx;font-size:28rpx;color:#999">
-              仅展示最近N条记录~
-
+            {list.map(item =>
+              <FansItem key={item.uvId} data={item} />)}
+            {list.length >= 50 && <View style="text-align:center;line-height:120rpx;font-size:24rpx;color:#999"> 仅展示最近50条围观记录</View>}
           </View>
-          </View>
-        } */}
-        {
-          list.length == 1 &&
-          <View >
-            <Image  mode="widthFix" src={emptyImg}></Image>
-            <View >暂无访问记录~</View>
-          </View>
-        }
+          : <EmptyPage text="暂无围观记录哦~" />}
+
       </View>
 
     );

src/pages/card/fans/item.scss

@@ -9,21 +9,21 @@
 
   &-info {
     .avatar {
-      width: 120px;
-      height: 120px;
+      width: 124px;
+      height: 124px;
       border-radius: 50%;
       vertical-align: middle;
     }
 
     .name {
       font-size: 32px;
-      margin-left: 30px;
+      margin-left: 26px;
       vertical-align: middle;
     }
   }
 
   &-time {
     color: $text-color-lighter;
-    font-size:26px;
+    font-size:24px;
   }
 }

src/pages/news/detail/index.js

@@ -45,6 +45,7 @@ export default class NewsDetail extends Component {
     consultData: {}, // 分享的置业顾问信息
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     reportedCustomer: false,
+    qrcodeParams: '',
   }
 
   componentWillMount(options) {
@@ -65,7 +66,7 @@ export default class NewsDetail extends Component {
 
       if (!newsId) {
         getQrCodeParams(this.$router.params.scene).then(res => {
-          this.setState({ newsId: res.id }, () => {
+          this.setState({ newsId: res.id, qrcodeParams: res }, () => {
             this.loadDetail()
             addNewsUv(res.id)
           })
@@ -220,11 +221,11 @@ export default class NewsDetail extends Component {
   }
 
   loadDetail() {
-    const { newsId } = this.state
+    const { newsId, qrcodeParams } = this.state
     const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant
-    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
-    const recommender = this.$router.params.recommender || router.query.recommender || ""
+    const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
+    const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
+    const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
     Taro.showLoading()
     queryNewsDetail(newsId).then(res => {
       Taro.hideLoading()

src/pages/person/index.js

@@ -22,7 +22,7 @@ export default class Person extends Component {
 
   state = {
     isLogin: false,
-    user: {},
+    users: {},
     isAgent: false,//经纪人
     consultant: false,//置业顾问
     tourist: false,//普通用户,
@@ -38,13 +38,13 @@ export default class Person extends Component {
   }
 
   loadUserInfo() {
-    queryUserInfo().then(user => {
-      const [roleSetting, roleName] = this.getRoleName(user.personType)
+    queryUserInfo().then(users => {
+      const [roleSetting, roleName] = this.getRoleName(users.personType)
 
       this.setState({
-        user,
-        phone: user.phone,
-        menus: menus.map(group => group.filter(x => x.userTypes.indexOf(user.personType) > -1)),
+        users,
+        phone: users.phone,
+        menus: menus.map(group => group.filter(x => x.userTypes.indexOf(users.personType) > -1)),
         roleName,
         ...roleSetting,
       })
@@ -52,7 +52,7 @@ export default class Person extends Component {
   }
 
   doSign() {
-    const { user: { id, havaSigned } } = this.state
+    const { users: { id, havaSigned } } = this.state
     if (havaSigned) {
       return
     }
@@ -87,7 +87,7 @@ export default class Person extends Component {
   redirectTo = (url) => {
     if (url) {
       if (typeof url === 'function') {
-        Taro.navigateTo({ url: url(this.state.user) })
+        Taro.navigateTo({ url: url(this.state.users) })
       } else {
         Taro.navigateTo({ url })
       }
@@ -169,7 +169,7 @@ export default class Person extends Component {
 
   goPersonDetail() {
 
-    const { user: { personType } } = this.state
+    const { users: { personType } } = this.state
 
     // if (personType == ROLE_CODE['CHANNEL_AGENT'] || personType == ROLE_CODE['ESTATE_AGENT']) {
     Taro.navigateTo({
@@ -184,7 +184,7 @@ export default class Person extends Component {
   }
 
   renderDetail() {
-    const { user, menus, roleName } = this.state
+    const { users, menus, roleName } = this.state
     const { user: { userInfo: { miniApp: { name } } } } = this.props
     // const showQRCode = user.personType === ROLE_CODE['CONSULTANT'] || ROLE_CODE['ESTATE_AGENT'] || ROLE_CODE['CHANNEL_AGENT']
     // const isConsultant = user.personType == ROLE_CODE['CONSULTANT']
@@ -197,16 +197,16 @@ export default class Person extends Component {
           <View className="content">
             <View className="info-block">
               <View className="avatar" onClick={this.goPersonDetail}>
-                <Image className="info__headimg" src={user.avatar} />
+                <Image className="info__headimg" src={users.avatar} />
                 <View className="info-intro">{roleName}</View>
               </View>
 
               <View className="info-text" onClick={this.goPersonDetail}>
-                <View className="info-text__name">{user.name ? user.name : user.nickname}</View>
-                <View className="info-text__intro">积分 {user.points || 0}</View>
+                <View className="info-text__name">{users.name ? users.name : users.nickname}</View>
+                <View className="info-text__intro">积分 {users.points || 0}</View>
               </View>
               {
-                user.personType == 'Realty Consultant' && (
+                users.personType == 'Realty Consultant' && (
                   <Navigator url={`/pages/person/spread/index`} className="tuiguang">
 
                     <Image style="width:40px;height:36px" src={require('@assets/mine/tuiguangma.png')} ></Image>
@@ -223,7 +223,7 @@ export default class Person extends Component {
           </View>
           <View className='qiandao-con'>
             <Text className='qiandao-text'>签到得积分，积分兑好礼，马上去签到吧！</Text>
-            <View className={user.havaSigned ? 'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View>
+            <View className={users.havaSigned ? 'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{users.havaSigned ? '已签到' : '签到'}</View>
             {/* {
               user.havaSigned ?
                 (<View className='reday-qiandao-btn' onClick={this.doSign}> 已签到</View>) :
@@ -268,7 +268,7 @@ export default class Person extends Component {
   }
 
   render() {
-    const { phone, tel } = this.state.user
+    const { phone, tel } = this.state.users
     return (
       <View className='wrap'>
         {(phone || tel) && this.renderDetail()}

src/pages/project/detail/Around/around.js

@@ -62,7 +62,7 @@ export default function Around(props) {
             props.onAction()
         }
     }
-    const tomapDetail = (e) => {     
+    const tomapDetail = (e) => {
         const { buildingId } = this.props
         Taro.navigateTo({
             url: `/pages/project/detail/map?id=` + buildingId
@@ -71,7 +71,8 @@ export default function Around(props) {
     return (
         <View className="around-box">
             <View className="around-header">
-                <PoiAround mapClick={tomapDetail} style="width: 100vw; height: 500rpx;" current={curMarker} coverShow={true} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap} />
+                <PoiAround mapClick={tomapDetail} style="width:100%;height:100%" current={curMarker} coverShow={true} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap} />
+                {/* <PoiAround mapClick={tomapDetail} style="width:100%;height:100%"  current={curMarker} coverShow={true} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap} /> */}
             </View>
             <View className="around-body">
                 <Tab dataset={dataList} className="around-project" onChange={handleTabChange} />

src/pages/project/detail/Around/around.scss

@@ -6,8 +6,9 @@
   background-color: #fff;
     
   .around-header {
-    width: 100%;
-    height: 500px;
+    width: 690px;
+    margin:  0 auto;
+    height: 346px;
   }
   .around-body {
     padding: 0 30px;

src/pages/project/detail/index.js

@@ -67,6 +67,7 @@ export default class Index extends Component {
     consultData: {}, // 分享的置业顾问信息
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     reportedCustomer: false,
+    qrcodeParams: ''
   }
 
   componentWillMount() {
@@ -88,6 +89,10 @@ export default class Index extends Component {
       // 没有找到 id , 再重新找一次
       if (!id) {
         getQrCodeParams(this.$router.params.scene).then(res => {
+          console.log(res,"扫码参数")
+          this.setState({
+            qrcodeParams: res
+          })
           this.initPageData(res.id)
         }).catch(err => {
           Taro.showToast({
@@ -199,11 +204,12 @@ export default class Index extends Component {
       this.loadHelpGroupList()
 
       addItemUv(id)
+      const { qrcodeParams } = this.state
       // 埋点
       const router = Taro.getStorageSync('router') || { query: {} }
-      const consultant = this.$router.params.consultant || router.query.consultant
-      const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
-      const recommender = this.$router.params.recommender || router.query.recommender || ""
+      const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
+      const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
+      const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
       savePoint({
         event: 'detail',
         eventType: 'building',
@@ -839,9 +845,6 @@ export default class Index extends Component {
               更多<Text className="iconfont icon-more"></Text>
             </View>
           </View>
-          {/* <View className="section-head">
-            <Text className="section-head__title">位置及周边配套</Text>
-          </View> */}
         </View>
         <Around building={building} buildingId={this.state.buildingId} ></Around>
       </View>

src/pages/project/floor/index.js

@@ -33,6 +33,10 @@ export default class Index extends Component {
             <Text className='txt left-txt'>项目名称</Text>
             <Text className='txt right-txt'>{projectDetail.buildingName}</Text>
           </View>
+          {/* <View className='item'>
+            <Text className='txt left-txt'>开发商</Text>
+            <Text className='txt right-txt'>{projectDetail.price ? projectDetail.price : '暂无'}</Text>
+          </View> */}
           <View className='item'>
             <Text className='txt left-txt'>均价</Text>
             <Text className='txt right-txt'>{projectDetail.price ? projectDetail.price : '待定'}</Text>
@@ -77,6 +81,10 @@ export default class Index extends Component {
             <Text className='txt left-txt'>规划户数</Text>
             <Text className='txt right-txt'>{projectDetail.familyNum || '暂无'}</Text>
           </View>
+          {/* <View className='item'>
+            <Text className='txt left-txt'>楼栋总数</Text>
+            <Text className='txt right-txt'>{projectDetail.familyNum || '暂无'}</Text>
+          </View> */}
           <View className='item'>
             <Text className='txt left-txt'>绿化率</Text>
             <Text className='txt right-txt'>{projectDetail.greeningRate || '暂无'}</Text>
@@ -85,6 +93,10 @@ export default class Index extends Component {
             <Text className='txt left-txt'>项目说明</Text>
             <Text className='txt right-txt'>{projectDetail.dynamic || '暂无'}</Text>
           </View>
+          {/* <View className='item'>
+            <Text className='txt left-txt'>备案名</Text>
+            <Text className='txt right-txt'>{projectDetail.dynamic || '暂无'}</Text>
+          </View> */}
         </View>
       </View >
     );

src/pages/project/floor/index.scss

@@ -6,25 +6,24 @@
   padding: 5px 0 20px;
   background:rgba(245,245,245,1);
   .more-info{
-    // padding: 40px 0;
     background: #fff;
     margin-top: 20px;
   }
   .item{
-    padding: 40px;
+    padding: 30px 40px;
     border-bottom: 1px solid rgba(240, 238, 238,0.8);
     display: flex;
     .left-txt{
       font-size: 30px;
-      color: rgba(0,0,0,0.4);
+      color: #999;
       width: 30%;
       @include text-ellipsis;
     }
     .right-txt{
-      font-size: 30px;
-      color: #000;
+      font-size: 32px;
+      color: #333;
       width: 70%;
-      @include text-ellipsis;
+      // @include text-ellipsis;
     }
   }
   .item:last-child{

src/pages/project/list/filter/index.js

@@ -15,17 +15,29 @@ export default class Index extends Component {
     visible: false,
     tabIndex: null,
     priceTypeIndex: 0,
-    selectedIndex: new Array(3).fill([0]),
+    selectedIndex: new Array(4).fill([0]),
     tabs: [
-      // {
-      //   name: '户型',
-      //   id: 'huxing',
-      //   list: ['不限', '一室', '两室', '三室', '四室', '五室以上']
-      // },
+      {
+        name: '户型',
+        id: 'huxing',
+        list: ['不限', '一室', '两室', '三室', '四室', '五室以上']
+      },
       {
         name: '价格',
         id: 'price',
         list: ['不限', '10000元/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
+        // list: [
+        //   {
+        //     name: '总价',
+        //     id: 'totalPrice',
+        //     list: ['不限', '100万以下', '100-150万', '150-200万', '200-500万', '500-1000万', '1000万以上']
+        //   },
+        //   {
+        //     name: '单价',
+        //     id: 'unitPrice ',
+        //     list: ['不限', '10000/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
+        //   }
+        // ]
       },
       {
         name: '面积',
@@ -47,7 +59,7 @@ export default class Index extends Component {
     queryItemTypeList().then(res => {
       let houseTypeList = res.records
       houseTypeList.unshift('不限')
-      tabs[2].list = houseTypeList
+      tabs[3].list = houseTypeList
       this.setState({ tabs })
     })
   }
@@ -107,6 +119,7 @@ export default class Index extends Component {
 
   handleFilter() {
 
+    console.log("111")
     const { tabs, keywords, selectedIndex } = this.state
     console.log(this.state)
     let values = selectedIndex.map((selectedList, tabIndex) => {
@@ -118,13 +131,13 @@ export default class Index extends Component {
       }
 
       // 类型
-      // if (tabIndex === 0) {
-      //   let val = selectedList.map(index => curTabList[index])
-      //   return val.join(',')
-      // }
+      if (tabIndex === 0) {
+        let val = selectedList.map(index => curTabList[index])
+        return val.join(',')
+      }
 
       // 价格 面积
-      if (tabIndex === 0 || tabIndex === 1) {
+      if (tabIndex === 1 || tabIndex === 2) {
         let val = selectedList.map(index => {
           let value = curTabList[index]
           let regVal = value.match(/\d*([-\d]*)?/)
@@ -147,7 +160,7 @@ export default class Index extends Component {
       }
 
       // 类型
-      if (tabIndex === 2) {
+      if (tabIndex === 3) {
         let val = selectedList.map(index => curTabList[index].buildingTypeId)
         return val.join(',')
       }
@@ -155,10 +168,10 @@ export default class Index extends Component {
     console.log(values)
     let params = {
       name: keywords,
-      // houseType: values[0],
-      price: values[0],
-      area: values[1],
-      buildingType: values[2],
+      houseType: values[0],
+      price: values[1],
+      area: values[2],
+      buildingType: values[3],
     }
     console.log(params)
     this.props.onFilter(params, () => {
@@ -205,7 +218,7 @@ export default class Index extends Component {
         {
           tabs[tabIndex].list.map((item, index) => (
             <View
-              key={index+'tab'}
+              key={index + 'tab'}
               className={`row ${selectedIndex[tabIndex].includes(index) ? 'active' : ''}`}
               onClick={this.handleFilterItemClick.bind(this, index)}>
               {item.name || item.buildingTypeName || item}
@@ -223,7 +236,7 @@ export default class Index extends Component {
 
   renderPrice() {
     const { priceTypeIndex, tabs, tabIndex, selectedIndex } = this.state
-    const priceArr = tabs[0].list
+    const priceArr = tabs[1].list
     const list = priceArr[priceTypeIndex].list
     return (
       <View className="price">
@@ -242,7 +255,7 @@ export default class Index extends Component {
           {
             list.map((text, index) => (
               <View
-                key={index+'list'}
+                key={index + 'list'}
                 className={`price-item ${selectedIndex[tabIndex].includes(index) ? 'selected' : ''}`}
                 onClick={this.handleFilterItemClick.bind(this, index)}>
                 {text}
@@ -285,7 +298,7 @@ export default class Index extends Component {
         <View className="search-box">
           <View className="search">
             <Text className="search-icon icon-sousuo iconfont"></Text>
-            <Input className="search-input" type="text" confirm-type="搜索" onConfirm={this.handleFilter} value={keywords} onInput={this.onInputText.bind(this)} placeholder="请输入你想查询的楼盘"></Input>
+            <Input className="search-input" type="text" focus confirm-type="搜索" onConfirm={this.handleFilter} value={keywords} onInput={this.onInputText.bind(this)} placeholder="请输入你想查询的楼盘"></Input>
           </View>
           <View className="location" onClick={this.handleLocationClick}>
             <Text className="location-icon iconfont icon-daohangdizhi"></Text>

src/pages/project/list/filter/index.scss

@@ -80,8 +80,8 @@
     background: #F9F9F9;
 
     &-item {
-      width: 33.33%;
-      // width: 25%;
+      // width: 33.33%;
+      width: 25%;
       height: 100px;
       display: flex;
       justify-content: center;

src/pages/shop/rule/index.js

@@ -1,24 +1,29 @@
 import Taro, { Component } from '@tarojs/taro';
-import { getWindowHeight } from '@utils/style'
 import './index.scss'
-
+import { transferImage } from '@utils/tools'
 import ready from '@utils/ready'
 import { connect } from '@tarojs/redux'
 import * as actions from '@actions/shop'
-import dayjs from 'dayjs'
+import { View } from '@tarojs/components';
+import { queryUserInfo, doUserSignin } from '@services/user'
+const ruleBg = require('@assets/rulebg.png')
+
+@connect(state => ({ ...state.shop, ...state.user, ...state.city, }), { ...actions })
 
-@connect(state => ({ ...state.shop, ...state.user }), { ...actions })
 export default class Shop extends Component {
   config = {
     navigationBarTitleText: '积分规则'
   }
 
   state = {
-    pointRule: []
+    pointRule: [],
+    user: {},
   }
 
   componentWillMount() {
+    this.loadUserInfo()
     this.loadRecords()
+
   }
 
   loadRecords() {
@@ -29,6 +34,85 @@ export default class Shop extends Component {
       })
       Taro.hideLoading()
     })
+
+  }
+  loadUserInfo() {
+    queryUserInfo().then(user => {
+      this.setState({
+        user,
+      })
+    })
+  }
+  getBtnName(code) {
+    const { user: { havaSigned } } = this.state
+    switch (code) {
+      case 'checkin':
+        return havaSigned ? '已签到' : '签到'
+      case 'share-poster':
+        return '去分享'
+      case 'recommend-customer':
+        return '去推荐'
+      case 'signup-agent':
+        return '去授权'
+      case 'document_verify':
+        return '去提交'
+      default:
+        return '立即参与'
+    }
+  }
+  // 签到
+  doSign(pointsAmount) {
+    const { user: { id, havaSigned } } = this.state
+
+
+    if (havaSigned) {
+      return
+    }
+    doUserSignin({ id }).then(res => {
+      Taro.showToast({
+        title: `签到成功，获取${pointsAmount}积分`,
+        icon: 'none'
+      })
+      this.loadUserInfo()
+
+    })
+  }
+  handleItemClick(item) {
+    switch (item.code) {
+      case 'checkin':
+        this.doSign(item.pointsAmount)
+        return
+      case 'share-poster':
+        Taro.switchTab({
+          url: '/pages/project/index'
+        })
+        return
+      case 'recommend-customer':
+        Taro.navigateTo({
+          url: `/pages/agent/recommend/index?type=index&cityId=` + this.props.curCity.id
+        })
+        return
+      case 'signup-agent':
+        Taro.navigateTo({
+          url: '/pages/person/personDetail/index'
+        })
+        return
+      case 'document_verify':
+        Taro.navigateTo({
+          url: '/pages/person/profile/index'
+        })
+        return
+      default:
+        Taro.getApp().props.projectIndex = 2
+        Taro.switchTab({
+          url: `/pages/activity/activity`,
+          fail: res => {
+            Taro.getApp().props.projectIndex = 0
+          }
+        })
+        return
+    }
+
   }
 
   render() {
@@ -36,28 +120,24 @@ export default class Shop extends Component {
     const { pointRule } = this.state
 
     return (
-      <View className="page">
-        <View className='rule_title'>
-          <Text>积分项</Text>
-          <Text>奖励积分</Text>
-          <Text>说明</Text>
-        </View>
+      // <View className="page" style={`background: url(${transferImage(buildBg)}) no-repeat center;background-size: 100% 100%;`}>
+      <View className="page" >
+        <Image className="bg-img" src={transferImage(ruleBg)} mode='widthFix'></Image>
         <ScrollView
           scrollY
           scroll-with-animation
           enable-back-to-top
           className="list"
           style={{
-            height: '65vh'
+            maxHeight: '78vh'
           }}>
           {
             pointRule.length === 0 ? '' : (
               pointRule.map(item => (
                 <View className='rule_item' key={item.ruleId}>
-                  <Text>{item.ruleName}</Text>
-                  <Text>+{item.pointsAmount}</Text>
-                  <Text>{item.remark}</Text>
-                  {/* <Text>{dayjs(item.updateDate).format('YYYY-MM-DD HH:mm:ss')}</Text> */}
+                  <View className="item-name">{item.ruleName}<Text className="item-num">+{item.pointsAmount}</Text><Text className="jifen">积分</Text></View>
+                  <View className="item-rule">{item.remark}</View>
+                  <View className={this.getBtnName(item.code)=='已签到'?'yiqiandao':"item-btn"} onClick={this.handleItemClick.bind(this, item)}>{this.getBtnName(item.code)}</View>
                 </View>
               ))
             )

src/pages/shop/rule/index.scss

@@ -1,54 +1,107 @@
 @import "@styles/theme.scss";
 .page {
   position: relative;
-  background: #F2F2F2;
   width: 100%;
   height: 100%;
-  .rule_title {
-    position: fixed;
-    width: 100%;
-    left: 0%;
-    background: #fff;
-    color: #fd8000;
-    font-size: 28px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 30px 90px;
-    box-shadow: 0px 5px 5px 0px rgba(0, 0, 0, 0.05);
-    font-weight:500;
+  .bg-img{
+    width: 100vw;
+    display: block;
   }
+  // .rule_title {
+  //   position: fixed;
+  //   width: 100%;
+  //   left: 0%;
+  //   background: #fff;
+  //   color: #fd8000;
+  //   font-size: 28px;
+  //   display: flex;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   padding: 30px 90px;
+  //   box-shadow: 0px 5px 5px 0px rgba(0, 0, 0, 0.05);
+  //   font-weight:500;
+  // }
   .list {
     position: absolute;
-    width: 100%;
-    top: 100px;
+    width: 690px;
+    left: 30px;
+    top: 560px;
+    background: #fff;
+    border-radius: 12px;
     .rule_item {
       position: relative;
       width: 100%;
-      text-align: center;
-      border-bottom: 2px solid rgba(151, 151, 151, 0.0865);
-      padding: 40px 12px;
-      display: inline-flex;
-      background: #fff;
-      Text {
-        width: 33.33%;
-        text-align: center;
-        float: left;
+      box-shadow:0px 1px 0px 0px rgba(0,0,0,0.08);
+      padding: 24px 20px 28px 20px;
+      .item-name{
+        font-size: 34px;
+        color: #333;
+        display: flex;
+        align-items: center;
+        margin-bottom: 16px;
+        .item-num{
+          font-size: 36px;
+          color: #FF8203;
+          margin: 0 6px 0 10px;
+        }
+        .jifen{
+          font-size: 24px;
+          color: #666;
+        }
       }
-      Text:nth-of-type(1){
-        color:rgba(0,0,0,1);
-        font-size: 30px;
-        font-weight:500;
+      .item-rule{
+        font-size: 24px;
+        color: #999;
+        width: 500px;
       }
-      Text:nth-of-type(2){
-        color:rgba(255,59,51,1);
-        font-size: 32px;
-        font-weight: 500;
+      .yiqiandao{
+        width:120px;
+        height:60px;
+        background:#d8d8d8;
+        border-radius:30px;
+        position: absolute;
+        right: 20px;
+        top: 24px;
+        color: #fff;
+        font-size: 26px;
+        text-align: center;
+        line-height: 60px;
+
       }
-      Text:nth-of-type(3){
-        color:rgba(0,0,0,0.33);
-        font-size: 24px;
+      .item-btn{
+        width:120px;
+        height:60px;
+        background:linear-gradient(180deg,rgba(255,222,131,1) 0%,rgba(255,129,2,1) 100%);
+        box-shadow:0px 12px 30px -8px rgba(255,131,5,0.5);
+        border-radius:30px;
+        position: absolute;
+        right: 20px;
+        top: 24px;
+        color: #fff;
+        font-size: 26px;
+        text-align: center;
+        line-height: 60px;
       }
+      // display: inline-flex;
+      // Text {
+      //   width: 33.33%;
+      //   text-align: center;
+      //   float: left;
+      // }
+      // Text:nth-of-type(1){
+      //   color:rgba(0,0,0,1);
+      //   font-size: 30px;
+      //   font-weight:500;
+      // }
+      // Text:nth-of-type(2){
+      //   color:rgba(255,59,51,1);
+      //   font-size: 32px;
+      //   font-weight: 500;
+      // }
+      // Text:nth-of-type(3){
+      //   color:rgba(0,0,0,0.33);
+      //   font-size: 24px;
+      // }
     }
   }
 }