首页资讯公告、盘客工具拆分

src/app.js

@@ -49,6 +49,7 @@ class App extends Component {
       'pages/activity/myActivity',
       'pages/person/index',
       'pages/person/customerAnalysis/index',
+      'pages/person/customerAnalysis/analysis',
       'pages/person/profile/index',
       'pages/person/profile/detail/index',
       'pages/project/detail/index',

src/pages/person/customerAnalysis/analysis.js

@@ -18,7 +18,7 @@ const rand = n => Math.random().toString(36).substr(2, n)
 export default class analysis extends Taro.Component {
 
   config = {
-    navigationBarTitleText: ''
+    navigationBarTitleText: '客户分析'
   }
 
   state = {

src/pages/person/customerAnalysis/index.js

@@ -59,11 +59,11 @@ export default class customer extends Taro.Component {
   }
 
   render() {
-    const tabList = [{ title: '我的客户' },{ title: '客户分析' }]
+  
     const { customerNum, current } = this.state
     return (
-      <AtTabs  className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
-         <AtTabsPane current={current} index={0}>
+      // <AtTabs  className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
+      //    <AtTabsPane current={current} index={0}>
           <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>
@@ -76,16 +76,16 @@ export default class customer extends Taro.Component {
               <View className="name">{customerNum.clinchSum || 0}人</View>
             </View>
           </View>
-        </AtTabsPane>
-        <AtTabsPane current={current} index={1} >
-          <View >
-            {
-              current != 0 && <Analysis></Analysis>
-            }
-          </View>
-        </AtTabsPane>
+      //   </AtTabsPane>
+      //   <AtTabsPane current={current} index={1} >
+      //     <View >
+      //       {
+      //         current != 0 && <Analysis></Analysis>
+      //       }
+      //     </View>
+      //   </AtTabsPane>
        
-      </AtTabs>
+      // </AtTabs>
     )
   }
 }

src/pages/person/customerAnalysis/index.scss

@@ -5,6 +5,29 @@
   position: relative;
   height:100vh;
 }
+.my-customer{
+  flex: 0 0 50%;
+  text-align: center;
+  border-bottom: 2px solid rgba(216,216,216,1);
+  padding: 80px 0;
+  
+  .img{
+    width: 76px;
+  }
+  .name{
+    color: #333;
+    font-size: 30px;
+    line-height: 48px;
+  }
+
+}
+
+
+
+
+
+
+
 .daily-month{
   display: flex;
   align-items: center;
@@ -67,50 +90,35 @@
   .at-tabs__underline{
     height: 0!important;
   }
-  .my-customer{
-    flex: 0 0 50%;
-    text-align: center;
-    border-bottom: 2px solid rgba(216,216,216,1);
-    padding: 80px 0;
-    
-    .img{
-      width: 76px;
-    }
-    .name{
-      color: #333;
-      font-size: 30px;
-      line-height: 48px;
-    }
-
 
+ 
+}
+.tab-bar{
+  margin-top: 30px;
+  .at-tabs__header{
+    width: 80%;
+    background-color: none;
+    box-shadow:none;
+    margin: 0 auto;
+    border-radius: 0;
+    border: none;
   }
-  .tab-bar{
-    margin-top: 30px;
-    .at-tabs__header{
-      width: 80%;
-      background-color: none;
-      box-shadow:none;
-      margin: 0 auto;
-      border-radius: 0;
-      border: none;
-    }
-    .at-tabs__item{
-      width:33.333%;
-      flex: none;
-      color: #666;
-      font-size: 28px;
-      padding: 12px 20px;
-    }
-    .at-tabs__item--active{
-      color: $primary-color;
-      background-color: #fff;
-    }
-    .at-tabs__item-underline{
-      height: 4px;
-      background-color: $primary-color;
-      width: 60%;
-      margin-left: 20%;
-    }
+  .at-tabs__item{
+    width:33.333%;
+    flex: none;
+    color: #666;
+    font-size: 28px;
+    padding: 12px 20px;
+  }
+  .at-tabs__item--active{
+    color: $primary-color;
+    background-color: #fff;
+  }
+  .at-tabs__item-underline{
+    height: 4px;
+    background-color: $primary-color;
+    width: 60%;
+    margin-left: 20%;
   }
 }
 .overflow-tab{

src/pages/person/menus.js

@@ -16,6 +16,7 @@ const icons = {
   client: require('@assets/mine/client.png'),
   consultant: require('@assets/mine/consultant.png'),
   customerAnalysis: require('@assets/mine/customerAnalysis.png'),
+  fenxi: require('@assets/mine/fenxi.png'),
 }
 
 const DRIFT = ROLE_CODE['DRIFT']
@@ -49,6 +50,14 @@ const menus = [
       userTypes: [CONSULTANT],
       style: '',
     },
+    {
+      name: '客户分析',
+      url: '/pages/person/customerAnalysis/analysis',
+      icon: icons.fenxi,
+      extends: undefined,
+      userTypes: [CONSULTANT],
+      style: '',
+    },
     // {
     //   name: '成为经纪人',
     //   url: '/pages/agent/become/index',

src/pages/project/index.js

@@ -6,7 +6,6 @@ import Banner from './banner'
 import HelpGroupBanner from './swiper'
 import ActivityItem from '../activity/item'
 
-
 import ready from '@utils/ready'
 import { getLocationCity } from '@services/map'
 
@@ -51,7 +50,7 @@ export default class Index extends Component {
     achieve: false
   }
 
-  componentWillMount () {
+  componentWillMount() {
     this.qqmapsdk = new QQMapWX({
       key: 'TIIBZ-ZJG33-52T3L-Y3X4Q-NWKLV-KUB3B'
     })
@@ -74,7 +73,7 @@ export default class Index extends Component {
     })
   }
 
-  componentDidShow () {
+  componentDidShow() {
     if (this.props.curCity.id) {
       ready.queue(() => {
         this.loadData()
@@ -82,12 +81,12 @@ export default class Index extends Component {
     }
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
 
-  getLocation () {
+  getLocation() {
     const { cityList, userInfo: { person: { org } } } = this.props
     let defaultCity = cityList.filter(item => {
       return item.id == org.defaultCityId
@@ -103,7 +102,7 @@ export default class Index extends Component {
       const payload = { location: `${location.longitude},${location.latitude}` }
 
       getLocationCity(payload).then(res => {
-      
+
         let curCity = cityList.filter(item => {
           return item.name == res.name || ''
         })
@@ -134,13 +133,13 @@ export default class Index extends Component {
       this.updateCity(defaultCity)
     })
   }
-  updateCity (payload) {
+  updateCity(payload) {
     this.props.dispatchCitySelected(payload).then(res => {
       this.loadData()
     })
   }
 
-  loadData () {
+  loadData() {
     this.loadBannerList()
     this.loadHelpGroupList()
     this.loadNewsList()
@@ -148,7 +147,7 @@ export default class Index extends Component {
     this.loadList()
   }
 
-  loadOpenScreenBanner () {
+  loadOpenScreenBanner() {
     const payload = {
       // showPosition: 'index'
     }
@@ -166,7 +165,7 @@ export default class Index extends Component {
       })
     })
   }
-  loadBannerList () {
+  loadBannerList() {
     const { curCity } = this.props
     console.log(this.props, 'this.props')
     // 获取首页banner
@@ -189,7 +188,7 @@ export default class Index extends Component {
     })
   }
 
-  loadHelpGroupList () {
+  loadHelpGroupList() {
     queryHelpGroup({ cityId: this.props.curCity.id, buildingId: '' }).then(res => {
       console.log(res, "res")
       this.setState({
@@ -200,11 +199,11 @@ export default class Index extends Component {
   }
 
 
-  loadNewsList () {
+  loadNewsList() {
     const { curCity } = this.props
     const payload = {
       pageNumber: 1,
-      pageSize: 2
+      pageSize: 999
     }
     if (curCity.id) {
       payload.cityId = curCity.id
@@ -216,7 +215,7 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityList () {
+  loadActivityList() {
     const { curCity } = this.props
     const payload = {
       pageNumber: 1,
@@ -234,7 +233,7 @@ export default class Index extends Component {
     })
   }
 
-  loadList () {
+  loadList() {
     const { keywords } = this.state
     const { curCity } = this.props
 
@@ -288,7 +287,7 @@ export default class Index extends Component {
     }
   }
 
-  onViewDetail (item) {
+  onViewDetail(item) {
     Taro.navigateTo({
       url: `/pages/project/detail/index?id=${item.buildingId}`
     })
@@ -299,7 +298,7 @@ export default class Index extends Component {
     this.redirectTo(item)
   }
 
-  redirectTo ({ targetId, contentType, buildingId } = {}) {
+  redirectTo({ targetId, contentType, buildingId } = {}) {
     switch (contentType) {
       // 项目
       case 'project':
@@ -344,7 +343,7 @@ export default class Index extends Component {
     }
   }
 
-  handleHelpGroupClick (item) {
+  handleHelpGroupClick(item) {
     if (item.type == 1) {
       Taro.navigateTo({
         url: '/pages/activity/detail/assistance?id=' + item.activityId
@@ -356,7 +355,7 @@ export default class Index extends Component {
     }
   }
 
-  handleMaskClose () {
+  handleMaskClose() {
     this.setState({
       maskVisible: false
     })
@@ -381,23 +380,23 @@ export default class Index extends Component {
     })
   }
 
-  handleMaskBannerClick (data) {
+  handleMaskBannerClick(data) {
     this.redirectTo(data)
   }
 
-  handleLocationClick () {
+  handleLocationClick() {
     Taro.navigateTo({
       url: `/pages/city/index`
     })
   }
 
-  handleToHouseList () {
+  handleToHouseList() {
     Taro.navigateTo({
       url: '/pages/project/list/index'
     })
   }
 
-  handleProItemClick () {
+  handleProItemClick() {
     Taro.navigateTo({
       url: '/pages/project/list/index'
     })
@@ -407,7 +406,7 @@ export default class Index extends Component {
   // CHANNEL_AGENT: 'channel agent', // 渠道经纪人
   // DRIFT: 'drift', // 游客
   // CUSTOMER: 'customer' // 客户
-  toRecomonedPage () {
+  toRecomonedPage() {
     const {
       userInfo: { person: { personType } }
     } = this.props
@@ -428,13 +427,13 @@ export default class Index extends Component {
       console.log(this.props.curCity.id, "this.props.curCity.id")
     }
   }
-  toMapHouse () {
+  toMapHouse() {
     Taro.navigateTo({
       url: `/pages/project/map/index`
     })
   }
 
-  handleAuthPhoneSuccess (curCity) {
+  handleAuthPhoneSuccess(curCity) {
 
     console.log(curCity, 'curCity')
 
@@ -444,7 +443,7 @@ export default class Index extends Component {
   }
 
 
-  renderProjectList () {
+  renderProjectList() {
     const { proList: { records = [] } } = this.props
     const { helpGroupList } = this.state
     const list = records.filter(item => item.isMain === 1)
@@ -504,7 +503,7 @@ export default class Index extends Component {
     )
   }
 
-  renderMaskBanner () {
+  renderMaskBanner() {
     const { maskBanner } = this.state
     return (
       <View className="mask-banner">
@@ -520,13 +519,18 @@ export default class Index extends Component {
       </View>
     )
   }
+  changeCurrent(event) {
 
+    const current = event.detail.current
+    this.props.onChange && this.props.onChange(current)
+  }
 
-  render () {
+  render() {
     const { curCity } = this.props
     const { newsList, achieve } = this.state
     const { userInfo: { person: { personType, phone } } } = this.props
     const { userInfo: { person } } = this.props
+
     return (
       <Block>
         {this.state.loaded && (
@@ -584,6 +588,39 @@ export default class Index extends Component {
 
 
               </View>
+              {
+                newsList.length &&
+                <View style="background-color:#fff">
+                  <View className="notice-box">
+                    <View style="  display: flex;align-items: center;">
+                      <Image className="notice-icon" src={require('@assets/notice.png')}></Image>
+                      <Swiper
+                        className='notice-swiper'
+                        circular
+                        autoplay
+                        interval="3000"
+                        onChange={this.changeCurrent.bind(this)}
+                        vertical="true"
+                      >
+                        {
+                          newsList.map((list, inx) => {
+                            return (
+                              <SwiperItem key={`img-${inx}`}>
+                                <View className="notice-text">
+                                  {list.newsName}
+                                </View>
+                              </SwiperItem>
+                            )
+                          })
+                        }
+                      </Swiper>
+                    </View>
+                    <View className="notice-more">
+                      更多 <Text className="iconfont icon-more"></Text>
+                    </View>
+                  </View>
+                </View>
+              }
 
 
               {/* 推荐楼盘 */}

src/pages/project/index.scss

@@ -101,11 +101,48 @@
     }
   }
 }
+.notice-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 30px;
+  height:80px;
+  background:#fff;
+  box-shadow:0px 2px 10px 0px rgba(0,0,0,0.12);
+  padding: 0 20px;
+  .notice-icon{
+    width: 40px ;
+    height: 32px;
+    margin-right: 20px;
+    
+  }
+  .notice-swiper{
+    height: 80px;
+    width: 500px;
+    line-height: 80px;
+    .notice-text{
+      font-size: 28px;
+      color: #888888;
+      width: 450px;
+      @include text-ellipsis;
+    }
+  }
+ 
+  .notice-more {
+    font-size: 26px;
+    color: $text-color-lighter;
+
+    .iconfont {
+      font-size: 26px;
+      color: $text-color-lighter;
+    }
+  }
+}
 
 .section-top {
   position: relative;
   padding: 0 0px;
-  box-shadow:0px 2px 12px 2px rgba(29,29,29,0.09);
+  // box-shadow:0px 2px 12px 2px rgba(29,29,29,0.09);
 }
 
 .sectionn-news-list {