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

src/pages/card/index.js

@@ -1,15 +1,13 @@
 import Taro, { Component } from '@tarojs/taro'
 import './index.scss'
-
 import Notice from '@components/Notice'
 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 AchievePhone from '@components/achievePhone'
 import { sceneInShare } from '@utils/tools'
-
 import { ROLE_CODE } from '@constants/user'
 import { addCardUv, addCardShareNum, favorCard, cancelFavorCard } from '@services/card'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
@@ -44,7 +42,8 @@ export default class Index extends Component {
 
   componentWillMount() {
     ready.queue(() => {
-
+      // const router = Taro.getStorageSync('router')
+      // const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
       // 分享场景需要先授权手机, 再授权头像
       const options = wx.getLaunchOptionsSync()
       if (sceneInShare(options.scene)) {
@@ -54,6 +53,7 @@ export default class Index extends Component {
           return
         }
 
+
         this.setState({
           grantPhoneVisible: true,
         })
@@ -62,7 +62,6 @@ export default class Index extends Component {
       this.initPageData()
     })
   }
-
   initPageData() {
     const router = Taro.getStorageSync('router')
     const id = this.$router.params.id || router.query.id
@@ -87,6 +86,7 @@ export default class Index extends Component {
     this.handleModalConfirm(tel || phone)
   }
 
+
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
@@ -118,6 +118,7 @@ export default class Index extends Component {
           recordId: res1.recordId
         })
         console.log('个人主页')
+        console.log(this.props, "this.props-=====!!")
       })
     })
   }
@@ -354,12 +355,11 @@ export default class Index extends Component {
       cardInfo: { id, projects = [] },
       userInfo: { person: { phone, tel, personType, avatarurl } }
     } = this.props
-
     if (personType === ROLE_CODE['CONSULTANT']) {
       return
     }
-
     const buildingId = projects[0]
+
     const realPhone = phoneNumber || phone || tel
 
     // TODO:
@@ -370,25 +370,26 @@ export default class Index extends Component {
         buildingId,
         phone: realPhone
       }
