commit

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/project/detail/index.js

@@ -58,7 +58,7 @@ export default class Index extends Component {
     videoPlayShow: 'flex',
   }
 
-  componentWillMount () {
+  componentWillMount() {
     // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
 
     ready.queue(() => {
@@ -92,12 +92,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 +124,7 @@ export default class Index extends Component {
     )
   }
 
-  loadDetail () {
+  loadDetail() {
     const { buildingId } = this.state
     const { dispatchProjectDetail } = this.props
     this.setState({
@@ -147,7 +152,7 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityData () {
+  loadActivityData() {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
@@ -157,7 +162,7 @@ export default class Index extends Component {
     })
   }
 
-  loadNewsData () {
+  loadNewsData() {
     const { buildingId } = this.state
     const payload = { pageSize: 2, pageNumber: 1, buildingId }
     queryNewsList(payload).then(res => {
@@ -167,11 +172,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({
@@ -198,7 +203,7 @@ export default class Index extends Component {
     })
   }
 
-  openMap () {
+  openMap() {
     const {
       buildingName,
       address,
@@ -225,12 +230,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)
   }
@@ -259,7 +264,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({
@@ -268,7 +273,7 @@ export default class Index extends Component {
     })
   }
 
-  getPosterData () {
+  getPosterData() {
     return new Promise(resolve => {
       const { posterData } = this.state
       if (posterData.qrcode) {
@@ -339,14 +344,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({
@@ -354,24 +359,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
@@ -387,50 +392,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 => {
@@ -460,18 +465,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 (
@@ -506,14 +511,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 (
@@ -573,7 +578,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) => {
@@ -605,15 +610,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>
@@ -632,7 +637,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  rendercircum () {
+  rendercircum() {
     const building = {
       ...this.props.projectDetail
     }
@@ -649,7 +654,7 @@ export default class Index extends Component {
     )
   }
 
-  renderConsuler () {
+  renderConsuler() {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
@@ -722,7 +727,7 @@ export default class Index extends Component {
     )
   }
 
-  renderStatement () {
+  renderStatement() {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
@@ -731,7 +736,7 @@ export default class Index extends Component {
   }
 
 
-  renderHelp () {
+  renderHelp() {
     const { helpList } = this.state
     return (
       <Block>
@@ -752,17 +757,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>
@@ -785,7 +790,7 @@ export default class Index extends Component {
     )
   }
 
-  renderHouseTypeList () {
+  renderHouseTypeList() {
     const { statusOpts } = this.state
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'apart')
@@ -834,7 +839,7 @@ export default class Index extends Component {
 
     )
   }
-  renderActivities () {
+  renderActivities() {
     // renderGroup () {
     //   const { groupList } = this.state
     //   return (
@@ -903,7 +908,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  renderNews () {
+  renderNews() {
     const { newsList } = this.state
     return (
       <Block>
@@ -935,7 +940,7 @@ export default class Index extends Component {
     )
   }
   // 开始播放
-  plagVideo () {
+  plagVideo() {
     let videoContext = wx.createVideoContext('myVideo')
     console.log()
     // this.setState({
@@ -958,7 +963,7 @@ export default class Index extends Component {
   // }
 
 
-  renderVideo () {
+  renderVideo() {
     const { videoPlayShow } = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
@@ -980,12 +985,12 @@ export default class Index extends Component {
           }}
           id='myVideo'
           controls={true}
-        // autoplay={false}
-        // initialTime='0'
-        // loop={true}
-        // muted={false}
+          // autoplay={false}
+          // initialTime='0'
+          // loop={true}
+          // muted={false}
 
-        show-mute-btn='true'
+          show-mute-btn='true'
         // onPlay={this.onPlay}
         // show-center-play-btn='false'
         // onPause= {this.onPause}
@@ -1007,13 +1012,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,6 +199,8 @@
       line-height: 60px;
       font-weight: bold;
       padding: 0 20px;
+      max-width: 320px;
+      @include text-ellipsis;
     }
 
     &__des {