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.72:8080"',
-    WSS_HOST: '"ws://192.168.0.72:8080"',
+    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"',

src/pages/project/detail/index.js

@@ -904,6 +904,7 @@ export default class Index extends Component {
       </Block>
     )
   }
+  // 开始播放
   plagVideo () {
     let videoContext = wx.createVideoContext('myVideo')
     console.log()
@@ -914,29 +915,25 @@ export default class Index extends Component {
   }
 
   onPlay () {
-    
-    console.log()
+        console.log()
     this.setState({
       videoPlayShow: 'none'
     })
-   
   }
 
   onPause () {
-   
     this.setState({
       videoPlayShow: 'flex'
     })
-  
   }
 
+
   renderVideo () {
     const {videoPlayShow}  = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
     const imgSrc = videoImage[0].url
 
-
     return (
       <View
         className="pro__banner"
@@ -954,29 +951,27 @@ export default class Index extends Component {
           id='myVideo'
           controls={false}
           // autoplay={false}
-
           // initialTime='0'
-         
           // loop={false}
           // muted={false}
+          
           show-mute-btn='true'
           onPlay={this.onPlay}
           show-center-play-btn='false'
           onPause= {this.onPause}
-          // show-center-play-btn= 'f'
+       
         ></Video>
         <Button className='pro__banner-btn' onClick={this.plagVideo} style={{ display: videoPlayShow  }}>
           <Image src={require('@assets/play.png')} mode='scaleToFill' className='pro__banner-btn-img'></Image>
         </Button>
 
-        {/* <Button className='pro__banner-btn' onClick={this.plagVideo} style={{ display: videoPlayShow }}>
-          <Image src={require('@assets/play.png')} mode='scaleToFill' className='pro__banner-btn-img'></Image>style={{ display: posterShow }}
-        </Button>
-
-        <Button className='pro__banner-btn' onClick={this.plagVideo} style={{ display: videoPlayShow }}>
-          <Image src={require('@assets/play.png')} mode='scaleToFill' className='pro__banner-btn-img'></Image>
-        </Button> */}
-
+        {/* <View className='pro__banner-voice' onClick={this.plagVideo} >
+          <Image src={require('@assets/voice.png')} mode='scaleToFill	' className='pro__banner-voice-img'></Image>
+        </View> */}
+{/* 
+        <View className='pro__banner-extend' onClick={this.fullScreen} >
+          <Image src={require('@assets/extend.png')} mode='scaleToFill	' className='pro__banner-extend-img'></Image>
+        </View> */}
       
       </View>
     )
@@ -988,8 +983,6 @@ export default class Index extends Component {
     })
   }
 
-
-
   render() {
     const { posterStatus, posterData, loaded, btnstate } = this.state
     const { projectDetail } = this.props
@@ -1023,7 +1016,6 @@ export default class Index extends Component {
 
               {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='img-btn' onClick={() => this.setState({ btnstate: 0 })}>图片</View>
@@ -1034,13 +1026,11 @@ export default class Index extends Component {
                 <View className='img-btn' style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }}>图片</View>
               </View>)}
 
-
               <ScrollView
                 enableBackToTop
                 className="wrap"
                 scrollY>
                 <View className='detail__main'>
-
                   {/* 详情 */}
                   <View className='base-info'>
                     <View className='project__infor'>
@@ -1098,12 +1088,10 @@ export default class Index extends Component {
                           <Text className="label">物业费：</Text>{projectDetail.serviceFee || '暂无'}</View>
                       </View>
 
-
                       {/* <View className='row'>
                         <Text className="label">装修标准：</Text>{projectDetail.decoration || '暂无'}
                       </View> */}
 
-
                       {/* 围观人数 */}
                       <View className='watch__people__num'>
                         <View className='top__txt'>{total}人围观</View>

src/pages/project/detail/index.scss

@@ -19,7 +19,7 @@
     height: 64px;
     background: rgba(255, 255, 255, 1);
     border-radius: 12px;
-    top: 420px;
+    top: 440px;
     left: 284px;
     font-size: 30px;
     font-family: PingFangSC-Regular, PingFang SC;
@@ -48,7 +48,7 @@
 
 
   .wrap {
-    padding-top: 580px;
+    padding-top: 576px;
     background: transparent;
   }
 
@@ -802,12 +802,44 @@
     left: 320px;
     padding: 0;
     background: none;
-    &-img{
+
+    &-img {
       width: 110px;
       height: 78px;
     }
   }
 
+  &-voice {
+    width: 48px;
+    height: 48px;
+    position: absolute;
+    top: 440px;
+    right: 94px;
+    padding: 0;
+    background: none;
+
+    &-img {
+      width: 48px;
+    height: 48px;
+    
+    }
+  }
+  &-extend {
+    width: 48px;
+    height: 48px;
+    position: absolute;
+    top: 440px;
+    right: 30px;
+    padding: 0;
+    background: none;
+
+    &-img {
+      width: 48px;
+      height: 48px;
+     
+    }
+  }
+
 }
 
 // 户型