feat: add map around

config/dev.js

@@ -5,8 +5,8 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST:  '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     HOST: '"http://192.168.0.218:8080"',

config/prod.js

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

src/pages/person/index.js

@@ -177,6 +177,7 @@ export default class Person extends Component {
         <View>
           {
             menus.map((group, ginx) => {
+              console.log('----------------')
               return (
                 <Block key={`grp-${ginx}`}>
                   {

src/pages/person/menus.js

@@ -43,21 +43,21 @@ const menus = [
       url: '/pages/person/customerAnalysis/index',
       icon: icons.homepage,
       extends: undefined,
-      userTypes: [CUSTOMER, CONSULTANT],
-    },
-    {
-      name: '成为经纪人',
-      url: '/pages/agent/become/index',
-      icon: icons.development,
-      extends: undefined,
-      userTypes: [CUSTOMER],
+      userTypes: [CONSULTANT],
     },
+    // {
+    //   name: '成为经纪人',
+    //   url: '/pages/agent/become/index',
+    //   icon: icons.development,
+    //   extends: undefined,
+    //   userTypes: [CUSTOMER],
+    // },
     {
       name: '推荐客户',
       url: '/pages/agent/client/index',
       icon: icons.recommend,
       extends: undefined,
-      userTypes: [ESTATE_AGENT, CHANNEL_AGENT],
+      userTypes: [CUSTOMER,ESTATE_AGENT, CHANNEL_AGENT],
     },
     {
       name: '发展经纪人',
@@ -141,6 +141,23 @@ const menus = [
       userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
     },
   ],
+  [
+    {
+      name: '成为专业经纪人',
+      url: '/pages/agent/become/index',
+      icon: icons.feedback,
+      extends: undefined,
+      userTypes: [CUSTOMER],
+    },
+    {
+      name: '成为置业顾问',
+      url: '',
+      icon: icons.feedback,
+      extends: undefined,
+      userTypes: [CUSTOMER],
+    },
+
+  ]
 ]
 
 export { icons, menus }

src/pages/project/detail/index.js

@@ -54,7 +54,7 @@ export default class Index extends Component {
     recordId: null,
     posterShow: 'none',
     current: 1,
-    btnstate: true,
+    btnstate: 1,// 1显示视频 0显示图片
   }
 
   componentWillMount () {
@@ -63,7 +63,6 @@ export default class Index extends Component {
       const router = Taro.getStorageSync('router')
       const id = this.$router.params.id || router.query.id
       // const id='82b54f4a1f5b981df572253792afbfa1' 
-
       this.setState({
         buildingId: id
       }, () => {
@@ -96,15 +95,15 @@ export default class Index extends Component {
     recordId && updatePoint(recordId)
   }
 
-  loadMapAround(building) {
+  loadMapAround (building) {
     const [lat, lng] = (building.coordinate || '').split(',')
 
     if (!lat || !lng) return Promise.reject()
 
-    return getPoiAround({ lng, lat})
+    return getPoiAround({ lng, lat })
   }
 
-  loadHelpGroupList() {
+  loadHelpGroupList () {
     const { buildingId } = this.state
     queryHelpGroup({ buildingId: buildingId }).then(res => {
       console.log(res, "buildingId")
@@ -125,7 +124,7 @@ export default class Index extends Component {
     )
   }
 
-  loadDetail() {
+  loadDetail () {
     const { buildingId } = this.state
     const { dispatchProjectDetail } = this.props
     this.setState({
@@ -859,15 +858,24 @@ export default class Index extends Component {
   }
 
   renderVideo () {
+    console.log('-------props------', this.props)
+    const { projectDetail } = this.props
     return (
-      <View style={{
-        height: '278px'
-      }}>123
-      {/* <Video
-        style={{
-          height: '278px'
-        }}
-      ></Video> */}
+      <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'
+          // poster='http://misc.aotu.io/booxood/mobile-video/cover_900x500.jpg'  
+          initial-time='0.01'
+          style={{
+            height: '278px',
+            width: '375px'
+          }}
+          show-mute-btn='true'
+        ></Video>
       </View>
     )
   }
@@ -888,13 +896,17 @@ 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>
         {
           loaded && (
             <View className='detail'>
               <Notice></Notice>
-              {btnstate && (
+              {(projectDetail.videoUrl == null || btnstate === 0) && (
                 <View
                   className="pro__banner"
                   onClick={this.previewImage.bind(this, projectDetail.buildingImg)}>
@@ -912,17 +924,17 @@ export default class Index extends Component {
                 </View>
               )}
 
-              {!btnstate && this.renderVideo()}
+              {btnstate === 1 && projectDetail.videoUrl != null &&  this.renderVideo()}
 
-              
-              {!btnstate && (<View className='media-btn'>
-                <View className='video-btn' onClick={() => this.setState({ btnstate: true })} style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }} >视频</View>
-                <View className='img-btn'>图片</View>
+              }
+              {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='img-btn' onClick={() => this.setState({ btnstate: 0 })}>图片</View>
               </View>)}
 
-              {btnstate && (<View className='media-btn'>
-                <View className='video-btn'  >视频</View>
-                <View className='img-btn' onClick={() => this.setState({ btnstate: false })} style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }}>图片</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>)}
 
 

src/pages/project/detail/index.scss

@@ -19,7 +19,7 @@
     height: 64px;
     background: rgba(255, 255, 255, 1);
     border-radius: 12px;
-    top: 440px;
+    top: 420px;
     left: 284px;
     font-size: 30px;
     font-family: PingFangSC-Regular, PingFang SC;
@@ -27,7 +27,8 @@
     text-align: center;
     line-height: 64px;
     color: rgba(53, 53, 53, 1);
-    display: flex;;
+    display: flex;
+    position: fixed;
     .video-btn {
       width: 92px;
       height: 64px;
@@ -46,7 +47,7 @@
 
 
   .wrap {
-    padding-top: 546px;
+    padding-top: 500px;
     background: transparent;
   }