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

config/prod.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"http://192.168.0.218:8080"',
-    WSS_HOST: '"ws://192.168.0.218:8080"',
+    HOST: '"http://192.168.0.72:8080"',
+    WSS_HOST: '"ws://192.168.0.72:8080"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
   },

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行",
-	"appid": "wxda1f84b79b3edeb3",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/pages/person/customerAnalysis/analysis.js

@@ -4,8 +4,9 @@ import { View } from "@tarojs/components";
 import MoveChart from '../../components/MoveChart'
 import LineChart from '../../components/LineChart'
 import './index.scss'
-import { AtTabs, AtTabsPane } from 'taro-ui'
+import { AtTabs, AtTabsPane, AtProgress } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
+import "taro-ui/dist/style/components/progress.scss";
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 
@@ -32,7 +33,7 @@ export default class analysis extends Taro.Component {
       current: value
     }, )
   }
- 
+
 
   render() {
 
@@ -42,7 +43,12 @@ export default class analysis extends Taro.Component {
       <View>
         <AtTabs className="tab-bar" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
-            <View style='padding: 100px 50px;background-color: #FAFBFC;text-align: center;' >标签22页一的内容</View>
+            <View>
+              <View className="sex-box">
+                <View className="sex">性别</View>
+                <AtProgress percent={25} strokeWidth={6} color='#FF4949' />
+              </View>
+            </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={1}>
             <View style='padding: 100px 50px;background-color: #FAFBFC;text-align: center;'>标签页二的内容</View>

src/pages/person/customerAnalysis/index.js

@@ -15,7 +15,7 @@ export default class customer extends Taro.Component {
   }
 
   state = {
-    current: 1,
+    current: 0,
     recordId: undefined, // 埋点ID
   }
 

src/pages/person/customerAnalysis/index.scss

@@ -63,6 +63,7 @@
       flex: none;
       color: #666;
       font-size: 28px;
+      padding: 12px 20px;
     }
     .at-tabs__item--active{
       color: $primary-color;
@@ -76,7 +77,147 @@
     }
   
   }
+}
 
 
-}
+.user_con{
+  margin: 0 20px 40px 20px;
+  height:256px;
+  box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
+  border-radius:12px;
+  position: relative;
+ 
+  .bg{
+    position: absolute;
+    top:0;
+    left:0;
+    width: 100%;
+    height: 100%;
+    border-radius: 12px;
+
+  }
+  .user__left__headimg{
+    width: 176px;
+    height: 176px;
+    border-radius: 50%;
+    position: absolute;
+    top:50%;
+    left: 128px;
+    margin-top: -88px;
+  }
+  .user__left__name{
+    font-size:32px;
+    color: $primary-color;
+    position: absolute;
+    top:76px;
+    left:320px;
+  }
+  .user__left__phone{
+    font-size:32px;
+    color: #333;
+    position: absolute;
+    bottom:76px;
+    left:320px;
+  }
+  }
+  .my-tab{
+    .btn{
+      width:360px;
+      text-align: center;
+      height:70px;
+      line-height: 70px;
+      margin: 200px auto 40px auto;
+      background:$primary-color;
+      color: #fff;
+      border-radius:8px;
+      font-size: 32px;
+
+    }
+    .pane{
+      padding-bottom: 240px;
+    }
+    .at-tabs__item{
+      padding: 12px 20px;
+      color: #666;
+      font-size: 30px;
+    }
+    .at-tabs__item-underline{
+      width: 64%;
+      margin-left: 18%;
+      background-color: $primary-color;
+    }
+    .at-tabs__item--active{
+      color: $primary-color;
+    }
+    .at-tabs__underline{
+      height: 0px!important;
+    }
+    .tab-pane1{
+      position: relative;
+      .status{
+        font-size: 36px;
+        color: $primary-color;
+        position: absolute;
+        right:30px;
+        top:0px;
+      }
+      .base-item{
+        margin-top: 30px;
+        display: flex;
+        padding: 0 28px;
+        align-items: center;
+        color: #666;
+        font-size: 30px;
+        .con{
+          margin-left: 20px;
+        }
+      }
+      
 
+    }
+    .tab-pane2{
+      padding: 0 40px;
+      .date{
+        font-size: 26px;
+        color: #999;
+        margin-top: 30px;
+      }
+      .record-item{
+        font-size: 30px;
+        margin-top: 20px;
+        color: #333;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .time{
+          font-size: 26px;
+          color: #999;
+        }
+      }
+    }
+    .tab-pane3{
+      padding: 20px 40px;
+    }
+  }
+  .tab-pane4{
+    padding: 0 40px;
+    // .genjin-item{
+    //   display: flex;
+    //   justify-content: space-between;
+    //   align-items: center;
+    //   color: #333;
+    //   font-size: 34px;
+    //   .dot{
+    //     width:16px;
+    //     height:16px;
+    //     display: inline-block;
+    //     background:rgba(246,182,29,1);
+    //     border-radius: 50%;
+    //   }
+    //   .time{
+    //     font-size: 26px;
+    //     color: #999;
+    //   }
+    // }
+    
+  }

