popo

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.0.131:8080"',
-    // WSS_HOST: '"ws://192.168.0.131:8080"',
+    HOST: '"http://192.168.0.218:8080"',
+    WSS_HOST: '"ws://192.168.0.218:8080"',
   },
   weapp: {},
   h5: {}

project.config.json

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

src/components/amap/PoiAround.js

@@ -1,7 +1,6 @@
 import Taro, { Component } from '@tarojs/taro'
 import { Map } from '@tarojs/components'
-
-const makerIcon = require('@assets/icons/blank.png')
+import icons from './icons'
 
 export default class PoiAround extends Component {
 
@@ -19,34 +18,16 @@ export default class PoiAround extends Component {
   render() {
     const { current } = this.state
     const markers =  (this.props.markers || []).map((marker, index) => {
+      const icon = icons[index].normal
+      const activeIcon = icons[index].active
 
       return {
         id: marker.id,
         latitude: marker.latitude,
         longitude: marker.longitude,
-        iconPath: makerIcon,
-        width: 30,
-        height: 30,
-        alpha: 0.7,
-        // title: index + 1,
-        // label: {
-        //   content: index + 1,
-        //   // borderRadius: 1000,
-        //   color: '#fff',
-        //   bgColor: '#f00',
-        //   textAlign: 'center',
-        // },
-        callout: {
-          content: index + 1 > 9 ? `${index + 1}` : `0${index + 1}`,
-          borderRadius: 30,
-          borderWidth: 2,
-          borderColor: '#BB9C79',
-          padding: 5,
-          color: current === marker.id ? '#fff' : '#BB9C79',
-          bgColor: current === marker.id ? '#BB9C79' : '#fff',
-          textAlign: 'center',
-          display: 'ALWAYS',
-        },
+        iconPath: current === marker.id ? activeIcon : icon,
+        width: 56,
+        height: 56,
       }
     })
 
@@ -57,7 +38,7 @@ export default class PoiAround extends Component {
         markers={markers}
         longitude={this.props.longitude}
         latitude={this.props.latitude}
-        onCalloutTap={this.handleTap}
+        onMarkerTap={this.handleTap}
         style={this.props.style}
       />
     )

src/components/amap/icons.js

@@ -0,0 +1,105 @@
+
+const icons = [
+  {
+    normal: require('@assets/icons/amap/nums/number1.png'),
+    active: require('@assets/icons/amap/active_nums/number1.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number2.png'),
+    active: require('@assets/icons/amap/active_nums/number2.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number3.png'),
+    active: require('@assets/icons/amap/active_nums/number3.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number4.png'),
+    active: require('@assets/icons/amap/active_nums/number4.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number5.png'),
+    active: require('@assets/icons/amap/active_nums/number5.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number6.png'),
+    active: require('@assets/icons/amap/active_nums/number6.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number7.png'),
+    active: require('@assets/icons/amap/active_nums/number7.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number8.png'),
+    active: require('@assets/icons/amap/active_nums/number8.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number9.png'),
+    active: require('@assets/icons/amap/active_nums/number9.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number10.png'),
+    active: require('@assets/icons/amap/active_nums/number10.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number11.png'),
+    active: require('@assets/icons/amap/active_nums/number11.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number12.png'),
+    active: require('@assets/icons/amap/active_nums/number12.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number13.png'),
+    active: require('@assets/icons/amap/active_nums/number13.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number14.png'),
+    active: require('@assets/icons/amap/active_nums/number14.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number15.png'),
+    active: require('@assets/icons/amap/active_nums/number15.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number16.png'),
+    active: require('@assets/icons/amap/active_nums/number16.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number17.png'),
+    active: require('@assets/icons/amap/active_nums/number17.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number18.png'),
+    active: require('@assets/icons/amap/active_nums/number18.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number19.png'),
+    active: require('@assets/icons/amap/active_nums/number19.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number20.png'),
+    active: require('@assets/icons/amap/active_nums/number20.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number21.png'),
+    active: require('@assets/icons/amap/active_nums/number21.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number22.png'),
+    active: require('@assets/icons/amap/active_nums/number22.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number23.png'),
+    active: require('@assets/icons/amap/active_nums/number23.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number24.png'),
+    active: require('@assets/icons/amap/active_nums/number24.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number25.png'),
+    active: require('@assets/icons/amap/active_nums/number25.png'),
+  },
+]
+
+export default icons;

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;
 }