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

src/components/charts/Line.js

@@ -165,7 +165,7 @@ export default class LineChart extends Component {
     // this.refreshChart(this.props.source)
 
     return (
-      <View style="width:100vw;height:530rpx;position: relative;">
+      <View style="width:100vw;height:500rpx;position: relative;">
         <View className="map-container">
           <ec-canvas ref={this.handleEcComponent} ec={this.state.ec}></ec-canvas>
         </View>

src/components/charts/style.scss

@@ -1,9 +1,10 @@
 .map-container {
-  position: absolute;
-  top: 80px;
-  bottom: 0;
-  left: 0;
-  right: 0;
+  // position: absolute;
+  // top: 80px;
+  // bottom: 0;
+  // left: 0;
+  // right: 0;
+  margin-top: 60px;
   width:100vw;
   height:400px;
   display: flex;

src/pages/activity/detail/assemble.js

@@ -402,8 +402,6 @@ export default class Detail extends Component {
               phone: person.tel || person.phone,
               avatarurl: person.avatarurl,
             }).then(res => {
-              console.log(res,'888888')
-              if(res){
                 this.setState({
                   recordDetail: res.taShareRecord,
                   recordId: res.taShareRecord.recordId,
@@ -411,7 +409,7 @@ export default class Detail extends Component {
                   isStarter: true,
                   groupState: res.taShareRecord.status,
                 }, () => cb && cb())
-              }
+              
             }).catch(err => {
               console.log(err,'11111111111111')
               Taro.showToast({

src/pages/activity/detail/assistance.js

@@ -614,14 +614,6 @@ 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/detail/index.js

@@ -280,19 +280,18 @@ export default class Detail extends Component {
     }
 
     signupActivity(payload).then(res => {
-      if (res) {
-        Taro.showToast({
-          title: '报名成功'
-        })
-        this.setState({
-          isSign: true,
-          canChoose: 'none'
-        })
-      }else{
-        this.setState({
-          canChoose: 'none'
-        })
-      }
+
+      Taro.showToast({
+        title: '报名成功'
+      })
+      this.setState({
+        isSign: true,
+        canChoose: 'none'
+      })
+      setTimeout(() => {
+        this.loadDetail()
+      }, 500)
+
     })
 
     savePoint({
@@ -328,7 +327,7 @@ export default class Detail extends Component {
               </View>
               <ScrollView
                 scrollY
-                className="detail-wrap">
+                className="detail-wrap" style="margin-top:-40rpx">
                 <View className="detail bottom-box">
                   {detail.isEnlist == 0 &&
                     <View className="detail-sign__num">不需要报名</View>
@@ -397,7 +396,7 @@ export default class Detail extends Component {
                     ))))
                 }
                 {detail.activityStatus == 2 &&
-                  <Button disabled='true' className='submit-btn hasSigned' >立即报名</Button>
+                  <Button disabled='true' className='submit-btn hasSigned' >{isSign ? '已报名' : '立即报名'}</Button>
                 }
 
                 {/* {phone ? (

src/pages/activity/detail/index.scss

@@ -90,11 +90,11 @@
 }
 .detail {
   background: white;
-  border-top-left-radius: 28px;
-  border-top-right-radius: 28px;
+  border-radius: 28px 28px 0 0;
   padding: 30px 40px 0 40px;
   position: relative;
   overflow: hidden;
+  
 
   .status__img{
     width: 176px;
@@ -154,21 +154,20 @@
     top: -22px;
     right: -18px;
     width: 200px;
-    height: 88px;
+    height: 74px;
     display: flex;
     justify-content: center;
     align-items: center;
     background: rgba(255, 237, 237, 0.85);
     border-radius: 36px;
     color: #FF5757;
-    font-size: 28px;
-    padding-top: 17px;
+    font-size: 26px;
+    padding-top: 14px;
   }
 
   &-title {
     font-size: $font-size-title-large;
-    line-height: 1.5;
-    margin-bottom: 20px;
+    margin-top: 20px;
   }
 
   &-top {
@@ -180,11 +179,12 @@
 
       .row-label {
         font-size: 32px;
+        color:#999;
       }
 
       .row-content {
         padding-left: 10px;
-        color: $text-color-lighter;
+        color: #333;
       }
     }
   }

src/pages/agent/recommend/index.js

@@ -271,16 +271,14 @@ export default class Index extends Component {
       status: 1
     }
     recommendClient(param).then(res => {
-      if (res) {
-        Taro.showToast({
-          title: '提交成功'
-        })
-        setTimeout(() => {
-          Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
-        }, 700)
-        this.clearInputEvent()
-      }
 
+      Taro.showToast({
+        title: '提交成功'
+      })
+      setTimeout(() => {
+        Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
+      }, 700)
+      this.clearInputEvent()
     })
   }
   // 性别

src/pages/card/index.js

@@ -6,6 +6,7 @@ import Poster from './poster'
 import ProjectItem from '../project/item'
 import BackHomeBtn from '@components/BackHomeBtn'
 import getUserPhone from '@utils/getUserPhone'
+import AchievePhone from '@components/achievePhone'
 import ready from '@utils/ready'
 
 import { ROLE_CODE } from '@constants/user'
@@ -36,33 +37,46 @@ export default class Index extends Component {
     recordId: null,
     isSave: false,
     modalStatus: false,
+    grantPhoneVisible: false, // 授权手机弹框
   }
 
   componentWillMount() {
     ready.queue(() => {
-      const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
-
-      if (router.query.id) {
-        this.setState({
-          cardId: id,
-          modalStatus: true
-        }, this.loadCardDetail)
-      } else {
-        this.setState({
-          cardId: id,
-          modalStatus: false
-        }, this.loadCardDetail)
-      }
-
-      addCardUv(id)
+      this.initPageData()
     })
   }
+  initPageData() {
+    const router = Taro.getStorageSync('router')
+    const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
+
+    if (router.query.id) {
+      this.setState({
+        cardId: id,
+        modalStatus: true
+      }, this.loadCardDetail)
+    } else {
+      this.setState({
+        cardId: id,
+        modalStatus: false
+      }, this.loadCardDetail)
+    }
 
+    addCardUv(id)
+  }
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+  componentDidMount() {
+    const options = wx.getLaunchOptionsSync()
+    const sceneList = [ 1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048]
+
+    if (sceneList.indexOf(options.scene) != -1) {
+      this.setState({
+        grantPhoneVisible: true,
+      })
+    }
+  }
 
   loadCardDetail() {
     const { cardId } = this.state
@@ -389,7 +403,7 @@ export default class Index extends Component {
     })
   }
   render() {
-    const { makePosterStatus, posterData, modalStatus } = this.state
+    const { makePosterStatus, posterData, modalStatus, grantPhoneVisible } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
     const { person: { personType, personId, phone, tel } } = userInfo
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
@@ -407,7 +421,10 @@ export default class Index extends Component {
       <Block>
         {/* 生成海报 */}
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
-
+        {
+          (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
+          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+        }
         {
           visibleConfirmModal && (
             <View className="modal">

src/pages/person/customerAnalysis/analysis.js

@@ -179,9 +179,7 @@ export default class analysis extends Taro.Component {
               </View>
               {
                 chartInfo.length &&
-
                 <LineChart source={chartInfo} />
-
               }
               {
                 !chartInfo.length &&
@@ -192,7 +190,6 @@ export default class analysis extends Taro.Component {
                 </View>
                 </View>
               }
-
               {
                 sexInfo.length &&
                 <View>
@@ -206,7 +203,6 @@ export default class analysis extends Taro.Component {
                   </View>
                 </View>
               }
-
             </View>
           </AtTabsPane>
           <AtTabsPane current={current} index={1}>
@@ -222,9 +218,7 @@ export default class analysis extends Taro.Component {
                 </View>
               </View>
               {chartInfo2.length &&
-
                 <LineChart source={chartInfo2} />
-
               }
               {
                 !chartInfo2.length &&
@@ -235,7 +229,6 @@ export default class analysis extends Taro.Component {
                 </View>
                 </View>
               }
-
               {
                 sexInfo.length &&
                 <View>

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

@@ -41,7 +41,7 @@ export default class Pannel extends Component {
     let currentMarkerPos = undefined
 
     if (props.active !== undefined && props.active != (this.state.currentMarker || {}).id) {
-      for (let i = 0; i < markerList.length; i ++) {
+      for (let i = 0; i < markerList.length; i++) {
         if (markerList[i].id === props.active) {
           activeIndex = i;
           break;
@@ -73,7 +73,7 @@ export default class Pannel extends Component {
     console.log(e)
   }
 
-  render () {  
+  render() {
     const { manualData = [] } = this.props.dataset || {}
     const activeKey = this.props.active
 
@@ -87,7 +87,7 @@ export default class Pannel extends Component {
               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>

src/pages/project/detail/index.js

@@ -7,6 +7,7 @@ import Poster from './poster'
 import PoiAround from '@components/amap/PoiAround'
 import Around from './Around'
 import BackHomeBtn from '@components/BackHomeBtn'
+import AchievePhone from '@components/achievePhone'
 import {
   addItemUv,
   addItemShareNum,
@@ -57,39 +58,14 @@ export default class Index extends Component {
     btnstate: 1,// 1显示视频 0显示图片
     albumCurrent: 0,
     videoPlayShow: 'flex',
+    grantPhoneVisible: false, // 授权手机弹框
   }
 
   componentWillMount() {
     // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
 
     ready.queue(() => {
-      const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id
-      // const id='82b54f4a1f5b981df572253792afbfa1' 
-      this.setState({
-        buildingId: id
-      }, () => {
-        this.loadDetail()
-        this.loadNewsData()
-        this.loadActivityData()
-        this.loadHelpGroupList()
-
-        addItemUv(id)
-        // 埋点
-        savePoint({
-          event: 'detail',
-          eventType: 'building',
-          propertyName: '项目详情',
-          targetId: id,
-          buildingId: id,
-          data: '{}'
-        }).then(res => {
-          this.setState({
-            recordId: res.recordId
-          })
-          console.log('项目详情')
-        })
-      })
+      this.initPageData()
     })
   }
 
@@ -97,10 +73,44 @@ export default class Index extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+  initPageData() {
+    const router = Taro.getStorageSync('router')
+    const id = this.$router.params.id || router.query.id
+    // const id='82b54f4a1f5b981df572253792afbfa1' 
+    this.setState({
+      buildingId: id
+    }, () => {
+      this.loadDetail()
+      this.loadNewsData()
+      this.loadActivityData()
+      this.loadHelpGroupList()
+
+      addItemUv(id)
+      // 埋点
+      savePoint({
+        event: 'detail',
+        eventType: 'building',
+        propertyName: '项目详情',
+        targetId: id,
+        buildingId: id,
+        data: '{}'
+      }).then(res => {
+        this.setState({
+          recordId: res.recordId
+        })
+        console.log('项目详情')
+      })
+    })
+  }
   componentDidMount() {
     const options = wx.getLaunchOptionsSync()
-    console.log(options, "-------------options---------")
-    // if()
+    const sceneList = [1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048]
+
+    if (sceneList.indexOf(options.scene) != -1) {
+      this.setState({
+        grantPhoneVisible: true,
+      })
+    }
   }
 
   loadHelpGroupList() {
@@ -792,7 +802,7 @@ export default class Index extends Component {
     )
   }
 
-  renderHouseTypeList () {
+  renderHouseTypeList() {
     const { statusOpts, statusBgColors } = this.state
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'apart')
@@ -1025,14 +1035,18 @@ export default class Index extends Component {
   }
 
   render() {
-    const { posterStatus, posterData, loaded, btnstate } = this.state
-    const { projectDetail } = this.props
+    const { posterStatus, posterData, loaded, btnstate, grantPhoneVisible } = this.state
+    const { projectDetail, userInfo } = this.props
     const { uvList = {} } = projectDetail
     const { total = 0, records = [] } = uvList
     const openDate = projectDetail.openingDate ? dayjs(projectDetail.openingDate).locale('zh-cn').format('YYYY年M月D日') : '暂无'
 
     return (
       <Block>
+        {
+          (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
+          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+        }
         {
           loaded && (
             <View className='detail'>