src/pages/person/customerAnalysis/item/index.js

@@ -0,0 +1,45 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import dayjs from 'dayjs'
+import { getThumbnail } from '@utils/tools'
+
+export default class Item extends Component {
+  static defaultProps = {
+    data: {},
+    style: {}
+  }
+  handleClick(data) {
+
+    this.props.onClick(data)
+  }
+  render() {
+    const { data, style } = this.props
+    return (
+      <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
+        {(data.type == 'help' || data.type == 'group') &&
+          <View className={data.type == 'help' ? 'type' : 'type2'}>{data.type == 'help' ? '助力' : '拼团'}</View>
+        }
+
+        <Image className="pic" mode="aspectFill" src={getThumbnail(data.mainImg || data.imgUrl)}></Image>
+
+        <View className="box">
+
+          <View className="left">
+            <View className="title">{data.title}</View>
+            {data.startDate &&
+              <View className={data.activityStatus == 0 ? "status signed " : data.activityStatus == 1 ? "status nostart" : data.activityStatus == 2 ? "status fail" : "status"}>{data.activityStatus == 0 ? "立即参与" : data.activityStatus == 1 ? "未开始" : data.activityStatus == 2 ? "已结束" : "已参与"}</View>
+            }
+          </View>
+
+          {data.startDate &&
+            <View className="time">参与时间：{`${dayjs(data.startDate).format('YYYY年MM月DD日 HH:mm:ss')}`}</View>
+          }
+          {!data.startDate &&
+            <View className="time">{data.type != 'dynamic' ? '参与时间：' : ''}</View>
+          }
+        </View>
+
+      </View >
+    );
+  }
+}

src/pages/person/customerAnalysis/item/index.scss

