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/components/charts/Line.js

@@ -35,9 +35,8 @@ export default class LineChart extends Component {
 
   // 禁止 props 变更时渲染
   shouldComponentUpdate(nextProps) {
-    console.log('------------>', this.props, nextProps)
     if (nextProps.source && nextProps.source.length) {
-      this.refreshChart(this.props.source)
+      this.refreshChart(nextProps.source)
     }
 
     return false
@@ -78,7 +77,7 @@ export default class LineChart extends Component {
         left: '10%',
         right: '8%',
         bottom: '10%',
-        top: '6%',
+        top: '10%',
       },
       series: [],
     }
@@ -126,7 +125,7 @@ export default class LineChart extends Component {
 
   refreshChart(source) {
     const options = this.createOptions(source)
-    console.log(source,"source")
+
     if (!this.echart) {
       if (this.ecComponent) {
         const initFunc = initChart(this.handleChart.bind(this), options)
@@ -140,6 +139,8 @@ export default class LineChart extends Component {
   }
 
   render() {
+    // this.refreshChart(this.props.source)
+
     return (
       <View className="map-container">
         <ec-canvas ref={this.handleEcComponent} ec={this.state.ec}></ec-canvas>

src/components/star/index.js

@@ -25,7 +25,7 @@ export default class Star extends Component {
     }
     return (
       <View className="star">
-        {classNameArr.map((cls,index) => <Text className={`star__icon iconfont ${cls}`} key={index} ></Text>)}
+        {classNameArr.map((cls,index) => <Text className={`star__icon iconfont ${cls}`} key={index+'arr'} ></Text>)}
         <Text className="star__txt">{_value}</Text>
       </View>
     )

src/pages/agent/client/index.js

@@ -113,7 +113,7 @@ export default class Index extends Component {
               {
                 list.map((item, index) => {
                   return (
-                    <View className='client__list' key={index} onClick={this.navigateTo.bind(this, item.customerId)}>
+                    <View className='client__list' key={index+'client'} onClick={this.navigateTo.bind(this, item.customerId)}>
                       <Image className='bg' src={item.verifyStatus == 2 ? require('@assets/person/card1.png') : require('@assets/person/card2.png')}></Image>
                       <View className='client'>
                         <View className='client__status2'>

src/pages/agent/progress/index.js

@@ -161,7 +161,7 @@ export default class Index extends Component {
               {
                 this.state.processData.map((item, index) => {
                   return (
-                    <View className='step_tip' key={index}>
+                    <View className='step_tip' key={index+'step'}>
                       <Icon type={item.icon} size="20" color={item.color} />
                       <Text className={index === 3 ? 'strip hide' : 'strip'}></Text>
                     </View>

src/pages/im/index.js

@@ -539,7 +539,7 @@ export default class Chat extends Component {
                 {/* <View className="prompt__title">常见问题咨询</View> */}
                 {prompts.map((text, index) => (
                   <View
-                    key={index}
+                    key={index+'im'}
                     className="prompt__item"
                     onClick={this.handleIssueClick.bind(this, text)}>
                     <Text>{text}</Text>

src/pages/person/customerAnalysis/analysis.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import Authorize from '@components/authorize'
 import { View } from "@tarojs/components";
+import dayjs from 'dayjs'
 import './index.scss'
 import { AtTabs, AtTabsPane, AtProgress } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
@@ -46,18 +47,34 @@ export default class analysis extends Taro.Component {
           sexInfo: res || []
         })
       })
+      getEchartDailyInfo('follow').then(res => {
+        this.setState({
+          chartInfo: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
+        })
+      })
+
     } else if (value == '1') {
       querySexInfo('follow').then(res => {
         this.setState({
           sexInfo: res || []
         })
       })
+      getEchartDailyInfo('follow').then(res => {
+        this.setState({
+          chartInfo: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
+        })
+      })
     } else {
       querySexInfo('visite ').then(res => {
         this.setState({
           sexInfo: res || []
         })
       })
+      getEchartDailyInfo('visite').then(res => {
+        this.setState({
+          chartInfo: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
+        })
+      })
     }
 
     this.setState({
@@ -73,13 +90,8 @@ export default class analysis extends Taro.Component {
       })
     })
     getEchartDailyInfo('new').then(res => {
-      let arr = []
-      res.map((item, index) => {
-        arr.push({ value: item.customerNum, name: item.day })
-      })
-      console.log(arr, "88888888888888888888888888888888888")
       this.setState({
-        chartInfo: arr || []
+        chartInfo: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
       })
     })
   }
@@ -88,28 +100,20 @@ export default class analysis extends Taro.Component {
     const params = current == 0 ? 'new' : current == 1 ? 'follow' : 'visite'
     if (inx == 0) {
       getEchartDailyInfo(params).then(res => {
-
-
-        let arr = []
-        res.map((item, index) => {
-          arr.push({ value: item.customerNum, name: item.day })
-        })
-        console.log(arr, "88888888888888888888888888888888888")
         this.setState({
-          chartInfo: arr || []
+          chartInfo: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
         })
       })
     } else {
       getEchartMonthInfo(params).then(res => {
-
         this.setState({
+          chartInfo: res.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum }))
         })
       })
     }
     this.setState({
       checkedWhich: inx
     })
-
   }
 
   render() {

src/pages/project/banner/index.js

@@ -46,7 +46,7 @@ export default class SwiperBanner extends Component {
         >
           {list.map((item, index) => (
             <SwiperItem
-              key={index}
+              key={index+'swiper'}
               onClick={this.onBannerClick.bind(this, item)}
               className='home-banner__swiper-item'
             >

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;
+     
+    }
+  }
+
 }
 
 // 户型

src/pages/project/list/filter/index.js

@@ -218,7 +218,7 @@ export default class Index extends Component {
         {
           tabs[tabIndex].list.map((item, index) => (
             <View
-              key={index}
+              key={index+'tab'}
               className={`row ${selectedIndex[tabIndex].includes(index) ? 'active' : ''}`}
               onClick={this.handleFilterItemClick.bind(this, index)}>
               {item.name || item.buildingTypeName || item}
@@ -255,7 +255,7 @@ export default class Index extends Component {
           {
             list.map((text, index) => (
               <View
-                key={index}
+                key={index+'list'}
                 className={`price-item ${selectedIndex[tabIndex].includes(index) ? 'selected' : ''}`}
                 onClick={this.handleFilterItemClick.bind(this, index)}>
                 {text}

src/pages/project/swiper/index.js

@@ -39,7 +39,7 @@ export default class SwiperBanner extends Component {
           {list.map((item, index) => (
 
             <SwiperItem
-              key={index}
+            key={index+'swiper2'}
               onClick={this.onBannerClick.bind(this, item)}
               className='home-banner__swiper-item'
             >

src/pages/shop/banner/index.js

@@ -29,7 +29,7 @@ export default class SwiperBanner extends Component {
         >
           {list.map((item, index) => (
             <SwiperItem
-              key={index}
+            key={index+'swiper3'}
               onClick={this.onBannerClick.bind(this, item)}
               className='home-banner__swiper-item'
             >