fix map around

config/dev.js

@@ -5,10 +5,10 @@ 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://lt.pawoma.cn"',
-    WSS_HOST: '"wss://lt.pawoma.cn"',
+    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.238:8080"',
     // WSS_HOST: '"ws://192.168.0.238:8080"',
   },

config/prod.js

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

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行互动",
-	"appid": "wxd6f47a9bb3052175",
+	"description": "知与行联调",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/pages/person/personDetail/index.js

@@ -33,7 +33,7 @@ export default class personDetail extends Component {
       case ROLE_CODE['ESTATE_AGENT']:
         return '独立经纪人'
       case ROLE_CODE['CHANNEL_AGENT']:
-        return '渠道经纪人'
+        return '独立经纪人'
       default:
         return '普通用户'
     }
@@ -72,7 +72,7 @@ export default class personDetail extends Component {
             <Image src={require('@assets/person/arrow2.png')} mode="widthFix"></Image>
           </View>
         </View>
-        {
+        {/* {
           (user.personType == ROLE_CODE['CHANNEL_AGENT'] || user.personType == ROLE_CODE['ESTATE_AGENT']) &&
 
           <View className='col_box' onClick={this.goEdit.bind(this)}>
@@ -82,7 +82,7 @@ export default class personDetail extends Component {
               <Image src={require('@assets/person/arrow2.png')} mode="widthFix"></Image>
             </View>
           </View>
-        }
+        } */}
       </View>
     )
   }

src/pages/project/detail/index.js

@@ -61,7 +61,7 @@ export default class Index extends Component {
     grantPhoneVisible: false, // 授权手机弹框
   }
 