@@ -0,0 +1,79 @@
+@import "@styles/theme.scss";
+@import "@styles/mixins.scss";
+
+.flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.item {
+  box-shadow:0px 4px 8px 0px rgba(0,0,0,0.12);
+  border-radius:  12px;
+  overflow: hidden;
+  margin-bottom: 20px;
+  width: 100%;
+  position: relative;
+  .type{
+    position: absolute;
+    left:0;
+    top:0;
+    color: #fff;
+    background:#F6B61D;
+    padding: 10px 36px;
+    border-radius: 12px 0 12px 0;
+    font-size: 24px;
+  }
+  .type2{
+    position: absolute;
+    left:0;
+    top:0;
+    color: #fff;
+    background:#BB9C79;
+    padding: 12px 36px;
+    border-radius: 12px 0 12px 0;
+    font-size: 24px;
+
+  }
+  .pic {
+    width: 100%;
+    height:376px;
+    display: block;
+  }
+
+  .box {
+    padding:20px 30px;
+    .title {
+      font-size: 28px;
+      color: #333;
+      width: 500px;
+      @include text-ellipsis;
+    }
+    .time {
+      margin-top: 20px;
+      font-size: 24px;
+      color: #8E8E8E;
+    }
+    .left {
+      width: 100%;
+      overflow: hidden;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+
+    .status {
+      color: #E35E44;
+      font-size: 28px;
+    }
+    .signed{
+      color: #F6B61D;
+    }
+		.nostart {
+      color:$primary-color;
+    }
+    .fail{
+      color: #979797;
+    }
+  }
+}

src/pages/person/customerAnalysis/myCustomer.js

@@ -1,14 +1,11 @@
 import Taro, { Component } from '@tarojs/taro';
-import Authorize from '@components/authorize'
-import { View } from "@tarojs/components";
-import MoveChart from '../../components/MoveChart'
-import LineChart from '../../components/LineChart'
-import './index.scss'
 import { AtTabs, AtTabsPane } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
-
+import './index.scss'
+import ActivityItem from './item'
+import { getActNewList } from '@services/activity'
 
 @connect(({ user, city }) => ({ user, city }))
 export default class myCustomer extends Taro.Component {
@@ -20,6 +17,7 @@ export default class myCustomer extends Taro.Component {
   state = {
     current: 0,
     recordId: undefined, // 埋点ID
+    list: []
   }
 
   componentWillUnmount() {
@@ -32,26 +30,98 @@ export default class myCustomer extends Taro.Component {
       current: value
     }, )
   }
- 
 
-  render() {
+  componentDidShow() {
+
+    this.loadList()
+  }
+  loadList() {
+    getActNewList().then(res => {
+      this.setState({
+        list: res.records || []
+      })
+    })
+  }
+  handleItemClick(item) {
+    switch (item.type) {
+      case 'help':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assistance?id=' + item.id
+        })
+        return
+      case 'group':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assemble?id=' + item.id
+        })
+        return
+      default:
+        Taro.navigateTo({
+          url: '/pages/activity/detail/index?id=' + item.id
+        })
+        return
+    }
+  }
 
-    const tabList = [{ title: '新增客户' }, { title: '跟进客户' }, { title: '到访客户' }]
+  render() {
 
+    const tabList = [{ title: '基本信息' }, { title: '访问记录' }, { title: '活动信息' }, { title: '跟进记录' }]
+    const { list } = this.state
     return (
       <View>
-        <AtTabs className="tab-bar" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+        <View className="user_con">
+          <Image className="bg" src={require('@assets/shop/background.jpg')} ></Image>
+          <Image className="user__left__headimg" src={require('@assets/default-avatar.png')} />
+          <View className='user__left__name'>客户姓名</View>
+          <View className='user__left__phone'>175 1562 8701</View>
+        </View>
+        <AtTabs className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
-            <View style='padding: 100px 50px;background-color: #FAFBFC;text-align: center;' >标签22页一的内容</View>
+            <View className="tab-pane1 pane">
+              <View className="status">到访</View>
+              <View className="base-item">意向项目：<View className="con">银城悦见山</View></View>
+              <View className="base-item">物业类型：<View className="con">自住</View></View>
+              <View className="base-item">项目类型：<View className="con">高层</View></View>
+              <View className="base-item">价格区间：<View className="con">{desc || '暂无'}</View></View>
+              <View className="base-item">客户描述：<View className="con">{desc || '暂无'}</View></View>
+              <View className="btn">完善信息</View>
+            </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={1}>
-            <View style='padding: 100px 50px;background-color: #FAFBFC;text-align: center;'>标签页二的内容</View>
+            <View className="tab-pane2 pane">
+              <View className="date">2019年11月11日</View>
+              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
+              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
+              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
+              <View className="date">2019年11月11日</View>
+              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
+              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
+              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
+
+            </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={2}>
-            <View style='padding: 100px 50px;background-color: #FAFBFC;text-align: center;'>标签页三的内容</View>
+            <View className="tab-pane3 pane">
+              {list.length > 0 &&
+                list.map(item => (
+                  <ActivityItem
+                    data={item}
+                    key={item.id}
+                    onClick={this.handleItemClick}>
+                  </ActivityItem>
+                ))
+              }
+            </View>
+          </AtTabsPane>
+          <AtTabsPane current={this.state.current} index={3}>
+            <View  style="padding:10px 20px 120px 20px">
+              <View style=" display: flex;justify-content: space-between;align-items: center;color: #333;font-size: 16px;">
+                <View style=" display: flex;align-items: center;"><View style="width:8px;height:8px;margin-right:10px;display:inline-block;background:rgba(246,182,29,1);border-radius: 50%;"></View>编辑客户信息</View>
+                <View classNam="time" style=" font-size: 13px;color: #999;">2019年11月11日 12:24:59</View>
+              </View>
+              <View className="btn">添加跟进</View>
+            </View>
           </AtTabsPane>
         </AtTabs>
-
       </View>
     )
   }

