zls

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.172:8080"',

src/components/amap/PoiAround.js

@@ -4,19 +4,12 @@ import icons from './icons'
 
 export default class PoiAround extends Component {
 
-  state = {
-    current: undefined,
-  }
-
   handleTap = (e) => {
     const marker = this.props.markers.filter(x => x.id === e.markerId)[0]
-
-    this.setState({ current: e.markerId })
     this.props.onMarkerClick && this.props.onMarkerClick(marker)
   }
 
   render() {
-    const { current } = this.state
     const markers =  (this.props.markers || []).map((marker, index) => {
       const icon = icons[index].normal
       const activeIcon = icons[index].active
@@ -25,7 +18,7 @@ export default class PoiAround extends Component {
         id: marker.id,
         latitude: marker.latitude,
         longitude: marker.longitude,
-        iconPath: current === marker.id ? activeIcon : icon,
+        iconPath: this.props.current === marker.id ? activeIcon : icon,
         width: 56,
         height: 56,
       }

src/components/charts/Line.js

@@ -76,7 +76,7 @@ export default class LineChart extends Component {
       grid: {
         left: '10%',
         right: '8%',
-        bottom: '10%',
+        bottom: '12%',
         top: '10%',
       },
       series: [],
@@ -89,7 +89,30 @@ export default class LineChart extends Component {
     return {
       ...defaultOpt,
       dataset: { source },
-      dataZoom: [{ type: 'inside', startValue, endValue }],
+      dataZoom: [{
+        type: 'slider',
+        startValue, endValue,
+        show: true,
+        xAxisIndex: [0],
+        handleSize: 10,//滑动条的 左右2个滑动条的大小  
+        height: 20,//组件高度  
+        left: 30, //左边的距离  
+        right: 30,//右边的距离  
+        bottom: 0,//下边的距离  
+        handleColor: 'rgba(0,0,0,0.1)',//h滑动图标的颜色  
+        realtime : true,
+        handleStyle: {
+          borderColor: "#999",
+          borderWidth: "1",
+          shadowBlur: 2,
+          background: "rgba(0,0,0,0.1)",
+          shadowColor: "rgba(0,0,0,0.1)",
+        },
+        backgroundColor: 'rgba(0,0,0,0.1)',//两边未选中的滑动条区域的颜色  
+        showDataShadow: false,//是否显示数据阴影 默认auto  
+        showDetail: false,
+
+      }],
       series: [{
         type: 'line',
         dimensions: ['name', 'value'],

src/pages/activity/detail/assemble.js

@@ -630,7 +630,7 @@ export default class Detail extends Component {
                   {
                     !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
 
-                    <View className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"}>
+                    <View className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} style="border:none">
                       <FormIdCollector>
                         <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
                       </FormIdCollector>

src/pages/activity/detail/assistance.js

@@ -66,7 +66,7 @@ export default class Detail extends Component {
     handleHelpBtn: true, // 立即助力好友
     pointRecordId: undefined, // 埋点ID
   }
-  
+
   componentWillMount() {
     ready.queue(() => {
       // 必须先授权电话
@@ -84,7 +84,7 @@ export default class Detail extends Component {
   componentDidShow() {
     this.startTicker()
   }
-  
+
   componentDidHide() {
     this.stopTicker()
   }
@@ -159,7 +159,7 @@ export default class Detail extends Component {
   // 打开关闭海报面板
   togglePosterVisible = () => {
     const { posterVisible, posters, actionSheetVisible } = this.state
-    
+
     if (!posters || !posters.length) {
       Taro.showToast({
         title: '未设置海报模板',
@@ -500,7 +500,7 @@ export default class Detail extends Component {
     return (
       <View>
         {/* 生成海报 */}
-        { posterVisible && !ltTicker.processing &&
+        {posterVisible && !ltTicker.processing &&
           (
             <Poster configs={posterConfigs} onCancel={this.togglePosterVisible} onFinish={this.togglePosterVisible}></Poster>
           )
@@ -606,7 +606,7 @@ export default class Detail extends Component {
                           (helpState === HelpInProcess && !isJoin) &&
                           (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.handleHelp}>立即助力好友</Button></FormIdCollector></View>)
                         }
-                        <View className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"}>
+                        <View className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"} style="border:none">
                           <FormIdCollector>
                             <Button className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的助力</Button>
                           </FormIdCollector>
@@ -614,6 +614,14 @@ export default class Detail extends Component {
                       </View>
                     )
                   }
+                  <View className="btn-box" style="padding:25px 0;">
+
+                    <View className="set-btn" style="border:none">
+                      <FormIdCollector>
+                        <Button className= "set-btn" onClick={this.startMine}>发起我的助力</Button>
+                      </FormIdCollector>
+                    </View>
+                  </View>
                 </View>
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
                 <View style="padding:0 40rpx">

src/pages/activity/item/index.scss

@@ -39,7 +39,7 @@
   .success-num{
     position: absolute;
     right:0;
-    top:282px;
+    top:340px;
     color: #fff;
     display: flex;
     height: 48px;

src/pages/agent/recommend/index.js

@@ -275,11 +275,12 @@ export default class Index extends Component {
         Taro.showToast({
           title: '提交成功'
         })
+        setTimeout(() => {
+          Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
+        }, 700)
+        this.clearInputEvent()
       }
-      this.clearInputEvent()
-      setTimeout(() => {
-        Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
-      }, 700)
+
     })
   }
   // 性别

src/pages/person/menus.js

@@ -73,13 +73,13 @@ const menus = [
     // },
   ],
   [
-    // {
-    //   name: '我的客户',
-    //   url: '/pages/person/myGuest/index',
-    //   icon: icons.client,
-    //   extends: undefined,
-    //   userTypes: [CONSULTANT],
-    // },
+    {
+      name: '我的客户',
+      url: '/pages/person/myGuest/index',
+      icon: icons.client,
+      extends: undefined,
+      userTypes: [CONSULTANT],
+    },
     {
       name: '我的活动',
       url: '/pages/activity/myActivity?from=mine',

src/pages/project/detail/Around/Pannel.js

@@ -1,49 +1,120 @@
-import Taro from '@tarojs/taro'
-import { View } from '@tarojs/components'
+import Taro, { Component } from '@tarojs/taro'
+import { View, ScrollView } from '@tarojs/components'
 import './style.scss'
 
 const posIcon = require('@assets/icons/amap/position.png')
 
-export default function Pannel(props) {
-  
-  const { data = [], manualData = [] } = props.dataset || {}
-  const activeKey = props.active
+export default class Pannel extends Component {
 
-  const ty = Object.prototype.toString
-  
-  return (
-    <View className="around-pannel">
-      {
-        (ty.call(data) === '[object String]' ? JSON.parse(data) : []).map((item, index) => {
-          const { id, name, distance } = item || {}
-          const dist = distance >= 1000 ? `${Number(distance / 1000).toFixed(1)}km` : `${distance}m`
-          const active = activeKey === id
-
-          return (
-            <View className={`around-cell ${active ? 'active' : ''}`} key={`auto-${id}`}>
-              <View className="around-cell__body">{`${index + 1}、${name}`}</View>
-              <View className="around-cell__action">
-                <Image className="icon" src={posIcon} />
-                {dist}
-              </View>
-            </View>
-          )
-        })
-      }
-      {
-        manualData.length && (
-          <View className="around-cell-title">其他</View>
-        )
+  // 记录滚动位置
+  scrollPos = {}
+
+  state = {
+    markerList: [],
+    currentMarker: undefined,   // 仅用于数据比较, 渲染不依靠这个
+    currentMarkerPos: undefined,
+  }
+
+  componentDidMount() {
+    // setTimeout(() => {
+    //   // 记录滚动位置
+    //   Taro.createSelectorQuery().in(this.$scope).selectAll('.around-cell').fields({ id: true, rect: true }, (res) => {
+    //     console.log('--------', res)
+    //     // this.scrollPos[res.id] = res.scrollTop
+    //   }).exec()
+
+    // }, 0)
+  }
+
+  componentWillMount() {
+    this.initData(this.props)
+  }
+
+  componentWillReceiveProps(nextProps) {
+    this.initData(nextProps)
+  }
+
+  initData = (props) => {
+    const { data = [] } = props.dataset || {}
+    const markerList = JSON.parse(data)
+    let activeIndex = -1
+    let currentMarkerPos = undefined
+
+    if (props.active !== undefined && props.active != (this.state.currentMarker || {}).id) {
+      for (let i = 0; i < markerList.length; i ++) {
+        if (markerList[i].id === props.active) {
+          activeIndex = i;
+          break;
+        }
       }
-      {
-        manualData.map((item, index) => {
-          return (
-            <View className="around-cell" key={`manual-${index}`}>
-              <View className="around-cell__body">{`${index + 1}、${item}`}</View>
-            </View>
-          )
-        })
+
+      if (activeIndex !== -1) {
+        currentMarkerPos = activeIndex * 35 + 20 // 每个 around-cell 的高度是 35, 20 是 调节值
+      } else {
+        currentMarkerPos = 0
       }
-    </View>
-  )
+    } else {
+      currentMarkerPos = 0
+    }
+
+    // console.log('-------markerList---------', markerList)
+
+    this.setState({ currentMarkerPos, markerList })
+  }
+
+  setCurrent = (marker) => () => {
+    this.setState({
+      currentMarkerPos: undefined,
+      currentMarker: marker,
+    }, () => this.props.onChange(marker))
+  }
+
+  bindScroll = (e) => {
+    console.log(e)
+  }
+
+  render () {  
+    const { manualData = [] } = this.props.dataset || {}
+    const activeKey = this.props.active
+
+    const fixdHeight = this.props.style || 'height: 300rpx'
+
+    return (
+      <ScrollView scrollY style={fixdHeight} scrollTop={this.state.currentMarkerPos} onScroll={this.bindScroll}>
+        <View className="around-pannel">
+          {
+            this.state.markerList.map((item, index) => {
+              const { id, name, distance } = item || {}
+              const dist = distance >= 1000 ? `${Number(distance / 1000).toFixed(1)}km` : `${distance}m`
+              const active = activeKey === id
+  
+              return (
+                <View className={`around-cell ${active ? 'active' : ''}`} key={`auto-${id}`} id={id} onClick={this.setCurrent(item)}>
+                  <View className="around-cell__body">{`${index + 1}、${name}`}</View>
+                  <View className="around-cell__action">
+                    <Image className="icon" src={posIcon} />
+                    {dist}
+                  </View>
+                </View>
+              )
+            })
+          }
+          {
+            manualData.length && (
+              <View className="around-cell-title">其他</View>
+            )
+          }
+          {
+            manualData.map((item, index) => {
+              return (
+                <View className="around-cell" key={`manual-${index}`}>
+                  <View className="around-cell__body">{`${index + 1}、${item}`}</View>
+                </View>
+              )
+            })
+          }
+        </View>
+      </ScrollView>
+    )
+  }
 }

src/pages/project/detail/Around/Tab.js

@@ -6,7 +6,7 @@ export default function Tab(props) {
   
   const [current, setCurrent] = useState(props.default || 0)
   
-  const tabList = props.dataset ? props.dataset.filter(x => x.num) : []
+  const tabList = props.dataset ? props.dataset : []
   
   const handleClick = index => () => {
     setCurrent(index)

src/pages/project/detail/Around/index.js

@@ -7,7 +7,7 @@ import './style.scss'
 
 export default function Around(props) {
   const detail = props.building || {}
-  console.log(detail,"detaildetaildetaildetail")
+  
   const [lat, lng] = (detail.coordinate || '').split(',')
   const poiDatas = detail.mapJson ? JSON.parse(detail.mapJson) : []
   const ty = Object.prototype.toString
@@ -17,15 +17,13 @@ export default function Around(props) {
     const key = item.key
     const manualData = (detail[`building${key}`] === '' ? [] : detail[`building${key}`].split(','))
     
-    console.log(manualData,"manualDatamanualData")
     return {
       ...item,
       manualData,
       num: (ty.call(item.data) === '[object String]' ? JSON.parse(item.data) : []).length + manualData.length,
     }
-  })
+  }).filter(x => x.num)
 
-  
   // 所有的 markers
   const markersList = dataList.map((item) => {
     const mapJson = JSON.parse(item.data) 
@@ -45,7 +43,7 @@ export default function Around(props) {
   // 部分默认值
   const [curTab, setCurTab] = useState(0)
   const [markers, setMarkers] = useState(markersList[curTab])
-  const [curAD, setCurAD] = useState()
+  const [curMarker, setCurMarker] = useState()
   
   // tab 切换
   const handleTabChange = (index, tabItem) => {
@@ -55,7 +53,7 @@ export default function Around(props) {
 
   // marker 点切换
   const handleMarkerTap = (marker) => {
-    setCurAD(marker.id)
+    setCurMarker(marker.id)
   }
 
   const goto = () => {
@@ -67,11 +65,11 @@ export default function Around(props) {
   return (
     <View className="around-box">
       <View className="around-header">
-        <PoiAround style="width: 100vw; height: 500rpx;" markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap}/>
+        <PoiAround style="width: 100vw; height: 500rpx;" current={curMarker} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap}/>
       </View>
       <View className="around-body">
         <Tab dataset={dataList} onChange={handleTabChange} />
-        <Pannel active={curAD} dataset={dataList[curTab]} />
+        <Pannel active={curMarker} dataset={dataList[curTab]} onChange={handleMarkerTap}/>
         <View className="goto-map" onClick={goto}>立即前往</View>
         <View className="around-hr" />
       </View>

src/pages/project/detail/index.js

@@ -48,6 +48,7 @@ export default class Index extends Component {
     helpList: [],
     groupList: [],
     statusOpts: ['待定', '售罄', '在售'],
+    statusBgColors: ['#F6B61D', '#BB9C79', '#CECECE'],
     // circumOpts: [],
     curTab: 'Transport',
     recordId: null,
@@ -58,7 +59,7 @@ export default class Index extends Component {
     videoPlayShow: 'flex',
   }
 
-  componentWillMount () {
+  componentWillMount() {
     // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
 
     ready.queue(() => {
@@ -92,12 +93,17 @@ export default class Index extends Component {
     })
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+  componentDidMount() {
+    const options = wx.getLaunchOptionsSync()
+    console.log(options, "-------------options---------")
+    // if()
+  }
 
-  loadHelpGroupList () {
+  loadHelpGroupList() {
     const { buildingId } = this.state
 
     queryHelpGroup({ buildingId: buildingId }).then(res => {
@@ -119,7 +125,7 @@ export default class Index extends Component {
     )
   }
 
-  loadDetail () {
+  loadDetail() {
     const { buildingId } = this.state
     const { dispatchProjectDetail } = this.props
     this.setState({
@@ -147,7 +153,7 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityData () {
+  loadActivityData() {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
@@ -158,7 +164,7 @@ export default class Index extends Component {
     })
   }
 
-  loadNewsData () {
+  loadNewsData() {
     const { buildingId } = this.state
     const payload = { pageSize: 2, pageNumber: 1, buildingId }
     queryNewsList(payload).then(res => {
@@ -168,11 +174,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({
@@ -199,7 +205,7 @@ export default class Index extends Component {
     })
   }
 
-  openMap () {
+  openMap() {
     const {
       buildingName,
       address,
@@ -226,12 +232,12 @@ export default class Index extends Component {
     })
   }
 
-  toViewAlbum () {
+  toViewAlbum() {
     const { buildingId } = this.state
     this.navigateTo(`/pages/project/album/index?id=${buildingId}`)
   }
 
-  onViewFans () {
+  onViewFans() {
     const { buildingId } = this.state
     this.navigateTo('/pages/card/fans/index?type=item&id=' + buildingId)
   }
@@ -260,7 +266,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({
@@ -269,7 +275,7 @@ export default class Index extends Component {
     })
   }
 
-  getPosterData () {
+  getPosterData() {
     return new Promise(resolve => {
       const { posterData } = this.state
       if (posterData.qrcode) {
@@ -340,14 +346,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({
@@ -355,24 +361,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
@@ -388,50 +394,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 => {
@@ -461,18 +467,18 @@ 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`
     })
   }
 
-  renderBottomMenu () {
+  renderBottomMenu() {
     const { userInfo: { person: { personType } } } = this.props
     const { posterShow } = this.state
     return (
@@ -507,14 +513,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 (
@@ -574,7 +580,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) => {
@@ -606,15 +612,15 @@ export default class Index extends Component {
                       console.log(buildingImgUrl, 'buildingImgUrl')
 
                       // if (buildingImgUrl != null) {
-                      return (<View>
+                      return (<View key={index + "listimg"}>
                         {buildingImgUrl != null && (<View
                           style={{ marginRight: '8px' }}
                         >
 
                           <View>
                             <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} ></Image>
-                            <View style={{ width: '218rpx', display: 'flex',justifyContent:'center'  }} >
-                              <View style={{  overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
+                            <View style={{ width: '218rpx', display: 'flex', justifyContent: 'center' }} >
+                              <View style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
                               <View> ({buildingImgList.length})</View>
                             </View>
                           </View>
@@ -633,7 +639,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  rendercircum () {
+  rendercircum() {
     const building = {
       ...this.props.projectDetail
     }
@@ -650,7 +656,7 @@ export default class Index extends Component {
     )
   }
 
-  renderConsuler () {
+  renderConsuler() {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
@@ -723,7 +729,7 @@ export default class Index extends Component {
     )
   }
 
-  renderStatement () {
+  renderStatement() {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
@@ -732,7 +738,7 @@ export default class Index extends Component {
   }
 
 
-  renderHelp () {
+  renderHelp() {
     const { helpList } = this.state
     return (
       <Block>
@@ -753,17 +759,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>
@@ -787,7 +793,7 @@ export default class Index extends Component {
   }
 
   renderHouseTypeList () {
-    const { statusOpts } = this.state
+    const { statusOpts, statusBgColors } = this.state
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'apart')
     let imgUrls = list.reduce((prev, cur) => {
@@ -809,9 +815,8 @@ export default class Index extends Component {
                       {
                         item && (
                           <View className='house__img-info'>
-                            {console.log(list, '-------')}
                             <Image className='house__img' src={getThumbnail(item.buildingImgList[0].url)} mode="widthFix" onClick={this.handlePreviewHxImage.bind(this, item.buildingImgList[0].url, imgUrls)}></Image>
-                            <View className='house-type__state'>{statusOpts[item.marketStatus - 1]}</View>
+                            <View className='house-type__state' style={`background-color: ${statusBgColors[item.marketStatus - 1]}`}>{statusOpts[item.marketStatus - 1]}</View>
                           </View>
                         )
                       }
@@ -835,7 +840,7 @@ export default class Index extends Component {
 
     )
   }
-  renderActivities () {
+  renderActivities() {
     // renderGroup () {
     //   const { groupList } = this.state
     //   return (
@@ -909,7 +914,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  renderNews () {
+  renderNews() {
     const { newsList } = this.state
     return (
       <Block>
@@ -941,7 +946,7 @@ export default class Index extends Component {
     )
   }
   // 开始播放
-  plagVideo () {
+  plagVideo() {
     let videoContext = wx.createVideoContext('myVideo')
     console.log()
     // this.setState({
@@ -964,7 +969,7 @@ export default class Index extends Component {
   // }
 
 
-  renderVideo () {
+  renderVideo() {
     const { videoPlayShow } = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
@@ -986,16 +991,12 @@ export default class Index extends Component {
           }}
           id='myVideo'
           controls={true}
-          initialTime='0'
-  
-          loop={false}
-          muted={false}
-        // autoplay={false}
-        // initialTime='0'
-        // loop={true}
-        // muted={false}
-
-        show-mute-btn={true}
+          // autoplay={false}
+          // initialTime='0'
+          // loop={true}
+          // muted={false}
+
+          show-mute-btn='true'
         // onPlay={this.onPlay}
         // show-center-play-btn='false'
         // onPause= {this.onPause}
@@ -1017,13 +1018,13 @@ export default class Index extends Component {
     )
   }
 
-  changeCurrent (current) {
+  changeCurrent(current) {
     this.setState({
       current: current + 1
     })
   }
 
-  render () {
+  render() {
     const { posterStatus, posterData, loaded, btnstate } = this.state
     const { projectDetail } = this.props
     const { uvList = {} } = projectDetail

src/pages/shop/index.scss

@@ -199,10 +199,8 @@
       line-height: 60px;
       font-weight: bold;
       padding: 0 20px;
-      width:334px;
-      overflow:hidden; 
-      text-overflow:ellipsis; 
-      white-space: nowrap
+      max-width: 320px;
+      @include text-ellipsis;
     }
 
     &__des {