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

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.84:8080"',
-    // WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://192.168.0.131:8080"',
+    WSS_HOST: '"ws://192.168.0.131:8080"',
   },
   weapp: {},
   h5: {}

src/pages/project/banner/index.js

@@ -13,19 +13,15 @@ export default class SwiperBanner extends Component {
       height: '200px'
     },
     onClick: function () { },
-    current: 0,
+   
   }
 
   changeCurrent (event) {
-    console.log(event.detail.current)
+   
     const current = event.detail.current
-    this.setState(
-      {
-        current: current
-      }
-    )
+   
     this.props.onChange(current)
-    // event.detail = {current, source}
+  
   }
 
   onBannerClick (item) {
@@ -42,7 +38,7 @@ export default class SwiperBanner extends Component {
           onChange={this.changeCurrent.bind(this)}
           indicatorDots={indicatorDots}
           indicatorActiveColor='rgb(256,256,256)'
-        >{console.log(current)}
+        >
           {list.map((item, index) => (
             <SwiperItem
               key={index}

src/pages/project/detail/index.js

@@ -69,6 +69,7 @@ export default class Index extends Component {
     recordId: null,
     posterShow: 'none',
     current: 1,
+    btnstate: true,
   }
 
   componentWillMount () {
@@ -606,9 +607,9 @@ export default class Index extends Component {
               <View className='photos__type__title'>相册</View>
               <ScrollView scrollX>
                 <View className='photos__type__content'>
-                  <View className='photos__type__list'>
-                    <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__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>
                 </View>
               </ScrollView>
@@ -886,16 +887,20 @@ export default class Index extends Component {
 
   renderVideo () {
     return (
-      <Video
+      <View style={{
+        height: '278px'
+      }}>123
+      {/* <Video
         style={{
           height: '278px'
         }}
-      ></Video>
+      ></Video> */}
+      </View>
     )
   }
 
   changeCurrent (current) {
-    console.log('value:', current)
+    // console.log('value:', current)
     this.setState({
       current: current + 1
     })
@@ -904,7 +909,7 @@ export default class Index extends Component {
 
 
   render () {
-    const { posterStatus, posterData, loaded } = this.state
+    const { posterStatus, posterData, loaded, btnstate } = this.state
     const { projectDetail } = this.props
     const { uvList = {} } = projectDetail
     const { total = 0, records = [] } = uvList
@@ -916,26 +921,36 @@ export default class Index extends Component {
           loaded && (
             <View className='detail'>
               <Notice></Notice>
-              <View
-                className="pro__banner"
-                onClick={this.previewImage.bind(this, projectDetail.buildingImg)}>
-                {1 && <View> <Banner
-                  list={projectDetail.buildingImg}
-                  indicatorDots={false}
-                  // current
-                  onChange={this.changeCurrent.bind(this)}
-                  style={{
-                    height: '278px'
-                  }}
-
-                ></Banner>
-                  <Text className="pro__banner-text">{this.current}/{(projectDetail.buildingImg && projectDetail.buildingImg.length) || 0}</Text></View>}
-
-                <View className='media-btn'>
-                  <View className='video-btn' >视频</View>
-                  <View className='img-btn' >图片</View>
+              {btnstate && (
+                <View
+                  className="pro__banner"
+                  onClick={this.previewImage.bind(this, projectDetail.buildingImg)}>
+                  <Banner
+                    list={projectDetail.buildingImg}
+                    indicatorDots={false}
+                    // current
+                    onChange={this.changeCurrent.bind(this)}
+                    style={{
+                      height: '278px'
+                    }}
+
+                  ></Banner>
+                  <Text className="pro__banner-text">{this.current}/{(projectDetail.buildingImg && projectDetail.buildingImg.length) || 0}</Text>
                 </View>
-              </View>
+              )}
+
+              {!btnstate && 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>
+              </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>
+              </View>)}
 
 
               <ScrollView

src/pages/project/detail/index.scss

@@ -26,21 +26,22 @@
     font-weight: 400;
     text-align: center;
     line-height: 64px;
-
+    color: rgba(53, 53, 53, 1);
     display: flex;;
     .video-btn {
       width: 92px;
       height: 64px;
-      background: rgba(187, 156, 121, 1);
       border-radius: 12px 0px 0px 12px;
-      color: rgba(255, 255, 255, 1);
+  
+    
     }
 
     .img-btn {
       width: 92px;
       height: 64px;
-      color: rgba(53, 53, 53, 1);
+      border-radius: 0px 12px 12px 0px;
     }
+
   }