src/pages/person/index.js

@@ -94,9 +94,9 @@ export default class Person extends Component {
       case ROLE_CODE['CONSULTANT']:
         return [{ consultant: true }, '置业顾问']
       case ROLE_CODE['ESTATE_AGENT']:
-        return [{ isAgent: true }, '独立经纪人']
+        return [{ isAgent: true }, '专业经纪人']
       case ROLE_CODE['CHANNEL_AGENT']:
-        return [{ isAgent: true }, '渠道经纪人']
+        return [{ isAgent: true }, '专业经纪人']
       default:
         return [{ tourist: true }, '普通用户']
     }

src/pages/person/menus.js

@@ -14,6 +14,7 @@ const icons = {
   encyclopedia: require('@assets/mine/encyclopedia.png'),
   feedback: require('@assets/mine/feedback.png'),
   client: require('@assets/mine/client.png'),
+  consultant: require('@assets/mine/consultant.png'),
 }
 
 const DRIFT = ROLE_CODE['DRIFT']
@@ -145,14 +146,14 @@ const menus = [
     {
       name: '成为专业经纪人',
       url: '/pages/agent/become/index',
-      icon: icons.feedback,
+      icon: icons.development,
       extends: undefined,
       userTypes: [CUSTOMER],
     },
     {
       name: '成为置业顾问',
       url: '',
-      icon: icons.feedback,
+      icon: icons.consultant,
       extends: undefined,
       userTypes: [CUSTOMER],
     },

src/pages/person/personDetail/editDetail/index.js

@@ -170,16 +170,16 @@ export default class editDetail extends Component {
       <View className='list'>
         <View className='col_box'>
           <View className='edit edit-name'>用户名</View>
-          <Input type='text' value={user.name ? user.name : user.nickname} onInput={this.BindInfo.bind(this)} data-id='name' />
+          <Input type='text' className='edit' value={user.name ? user.name : user.nickname} onInput={this.BindInfo.bind(this)} data-id='name' />
         </View>
         <View className='col_box'>
           <View className='edit edit-phone'>电话号码</View>
-          <Input type='text' value={user.tel ? user.tel : user.phone} data-id='phone' onInput={this.BindInfo.bind(this)} />
+          <Input type='text' className='edit' value={user.tel ? user.tel : user.phone} data-id='phone' onInput={this.BindInfo.bind(this)} />
         </View>
         {
           isAgent && (<View className='col_box'>
             <View className='edit edit-phone'>经纪人类型</View>
-            <Picker mode='selector' className='selector' range={this.state.selector} onChange={this.onChange}>
+            <Picker mode='selector' className='edit' className='selector' range={this.state.selector} onChange={this.onChange}>
               <View className='picker'>
                 {this.state.selectorChecked}
               </View>

src/pages/person/personDetail/editDetail/index.scss

@@ -6,11 +6,18 @@
     width: 680px;
     margin: 0 auto;
     justify-content: space-between;
-    font-size: 28px;
+    font-size:32px;
+    line-height:44px;
     border-bottom: 1px solid #dbd7d7;
     .edit{
       margin-top: 40px;
+      margin-bottom: 32px;
     }
+    // edit-name
+
+    // edit-phone
+
+    // edit-name
     Input,.selector{
       height: 80px;
       line-height: 80px;

src/pages/project/album/index.js

@@ -8,6 +8,9 @@ import { getThumbnail } from '@utils/tools'
 
 
 @connect(state => state.project, { ...actions })
+
+
+
 export default class Index extends Component {
 
   config = {
@@ -15,11 +18,12 @@ export default class Index extends Component {
   }
 
   state = {
-    recordId: null
+    recordId: null,
+    current: 0,
   }
 
 
-  componentWillMount() {
+  componentWillMount () {
     const { id = '369b7d7e5bc6e6b91f2e8f5e775035e2' } = this.$router.params
     const { projectDetail: { buildingId }, dispatchProjectDetail } = this.props
 
@@ -39,64 +43,62 @@ export default class Index extends Component {
       console.log('相册信息')
     })
   }
-  componentWillUnmount() {
+  componentWillUnmount () {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
   // 图片预览
-  previewImage(cur, urls) {
+  previewImage (cur, urls) {
     wx.previewImage({
       current: cur, // 当前显示图片的http链接   
       urls: urls // 需要预览的图片http链接列表   
     })
   }
 
-  render() {
-    const { projectDetail: { buildingImg = [], buildingApartment = [], mapImg, poster } } = this.props
-    const liveImgs = buildingImg.map(img => img.url)
-    let hxImgs = buildingApartment.filter(item => item.apartmentType === 'apart')
-    hxImgs = hxImgs.reduce((prev, cur) => {
-      prev = prev.concat(cur.buildingImgList)
-      return prev
-    }, [])
-    let _hxImgUrls = hxImgs.map(img => img.url)
-
-    let photosImgs = buildingApartment.filter(item => item.apartmentType === 'photo')
-    photosImgs = photosImgs.reduce((prev, cur) => {
-      prev = prev.concat(cur.buildingImgList)
-      return prev
-    }, [])
-    let _photosImgs = photosImgs.map(img => img.url)
+  render () {
+    const { projectDetail: { buildingApartment } } = this.props
+    const list = buildingApartment.filter(item => item.apartmentType === 'photo')
+    const { current } = this.state
+    const imgList = list[current].buildingImgList
+    let _photosImgs = imgList.map(img => img.url)
+
 
     return (
       <View className='photos'>
-        <ScrollView>
-          <View className='photos__item'>
-            <View className='photos__title'>效果图</View>
-            {photosImgs.map((item, index) => (
-              <Image className='photos__item-img' src={getThumbnail(item.url)} mode="aspectFill" key={item.imgId} onClick={this.previewImage.bind(this, item.url, _photosImgs)}></Image>
-            ))}
-          </View>
-
-          <View className='photos__item'>
-            <View className='photos__item-title'>实景图</View>
-            {liveImgs.map((item, index) => (
-              <Image className='photos__item-img' src={getThumbnail(item)} mode="aspectFill" key={index} onClick={this.previewImage.bind(this, item, liveImgs)}></Image>
-            ))}
-          </View>
+        <ScrollView scrollX>
+          <View className='photos__type__content'>
+            {console.log(list, '2225555555')}
+            <View className="around-tab">
+              {list.map((item, index) => {
+                const { apartmentName } = item || {}
+                const buildingImgList = item.buildingImgList
 
-          <View className='photos__item'>
-            <View className='photos__item-title'>户型图</View>
-            {hxImgs.map((item, index) => (
-              <Image className='photos__item-img' src={getThumbnail(item.url)} mode="aspectFill" key={item.imgId} onClick={this.previewImage.bind(this, item.url, _hxImgUrls)}></Image>
-            ))}
-          </View>
+                console.log(imgList, '22333333222')
+                return (
+                  <View
+                    style={{ width: '100px' }}
+                    key={current}
+                    className={`around-tab__item ${current === index ? 'active' : ''}`}
+                    onClick={() => this.setState({ current: index })}
+                  >
 
-          <View className='photos__item'>
-            <View className='photos__item-title'>地图</View>
-            <Image className='photos__item-img' src={getThumbnail(mapImg)} mode="aspectFill" onClick={this.previewImage.bind(this, mapImg, [mapImg])}></Image>
+                    <View>
+                      <View style={{ width: '100px', textAlign: 'center' }}>  {`${apartmentName}(${buildingImgList.length})`} </View>
+                    </View>
+                  </View>
+                )
+              })}
+            </View>
           </View>
         </ScrollView>
+        <View className='photos__item'>
+          {imgList.map((item, index) => {
+            console.log(item, '299999933333222')
+            return (
+              <Image className='photos__item-img' src={getThumbnail(item.url)} mode='widthFix' onClick={this.previewImage.bind(this, item.url, _photosImgs)}></Image>
+            )
+          })}
+        </View>
       </View>
     );
   }

src/pages/project/album/index.scss

@@ -2,8 +2,8 @@
   position: relative;
   background: #ffffff;
   width: 100%;
-  padding: 50px;
-  padding:30px 40px;
+  padding: 30px;
+  padding: 30px 20px;
 
   &__item {
     position: relative;
@@ -16,10 +16,46 @@
     }
 
     &-img {
-      width: 200px;
-      height: 150px;
-      margin-right: 10px;
-      margin-bottom: 10px;
+      width: 336px;
+      height: 252px;
+      background: rgba(216, 216, 216, 1);
+      border-radius: 12px;
+
+      margin: 9px;
+      margin-bottom: 9px;
+    }
+  }
+}
+
+.around-tab {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  overflow-x: scroll;
+  scroll-behavior: smooth;
+  padding: 24px 0;
+
+  &::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    color: transparent;
+  }
+
+  &__item {
+    flex: 1 0 auto;
+
+    font-size: 32px;
+    color: #666;
+    line-height: 44px;
+    padding: 4px 0;
+
+    &.active {
+      color: #BB9C79;
+      border-bottom: 1px solid #C8B299;
+    }
+
+    &+& {
+      margin-left: 64px;
     }
   }
 }

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

@@ -16,6 +16,7 @@ export default function Tab(props) {
     <View className="around-tab">
       {tabList.map((item, index) => {
         const { key, label, num } = item || {}
+        console.log(item,'123456')
         return (
           <View
             key={key}

src/pages/project/detail/index.js

@@ -55,6 +55,7 @@ export default class Index extends Component {
     posterShow: 'none',
     current: 1,
     btnstate: 1,// 1显示视频 0显示图片
+    albumCurrent: 0,
   }
 
   componentWillMount () {
@@ -489,7 +490,7 @@ export default class Index extends Component {
     })
   }
 
-  renderBottomMenu() {
+  renderBottomMenu () {
     const { userInfo: { person: { personType } } } = this.props
     const { posterShow } = this.state
     return (
@@ -592,17 +593,53 @@ export default class Index extends Component {
       prev = prev.concat(cur.buildingImgList)
       return prev
     }, [])
+
+    const { albumCurrent } = this.state
+
+  
+    // console.log(this.props, '2222222222222')
     return (
+
+      //   <View className="around-tab">
+      //   {tabList.map((item, index) => {
+      //     const { key, label, num } = item || {}
+      //     return (
+      //       <View
+      //         key={key}
+      //         className={`around-tab__item ${current === index ? 'active' : ''}`}
+      //         onClick={handleClick(index)}
+      //       >
+      //         {`${label}(${num})`}
+      //       </View>
+      //     )
+      //   })}
+      // </View>    imgList.length > 0 &&
       <Block>
-        {
-          imgList.length > 0 && (
+        { list.length > 0 &&
+          (
             <View className='photos__type'>
               <View className='photos__type__title'>相册</View>
               <ScrollView scrollX>
-                <View className='photos__type__content'>
-                  <View className='photos__type__list'>11
-                    {/* <Image className='photos__img' src={getThumbnail(imgList[0].url)} mode="widthFix" onClick={this.toViewAlbum}></Image>
-                    <View className='photos__img__len'>共{imgList.length}张</View> */}
+                <View className='photos__type__content' onClick={this.toViewAlbum}>
+                {console.log(list, '2222222222222')}
+                  <View className="around-tab">
+                    {list.map((item, index) => {
+                      const { apartmentName} = item || {}
+                      const  buildingImgList = item.buildingImgList
+                     
+                      console.log(buildingImgList, '22333333222')
+                      return (
+                        <View
+                          style={{ marginRight: '8px' }}                  
+                        >
+                          {/* {`${label}(${num})`} */}
+                          <View>
+                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} ></Image>
+                            <View style={{ textAlign: 'center' }}>  {`${apartmentName}(${buildingImgList.length})`} </View>
+                          </View>
+                        </View>
+                      )
+                    })}
                   </View>
                 </View>
               </ScrollView>
@@ -858,13 +895,11 @@ export default class Index extends Component {
   }
 
   renderVideo () {
-    console.log('-------props------', this.props)
     const { projectDetail } = this.props
     return (
       <View
         className="pro__banner"
       >
-        { console.log('-------projectDetail.videoUrl------', projectDetail.videoUrl)}
         <Video
           src={projectDetail.videoUrl}
           // src='http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400'
@@ -881,7 +916,6 @@ export default class Index extends Component {
   }
 
   changeCurrent (current) {
-    // console.log('value:', current)
     this.setState({
       current: current + 1
     })
@@ -896,10 +930,6 @@ export default class Index extends Component {
     const { total = 0, records = [] } = uvList
     const openDate = projectDetail.openingDate ? dayjs(projectDetail.openingDate).locale('zh-cn').format('YYYY年M月D日') : '暂无'
 
-    // if (projectDetail.videoUrl != null){
-    //   setState({ btnstate: 1 }
-    // },
-
     return (
       <Block>
         {
@@ -924,17 +954,17 @@ export default class Index extends Component {
                 </View>
               )}
 
-              {btnstate === 1 && projectDetail.videoUrl != null &&  this.renderVideo()}
+              {btnstate === 1 && projectDetail.videoUrl != null && this.renderVideo()}
 
-              }
+        
               {btnstate === 1 && projectDetail.videoUrl != null && (<View className='media-btn'>
-                <View className='video-btn'  style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }} >视频</View>
+                <View className='video-btn' style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }} >视频</View>
                 <View className='img-btn' onClick={() => this.setState({ btnstate: 0 })}>图片</View>
               </View>)}
 
               {btnstate === 0 && projectDetail.videoUrl != null && (<View className='media-btn'>
                 <View className='video-btn' onClick={() => this.setState({ btnstate: 1 })} >视频</View>
-                <View className='img-btn'  style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }}>图片</View>
+                <View className='img-btn' style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }}>图片</View>
               </View>)}
 
 

src/pages/project/detail/index.scss

@@ -29,12 +29,13 @@
     color: rgba(53, 53, 53, 1);
     display: flex;
     position: fixed;
+
     .video-btn {
       width: 92px;
       height: 64px;
       border-radius: 12px 0px 0px 12px;
-  
-    
+
+
     }
 
     .img-btn {
@@ -998,4 +999,38 @@
   100% {
     transform: scale(1.1);
   }
+}
+
+.around-tab {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  overflow-x: scroll;
+  scroll-behavior: smooth;
+  padding: 24px 0;
+
+  &__item {
+    flex: 1 0 auto;
+
+    font-size: 32px;
+    color: #666;
+    line-height: 44px;
+    padding: 4px 0;
+
+    &.active {
+      color: #BB9C79;
+      border-bottom: 1px solid #C8B299;
+    }
+
+    &+& {
+      margin-left: 64px;
+    }
+  }
+}
+
+.albumimg {
+  width: 218px;
+  height: 164px;
+  background: rgba(216, 216, 216, 1);
+  border-radius: 12px;
 }