-  componentWillMount() {
+  componentWillMount () {
     ready.queue(() => {
       // 分享场景需要先授权手机, 再授权头像
       const options = wx.getLaunchOptionsSync()
@@ -83,12 +83,12 @@ export default class Index extends Component {
     })
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
 
-  initPageData() {
+  initPageData () {
     const router = Taro.getStorageSync('router')
     const id = this.$router.params.id || router.query.id
     // const id='82b54f4a1f5b981df572253792afbfa1' 
@@ -118,7 +118,7 @@ export default class Index extends Component {
     })
   }
 
-  loadHelpGroupList() {
+  loadHelpGroupList () {
     const { buildingId } = this.state
 
     queryHelpGroup({ buildingId: buildingId }).then(res => {
@@ -140,7 +140,7 @@ export default class Index extends Component {
     )
   }
 
-  loadDetail() {
+  loadDetail () {
     const { buildingId } = this.state
     const { dispatchProjectDetail } = this.props
     this.setState({
@@ -168,7 +168,7 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityData() {
+  loadActivityData () {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
@@ -179,7 +179,7 @@ export default class Index extends Component {
     })
   }
 
-  loadNewsData() {
+  loadNewsData () {
     const { buildingId } = this.state
     const payload = { pageSize: 2, pageNumber: 1, buildingId }
     queryNewsList(payload).then(res => {
@@ -189,11 +189,11 @@ export default class Index extends Component {
     })
   }
 
-  navigateTo(url) {
+  navigateTo (url) {
     Taro.navigateTo({ url: url })
   }
   // 海报预览图
-  previewImage(arr) {
+  previewImage (arr) {
     // console.log('arr:' + arr)
     if (arr[0].length > 1) {
       Taro.previewImage({
@@ -220,7 +220,7 @@ export default class Index extends Component {
     })
   }
 
-  openMap() {
+  openMap () {
     const {
       buildingName,
       address,
@@ -247,13 +247,13 @@ export default class Index extends Component {
     })
   }
 
-  toViewAlbum(index) {
+  toViewAlbum (index) {
     const { buildingId } = this.state
     console.log('1111111', index)
     this.navigateTo(`/pages/project/album/index?id=${buildingId}&current=${index}`)
   }
 
-  onViewFans() {
+  onViewFans () {
     const { buildingId } = this.state
     this.navigateTo('/pages/card/fans/index?type=item&id=' + buildingId)
   }
@@ -282,7 +282,7 @@ export default class Index extends Component {
     }
   }
 
-  getPhoneNumber(e, item) {
+  getPhoneNumber (e, item) {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
       Taro.navigateTo({
@@ -291,7 +291,7 @@ export default class Index extends Component {
     })
   }
 
-  getPosterData() {
+  getPosterData () {
     return new Promise(resolve => {
       const { posterData } = this.state
       if (posterData.qrcode) {
@@ -363,14 +363,14 @@ export default class Index extends Component {
     })
   }
 
-  handleTelClick(item, e) {
+  handleTelClick (item, e) {
     e.stopPropagation()
     Taro.makePhoneCall({
       phoneNumber: item.phone
     })
   }
 
-  handleChatClick(item, e) {
+  handleChatClick (item, e) {
     e.stopPropagation()
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     Taro.navigateTo({
@@ -378,24 +378,24 @@ export default class Index extends Component {
     })
   }
 
-  handleConsuItemClick(item) {
+  handleConsuItemClick (item) {
     Taro.navigateTo({
       url: `/pages/card/index?id=${item.id}`
     })
   }
 
-  handleMoreClick() {
+  handleMoreClick () {
     // App.zhuge.track('查看置业顾问列表')
     Taro.navigateTo({
       url: `/pages/card/list/index?buildingId=${this.state.buildingId}`
     })
   }
 
-  handleStopPropagation(e) {
+  handleStopPropagation (e) {
     e.stopPropagation()
   }
 
-  toRecomonedPage() {
+  toRecomonedPage () {
     const {
       userInfo: { person: { personType } }
     } = this.props
@@ -411,50 +411,50 @@ export default class Index extends Component {
     }
   }
 
-  toHome() {
+  toHome () {
     Taro.switchTab({
       url: `/pages/project/index`
     })
   }
 
-  HandleCircumTabClick(id) {
+  HandleCircumTabClick (id) {
     this.setState({
       curTab: id
     })
   }
 
-  handleNewsMoreClick() {
+  handleNewsMoreClick () {
     Taro.navigateTo({
       url: `/pages/news/index?buildingId=` + this.state.buildingId
     })
   }
 
-  handNewsItemClick(id) {
+  handNewsItemClick (id) {
     Taro.navigateTo({
       url: '/pages/news/detail/index?id=' + id
     })
   }
 
-  handleActivityMoreClick() {
+  handleActivityMoreClick () {
     Taro.navigateTo({
       url: `/pages/activity/index?buildingId=` + this.state.buildingId
     })
   }
 
-  handActivityItemClick(item) {
+  handActivityItemClick (item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/index?id=' + item.dynamicId
     })
   }
 
-  handlePreviewHxImage(current, urls) {
+  handlePreviewHxImage (current, urls) {
     Taro.previewImage({
       current,
       urls
     })
   }
 
-  handleFavor() {
+  handleFavor () {
     const { buildingId, isSaved } = this.state
     if (isSaved) {
       cancelFavorProject(buildingId).then(res => {
@@ -484,12 +484,12 @@ export default class Index extends Component {
       console.log('活动项目收藏')
     })
   }
-  handleToolsClick() {
+  handleToolsClick () {
     Taro.navigateTo({
       url: `/pages/toolKit/index`
     })
   }
-  moreFloor() {
+  moreFloor () {
     Taro.navigateTo({
       url: `/pages/project/floor/index`
     })
@@ -505,7 +505,7 @@ export default class Index extends Component {
     this.initPageData()
   }
 
-  renderBottomMenu() {
+  renderBottomMenu () {
     const { userInfo: { person: { personType } } } = this.props
     const { posterShow } = this.state
     return (
@@ -540,14 +540,14 @@ export default class Index extends Component {
     )
   }
 
-  previewHouseImage(current, urls) {
+  previewHouseImage (current, urls) {
     Taro.previewImage({
       current,
       urls
     })
   }
 
-  renderBuildingProjectTypeList() {
+  renderBuildingProjectTypeList () {
     const { statusOpts } = this.state
     const { projectDetail: { buildingProjectType = [], status, marketStatus } } = this.props
     return (
@@ -607,7 +607,7 @@ export default class Index extends Component {
   }
 
 
-  renderPhotoAlbum() {
+  renderPhotoAlbum () {
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'photo')
     // const imgList = list.reduce((prev, cur) => {
@@ -668,7 +668,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  rendercircum() {
+  rendercircum () {
     const building = {
       ...this.props.projectDetail
     }
@@ -685,7 +685,7 @@ export default class Index extends Component {
     )
   }
 
-  renderConsuler() {
+  renderConsuler () {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
@@ -758,7 +758,7 @@ export default class Index extends Component {
     )
   }
 
-  renderStatement() {
+  renderStatement () {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
@@ -767,7 +767,7 @@ export default class Index extends Component {
   }
 
 
-  renderHelp() {
+  renderHelp () {
     const { helpList } = this.state
     return (
       <Block>
@@ -788,17 +788,17 @@ export default class Index extends Component {
     )
   }
 
-  handleHelpClick(item) {
+  handleHelpClick (item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/assistance?id=' + item.activityId
     })
   }
-  handleGroupClick(item) {
+  handleGroupClick (item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/assemble?id=' + item.activityId
     })
   }
-  renderGroup() {
+  renderGroup () {
     const { groupList } = this.state
     return (
       <Block>
@@ -821,7 +821,7 @@ export default class Index extends Component {
     )
   }
 
-  renderHouseTypeList() {
+  renderHouseTypeList () {
     const { statusOpts, statusBgColors } = this.state
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'apart')
@@ -869,7 +869,7 @@ export default class Index extends Component {
 
     )
   }
-  renderActivities() {
+  renderActivities () {
 
 
     const { activityList } = this.state
@@ -906,7 +906,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  renderNews() {
+  renderNews () {
     const { newsList } = this.state
     return (
       <Block>
@@ -938,7 +938,7 @@ export default class Index extends Component {
     )
   }
   // 开始播放
-  plagVideo() {
+  plagVideo () {
     let videoContext = wx.createVideoContext('myVideo')
     console.log()
     // this.setState({
@@ -946,26 +946,48 @@ export default class Index extends Component {
     // })
     videoContext.play()
   }
-  bindended(){
+  bindended () {
     let videoContext = wx.createVideoContext('myVideo')
-    console.log()
-    videoContext.seek(1)
+    console.log('111111')
+    // videoContext.stop()//停止
+    // videoContext.seek(1)//跳转
+    VideoContext.pause()//暂停
+  }
+  bindfullscreenchange = (e) => {
+
+    const { projectDetail } = this.props
+    const { videoImage } = projectDetail
+    const imgSrc = videoImage[0].url
+    console.log(e, '111111')
+
+    let videoContext = wx.createVideoContext('myVideo')
+    if (e.detail.fullScreen ) {
+      console.log(videoContext, '22222')
+videoContext.poster = undefined
+      console.log(videoContext, '22222')
+    }
+    else {
+      console.log(videoContext, '33333')
+      console.log(imgSrc, 'imgSrc')
+      videoContext.poster = imgSrc 
+      console.log(videoContext, '33333')
+    }
+    // VideoContext.pause()
+  }
+  onPlay = (e) => {
+    let videoContext = wx.createVideoContext('myVideo')
+    videoContext.poster = undefined
+    console.log(videoContext, '4444')
   }
-  // onPlay () {
-  //   console.log()
-  //   this.setState({
-  //     videoPlayShow: 'none'
-  //   })
-  // }
 
   // onPause() {
   //   this.setState({
-  //     videoPlayShow: 'flex'
+  //     videoPlayShow: 'flex'e.detail
   //   })
   // }
 
 
-  renderVideo() {
+  renderVideo () {
     const { videoPlayShow } = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
@@ -985,16 +1007,18 @@ export default class Index extends Component {
             height: '600rpx',
             width: '750rpx'
           }}
+          // initialTime='1'
           id='myVideo'
           controls={true}
-          bindended={this.bindended}
+          // bindended={this.bindended}
+          onFullScreenChange={this.bindfullscreenchange}
           // autoplay={false}
           // initialTime='0'
           // loop={true}
           // muted={false}
 
-          show-mute-btn='true'
-        // onPlay={this.onPlay}
+          showMuteBtn='true'
+        onPlay={this.onPlay}
         // show-center-play-btn='false'
         // onPause= {this.onPause}
 
@@ -1015,13 +1039,13 @@ export default class Index extends Component {
     )
   }
 
-  changeCurrent(current) {
+  changeCurrent (current) {
     this.setState({
       current: current + 1
     })
   }
 
-  render() {
+  render () {
     const { posterStatus, posterData, loaded, btnstate, grantPhoneVisible } = this.state
     const { projectDetail, userInfo } = this.props
     const { uvList = {} } = projectDetail