+      const { cardInfo, userInfo: { person } } = this.props
+      if (person.personId != cardInfo.id) {
+        reportClient(payload).then(res => {
+          this.hideModal()
+          this.setState({ bound: true })
+          if (res !== 'bound') {
+            Taro.showToast({
+              title: '恭喜您绑定成功'
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+          this.setState({ bound: true })
 
-      reportClient(payload).then(res => {
-        this.hideModal()
-        this.setState({ bound: true })
-
-        if (res !== 'bound') {
           Taro.showToast({
-            title: '恭喜您绑定成功'
+            title: err.message || err,
+            icon: 'none'
           })
-        }
-      }).catch(err => {
-        console.error(err)
-        this.setState({ bound: true })
-
-        Taro.showToast({
-          title: err.message || err,
-          icon: 'none'
         })
-      })
+      }
 
     }
   }
@@ -439,7 +440,6 @@ export default class Index extends Component {
       modalStatus: false
     })
   }
-  
   handleAuthPhoneSuccess = (phone) => {
     const { person = {} } = this.props.userInfo || {}
     if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
@@ -453,18 +453,17 @@ export default class Index extends Component {
   }
 
   handeAuthPhoneFail = () => {
-    Taro.showToast({ 
+    Taro.showToast({
       title: '未授权手机号无法成为报备客户',
       icon: 'none'
-     })
+    })
   }
-
   render() {
     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
-    const { buildingId } = projectDetail
+    const { buildingId, address } = projectDetail
 
     const visitorList = visitors ? visitors.slice(0, 5) : []
     const isSelf = personId === id
@@ -475,11 +474,11 @@ export default class Index extends Component {
     // const visibleConfirmModal = modalStatus && !isReport && !isSelf && (personType === ROLE_CODE['DRIFT'] || personType === ROLE_CODE['CUSTOMER'])
     const visibleConfirmModal = modalStatus && !isReport && !isSelf
     const showAuthPhone = grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone
-
     return (
       <Block>
         {/* 生成海报 */}
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
+
         {
           showAuthPhone &&
           <AchievePhone user={userInfo.person} onCancel={this.handeAuthPhoneFail} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
@@ -592,7 +591,7 @@ export default class Index extends Component {
                   </View>
                   <View className='detailed__add' onClick={this.getLocation}>
                     <View className='detailed__add__txt'>
-                      <Text className='add__txt' space='emsp'>地址　</Text> {cardInfo.address}
+                      <Text className='add__txt' space='emsp'>地址　</Text> {address}
                     </View>
                     <Text className='iconfont icon-daohangdizhi add__img'></Text>
                   </View>

src/pages/card/poster.js

@@ -129,7 +129,7 @@ export default class Index extends Component {
       {
         x: (data.miniAppName || '').length * 30 + 200,
         y: 755,
-        text: '查看主页',
+        text: '查看',
         fontSize: 26,
         color: '#999',
         baseLine: 'middle',

src/pages/checkin/index.js

@@ -5,6 +5,7 @@ import { AtDivider, AtList, AtListItem, AtGrid, AtButton } from 'taro-ui'
 // import achievePhone from '@components/achievePhone'
 import { checkinDetails, checkinActive } from '@services/checkin'
 import { parseQueryString } from '@utils/tools'
+import { NONAME } from 'dns';
 
 export default class checkin extends Component {
 
@@ -16,22 +17,28 @@ export default class checkin extends Component {
 
   componentWillMount () {
     const router = Taro.getStorageSync('router')
-    console.log('router---',router)
-    console.log('props---',this.props)
-    const { id, type } = parseQueryString(router.query.params)
-    console.log('props---',id)
+    console.log('router---', parseQueryString)
+    console.log(router)
+    // const id = router.query.paramsId
+    // const type = router.query.type || ''
+
+    const { id = router.query.paramsId, type = router.query.type || '' } = parseQueryString(router.query.params)
+    console.log(id, 'id-----')
     this.setState({ id, type })
     this.getcheckinDetails(id, type)
+
+
   }
   // dynamicId
   getcheckinDetails (id, type) {
     Taro.showLoading()
 
     checkinDetails(id, type).then(res => {
+      console.log('data:', res)
       Taro.hideLoading()
       this.setState({
         data: res,
-      })      
+      })
     })
   }
 
@@ -43,12 +50,13 @@ export default class checkin extends Component {
 
       // TODO: 需要依据 type 跳转
       Taro.navigateTo({
-        url: '/pages/checkin/checkinsuccess/index?addPoints=' + res.addPoints,      
+        url: '/pages/checkin/checkinsuccess/index?addPoints=' + res.addPoints,
       })
 
     }).catch((err) => {
       Taro.showToast({
-        title: `失败: ${err.message}`
+        title: `失败: ${err.message}`,
+        icon: 'none'
       })
 
       console.error(err)
@@ -64,7 +72,8 @@ export default class checkin extends Component {
 
   render () {
     const { dynamic = {}, enlist = {}, person = {} } = this.state.data || {}
-
+    const {  activityStatus   } =  dynamic  || {}
+    console.log(enlist, 'enlist')
     return (
       <View className="checkin" style="width:100vw;height:100vh;" >
 
@@ -104,16 +113,16 @@ export default class checkin extends Component {
           {/* {console.log(data.person.status)} */}
         </View>}
         {enlist.enlistId == null && <View className="unregistered">
-        {dynamic.activityStatus === 1 && <View style="text-align: center;color:#666666">
-          活动未开始
+          {activityStatus === 1 && <View style="text-align: center;color:#666666">
+            活动未开始
         </View>
           }
-          {dynamic.activityStatus === 2 && <View style="text-align: center;color:#666666">
-          活动已结束
+          {activityStatus === 2 && <View style="text-align: center;color:#666666">
+            活动已结束
         </View>
           }
 
-          {!dynamic.activityStatus && 
+          {!activityStatus &&
             <View>
               <View>
                 <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>
@@ -125,9 +134,9 @@ export default class checkin extends Component {
 
               <AtButton type='primary' className="toactivebutton" onClick={() => { this.toactivity(dynamic.dynamicId) }}>立即前往</AtButton>
             </View>
-          }        
+          }
         </View>
-      }
+        }
       </View>
 
     );

src/pages/project/detail/poster.js

@@ -38,9 +38,44 @@ export default class Index extends Component {
     const { data } = this.props
     const { basicConfig } = this.state
     const texts = [
+      {
+        x: 180,
+        y: 540,
+        text: data.nickname,
+        fontSize: 29,
+        color: '#000',
+        baseLine: 'middle',
+        lineHeight: 48,
+        overFlow:'hidden',
+        width: 240,
+        zIndex: 999
+      },
+      {
+        x: 180,
+        y: 580,
+        text: '邀请您查看详情',
+        fontSize: 29,
+        color: '#888',
+        baseLine: 'middle',
+        lineHeight: 48,
+        // textAlign: 'left',
+        width: 260,
+        zIndex: 999
+      },
+      {
+        x: 480,
+        y: 540,
+        text: dayjs(data.createDate).format('YYYY-MM-DD') || '',
+        fontSize: 25,
+        color: '#888',
+        baseLine: 'middle',
+        lineHeight: 48,
+        width: 200,
+        zIndex: 999
+      },
       {
         x: 30,
-        y: 740,
+        y: 660,
         text: data.buildingName,
         fontSize: 36,
         color: 'black',
@@ -52,10 +87,10 @@ export default class Index extends Component {
         zIndex: 999
       },{
         x: 30,
-        y: 820,
+        y: 746,
         text: data.price ? '约'+data.price+'元/m²' : '待定',
         fontSize: 36,
-        color: 'red',
+        color: '#FF2744',
         baseLine: 'middle',
         lineNum: 2,
         lineHeight: 48,
@@ -65,12 +100,12 @@ export default class Index extends Component {
       },
       {
         x: 30,
-        y: 890,
+        y: 830,
         text: data.posterDescription,
         fontSize: 28,
         color: '#999',
         baseLine: 'middle',
-        lineNum: 1,
+        lineNum: 2,
         lineHeight: 48,
         // textAlign: 'center',
         width: 560,
@@ -103,14 +138,14 @@ export default class Index extends Component {
         y: 1070,
         text: data.miniAppName,
         fontSize: 34,
-        color: 'red',
+        color: '#000',
         baseLine: 'middle',
         lineHeight: 48,
         width: (data.miniAppName || '').length * 30 + 60,
         zIndex: 11
       },
       {
-        x: (data.miniAppName || '').length * 30 + 130,
+        x: (data.miniAppName || '').length * 30 + 120,
         y: 1070,
         text: '项目详情',
         fontSize: 26,
@@ -126,7 +161,7 @@ export default class Index extends Component {
       {
         url: data.poster,
         width: 640,
-        height: 670,
+        height: 512,
         y: 0,
         x: 0
       },
@@ -140,11 +175,11 @@ export default class Index extends Component {
       },
       {
         url: data.avatarurl || require('@assets/default-avatar.png'),
-        width: 130,
-        height: 130,
-        y: 550,
-        x: 20,
-        borderRadius: 130,
+        width: 120,
+        height: 120,
+        y: 452,
+        x: 40,
+        borderRadius: 120,
         zIndex: 999
       }
     ]
@@ -152,9 +187,9 @@ export default class Index extends Component {
     const blocks = [
       {
         x: 0,
-        y: 966,
+        y: 953,
         width: 640,
-        height: 160,
+        height: 186,
         backgroundColor: 'rgba(248,248,248,1)',
         zIndex: 1
       }
@@ -235,11 +270,13 @@ export default class Index extends Component {
       <Block>
         {
           this.state.canvasStatus && (
+            <View style="10rpx 0px 30rpx #dcdcdc">
             <TaroCanvasDrawer
               config={this.state.config}
               onCreateSuccess={this.onCreateSuccess}
               onCreateFail={this.onCreateFail}
             />
+            </View>
           )
         }
         {

src/pages/project/detail/poster.scss

@@ -45,8 +45,10 @@
 
       .result-img {
         height: 60vh;
+        width: 406px;
         display: block;
         margin: 0 auto;
+        box-shadow:10px 0px 30px #dcdcdc;
       }
     }
   }

src/pages/project/floor/index.js

@@ -35,11 +35,11 @@ export default class Index extends Component {
           </View>
           <View className='item'>
             <Text className='txt left-txt'>均价</Text>
-            <Text className='txt right-txt'>{projectDetail.price ? projectDetail.price :'待定'}</Text>
+            <Text className='txt right-txt'>{projectDetail.price ? projectDetail.price : '待定'}</Text>
           </View>
           <View className='item'>
             <Text className='txt left-txt'>销售状态</Text>
-            <Text className='txt right-txt'>{projectDetail.marketStatus ? projectDetail.marketStatus :'待定'}</Text>
+            <Text className='txt right-txt'>{projectDetail.marketStatus ? projectDetail.marketStatus : '待定'}</Text>
           </View>
           <View className='item'>
             <Text className='txt left-txt'>开盘日期</Text>
@@ -83,7 +83,7 @@ export default class Index extends Component {
           </View>
           <View className='item'>
             <Text className='txt left-txt'>项目说明</Text>
-            <Text className='txt right-txt'>{'暂无'}</Text>
+            <Text className='txt right-txt'>{projectDetail.dynamic || '暂无'}</Text>
           </View>
         </View>
       </View >