Merge branch 'v3.5.1' into dev

# Conflicts:
#	src/pages/person/customerAnalysis/index.js
#	src/pages/project/index.js

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/app.js

@@ -102,7 +102,7 @@ class App extends Component {
 
       'pages/checkin/index',
       'pages/checkin/checkinsuccess/index',
-      // 'pages/checkin/unregistered/index',
+     
 
     ],
     window: {
@@ -225,7 +225,7 @@ class App extends Component {
     return new Promise(resolve => {
       const router = this.$router.params
       let { query: { scene: paramsId } } = router
-
+console.log(paramsId,'paramsId---')
       if (paramsId) {
         // 扫码进入
         getCodeScene(paramsId).then(res => {
@@ -255,6 +255,7 @@ class App extends Component {
 
         resolve(router)
       }
+      
     })
   }
   // 在 App 类中的 render() 函数没有实际作用

src/components/TimeTicker/index.jsx

@@ -0,0 +1,105 @@
+import Taro from '@tarojs/taro'
+import dayjs from 'dayjs'
+
+// 未开始
+const STATUS_READY = -1
+
+// 进行中
+const STATUS_PROCESSING = 0
+
+// 已结束
+const STATUS_OVER = 1
+
+export default class TimeTicker extends Taro.Component {
+
+  state = {
+    status: STATUS_READY,
+    tmStart: undefined,
+    tmEnd: undefined,
+    preText: undefined,
+    tkText: undefined,
+  }
+
+  timer = null
+
+  componentWillMount() {
+
+
+  }
+
+  computeProps(props) {
+    const { timeRange } = props || {}
+    const now = dayjs().valueOf()
+    const [t1, t2] = timeRange || []
+    
+    // 当前状态 -  默认未开始
+    let status = this.state.status
+    let tmStart = undefined
+    let tmEnd = undefined
+
+    // 没有设置起止时间
+    if (!t1 && !t2) {
+      throw new Error('TimeTicker has no timeRange setting')
+    }
+
+    if (!t1 || !t2) {
+      // 只设置了一个时间
+      targetTime = t1 ? dayjs(t1).valueOf() : dayjs(t2).valueOf()
+
+      if (now > targetTime) {
+        status = STATUS_OVER
+      } else if (now === targetTime) {
+        status = STATUS_PROCESSING
+      } else {
+        status = STATUS_READY
+      }
+    } else {
+      // 设置了时间区间
+      const dtStart = dayjs(t1).valueOf()
+      const dtEnd = dayjs(t2).valueOf()
+
+      if (dtStart > now) {
+        status = STATUS_READY
+        targetTime = dtStart
+      } else if (dtStart <= now && now < dtEnd) {
+        status = STATUS_PROCESSING
+        targetTime = dtEnd
+      } else {
+        status = STATUS_OVER
+        targetTime = dtEnd
+      }
+    }
+
+    this.setState({ status, targetTime }, this.startTimer.bind(this))
+  }
+
+  startTimer = (props) => {
+    const {
+      status,
+      targetTime,
+      interval = 1000,
+      onStart,
+      onProcess,
+      onEnd,
+    } = props || {}
+
+    if (this.timer) {
+      clearInterval(this.timer)
+    }
+
+    this.timer = setInterval(() => {
+      const now = dayjs().valueOf()
+      const diff = targetTime - now
+
+
+
+    }, interval)
+
+  }
+
+  render() {
+    
+
+
+  }
+}

src/components/achieveAvatar/index.js

@@ -38,7 +38,9 @@ export default class Index extends Component {
           this.props.onSuccess();
         })
       },
-      fail: () => {
+      fail: (err) => {
+        console.error(err)
+
         Taro.showToast({
           title: '获取用户信息失败',
           icon: 'none'
@@ -82,6 +84,7 @@ export default class Index extends Component {
   }
   render() {
     const { user = {} } = this.props
+    console.log('---------renderMaskBanner--------')
 
     return (
       <Block>

src/components/amap/PoiAround.js

@@ -2,9 +2,32 @@ import Taro, { Component } from '@tarojs/taro'
 import { Map } from '@tarojs/components'
 import icons from './icons'
 
+const centerIcon = require('@assets/dingwei.png')
+const centerProject = 'project-999'
+
+function ObjEqual (a = {}, b = {}) { return JSON.stringify(a) === JSON.stringify(b) }
+
 export default class PoiAround extends Component {
+  map = null;
+
+  componentDidMount () {
+    this.map = wx.createMapContext('poi-around', this)
+  }
+
+  componentWillReceiveProps (nextProps) {
+    if (this.map) {
+      if (!ObjEqual(nextProps.markers, this.props.markers)) {
+        this.map.moveToLocation({
+          latitude: nextProps.latitude,
+          longitude: nextProps.longitude,
+        })
+      }
+    }
+  }
 
   handleTap = (e) => {
+    if (e.markerId === centerProject) return;
+
     const marker = this.props.markers.filter(x => x.id === e.markerId)[0]
     this.props.onMarkerClick && this.props.onMarkerClick(marker)
   }
@@ -24,9 +47,21 @@ export default class PoiAround extends Component {
       }
     })
 
+    // 最后放项目位置
+    markers.push({
+      id: centerProject,
+      latitude: this.props.latitude,
+      longitude: this.props.longitude,
+      iconPath: centerIcon,
+      width: 20,
+      height: 20,
+    })
+
     return this.props.longitude && (
       <Map
+        id="poi-around"
         showLocation
+        show-location={true}
         scale={12}
         markers={markers}
         longitude={this.props.longitude}

src/pages/activity/assembleItem/index.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import dayjs from 'dayjs'
+import { transferImage } from '@utils/tools'
 
 const groupSuccess = require('@assets/helpgroup/group/already.png')
 const groupFail = require('@assets/helpgroup/fail.png')
@@ -70,7 +71,7 @@ export default class Item extends Component {
     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <Image className="pic" mode="aspectFill" src={data.mainImg} ></Image>
+        <Image className="pic" mode="aspectFill" src={transferImage(data.mainImg)} ></Image>
         <View className="title">{data.activityName}</View>
         {(!data.verificationCode && data.status == 1) &&
           <View className="time">参与截止时间: 

src/pages/activity/assistanceItem/index.js

@@ -1,6 +1,8 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import dayjs from 'dayjs'
+import { transferImage } from '@utils/tools'
+
 const helpSuccess = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success1.png'
 const helpFail = require('@assets/helpgroup/fail.png')
 
@@ -69,7 +71,7 @@ export default class Item extends Component {
     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <Image className="pic" mode="aspectFill" src={data.img} ></Image>
+        <Image className="pic" mode="aspectFill" src={transferImage(data.img)} ></Image>
         <View className="title">{data.title}</View>
         {(!data.verification && data.status == 1) &&
           <View className="time">参与截止时间:

src/pages/activity/detail/assemble.js

@@ -10,7 +10,7 @@ import dayjs from 'dayjs'
 // import WxParse from '@components/wxParse/wxParse'
 // import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
-import { getDownloadURL, times, formateLeftTime, getCanvasConfig, getThumbnail } from '@utils/tools'
+import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
 import {
   getGroupDetail,
   createGroupActivity,
@@ -73,10 +73,9 @@ export default class Detail extends Component {
     ready.queue(() => {
       // 必须授权电话
       if (this.toggleGrantPhone()) {
-        if (this.toggleGrantAvatar()) {
-          this.initPageData()
-        }
+        this.toggleGrantAvatar()
       }
+      this.initPageData()
     })
   }
 
@@ -142,10 +141,12 @@ export default class Detail extends Component {
   // 调起授权头像
   toggleGrantAvatar = () => {
     const { userInfo: { person: { avatarurl } } } = this.props
-    if (!avatarurl) {
+
+    if (!avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1) {
       this.setState({ grantAvatarVisible: true })
       return false
     }
+
     console.log(avatarurl,"avatarurl")
     console.log(this.props.userInfo,"this.props")
     return true
@@ -534,7 +535,7 @@ export default class Detail extends Component {
         }
         {
           grantAvatarVisible &&
-          <AchieveAvatar user={userInfo.person} onSuccess={this.initPageData} ></AchieveAvatar>
+          <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
         <BackHomeBtn></BackHomeBtn>
         {
@@ -542,7 +543,7 @@ export default class Detail extends Component {
             <View className="ass-page">
               <Notice></Notice>
               <View className="detail-banner">
-                <Image mode="widthFix" src={getThumbnail(detail.mainImg)} className="detail-banner__img"></Image>
+                <Image mode="widthFix" src={transferImage(detail.mainImg)} className="detail-banner__img"></Image>
 
                 <View className="rest-time">
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
@@ -569,7 +570,7 @@ export default class Detail extends Component {
                     groupState === GroupSuccess &&
                     (
                       <Block>
-                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={getThumbnail(successImg)}></Image>
+                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={transferImage(successImg)}></Image>
                         {
                           verificationCode && <View className="hexiaoma" style="margin:0 auto 40rpx auto">核销码: {verificationCode}</View>
                         }
@@ -581,7 +582,7 @@ export default class Detail extends Component {
                     groupState === GroupFailure &&
                     (
                       <View>
-                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={getThumbnail(failImg)}></Image>
+                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={transferImage(failImg)}></Image>
                         <View className="fail-text" style="margin:0 auto 40rpx auto">活动已超时,拼团失败!</View>
                       </View>
                     )
@@ -627,7 +628,7 @@ export default class Detail extends Component {
 
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
                 <View style="padding:0 40rpx 180rpx 40rpx">
-                  <Image src={getThumbnail(detail.descImg)} mode="widthFix" style="width:100%;"></Image>
+                  <Image src={transferImage(detail.descImg)} mode="widthFix" style="width:100%;"></Image>
                 </View>
                 {(actState === ActBeforeStart || (isStarter && actState === ActInProcess && groupState === GroupInProcess) || (!isStarter && actState === ActInProcess && groupState != GroupInProcess) || (!isStarter && actState === ActInProcess && groupState === GroupInProcess)) &&
                   <View className="btn-fixed">

src/pages/activity/detail/assistance.js

@@ -10,7 +10,7 @@ import dayjs from 'dayjs'
 // import WxParse from '@components/wxParse/wxParse'
 // import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
-import { getDownloadURL, times, formateLeftTime, getCanvasConfig, getThumbnail } from '@utils/tools'
+import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
 import {
   getHelpDetail,
   createHelpActivity,
@@ -72,10 +72,10 @@ export default class Detail extends Component {
     ready.queue(() => {
       // 必须授权电话
       if (this.toggleGrantPhone()) {
-        if (this.toggleGrantAvatar()) {
-          this.initPageData()
-        }
+        this.toggleGrantAvatar()
       }
+      
+      this.initPageData()
     })
   }
 
@@ -127,6 +127,7 @@ export default class Detail extends Component {
   // 调起授权电话
   toggleGrantPhone = () => {
     const { userInfo: { person: { phone, tel } } } = this.props
+    
     if (!phone && !tel) {
       this.setState({ grantPhoneVisible: true })
       return false
@@ -140,12 +141,13 @@ export default class Detail extends Component {
   // 调起授权头像
   toggleGrantAvatar = () => {
     const { userInfo: { person: { avatarurl } } } = this.props
-    if (!avatarurl) {
+
+    if (!avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1) {
+      console.log(this.props.userInfo,"this.props")
       this.setState({ grantAvatarVisible: true })
       return false
     }
     console.log(avatarurl,"avatarurl")
-    console.log(this.props.userInfo,"this.props")
     return true
   }
 
@@ -518,7 +520,7 @@ export default class Detail extends Component {
         }
         {
           grantAvatarVisible &&
-          <AchieveAvatar user={userInfo.person} onSuccess={this.initPageData} ></AchieveAvatar>
+          <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
         <BackHomeBtn></BackHomeBtn>
         {
@@ -526,7 +528,7 @@ export default class Detail extends Component {
             <View className="ass-page">
               <Notice></Notice>
               <View className="detail-banner">
-                <Image mode="aspectFill" src={getThumbnail(detail.img)} className="detail-banner__img"></Image>
+                <Image mode="aspectFill" src={transferImage(detail.img)} className="detail-banner__img"></Image>
 
                 <View className="rest-time">
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
@@ -627,7 +629,7 @@ export default class Detail extends Component {
                 </View>
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
                 <View style="padding:0 40rpx">
-                  <Image src={getThumbnail(detail.activityInstructions)} mode="widthFix" style="width:100%;margin-bottom:20px;"></Image>
+                  <Image src={transferImage(detail.activityInstructions)} mode="widthFix" style="width:100%;margin-bottom:20px;"></Image>
                 </View>
 
               </ScrollView>

src/pages/activity/detail/index.js

@@ -7,7 +7,7 @@ import dayjs from 'dayjs'
 import WxParse from '@components/wxParse/wxParse'
 import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
-import { getDownloadURL, times, getThumbnail } from '@utils/tools'
+import { getDownloadURL, times, transferImage } from '@utils/tools'
 import {
   addActivityShareNum,
   signupActivity,
@@ -324,7 +324,7 @@ export default class Detail extends Component {
             <View>
               <Notice></Notice>
               <View className="detail-banner">
-                <Image mode="aspectFill" src={getThumbnail(detail.imgUrl)} className="detail-banner__img"></Image>
+                <Image mode="aspectFill" src={transferImage(detail.imgUrl)} className="detail-banner__img"></Image>
               </View>
               <ScrollView
                 scrollY

src/pages/activity/item/index.js

@@ -1,7 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import dayjs from 'dayjs'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 
 export default class Item extends Component {
   static defaultProps = {
@@ -17,7 +17,7 @@ export default class Item extends Component {
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
         {console.log(data,'----data-----')}
-         <Image className="pic" mode="aspectFill" src={getThumbnail(data.mainImg ||data.listImgUrl|| data.imgUrl)}></Image>
+         <Image className="pic" mode="aspectFill" src={transferImage(data.mainImg ||data.listImgUrl|| data.imgUrl)}></Image>
         <View className="box">
           <View className="title">{data.title}</View>
           {

src/pages/agent/recommend/index.js

@@ -66,12 +66,12 @@ export default class Index extends Component {
     const { type } = this.$router.params
 
     this.setState({
-      reType: type,
+      reType: type || "",
 
     }, () => {
       console.log(this.state.sex, "sex")
       console.log('buildingName' + this.props.proList.records[0].buildingName)
-      if (this.state.reType != 'index') {
+      if (this.state.reType == 'projectDeatil') {
         this.setState({
           intention: this.props.projectDetail.buildingName ? this.props.projectDetail.buildingName : this.props.proList.records[0].buildingName,
           floor: this.props.projectDetail.buildingId ? this.props.projectDetail.buildingId : this.props.proList.records[0].buildingId
@@ -422,7 +422,7 @@ export default class Index extends Component {
 
   renderDetail() {
     const { reType, name, phone, floorArray, floorID, floorColor, intention, adviserArray, adviserID, adviserColor, remarks, radioList } = this.state
- 
+
     return (
       <View className='recommend__customers'>
         <View className='submit__infor ani'>
@@ -451,7 +451,7 @@ export default class Index extends Component {
           <View className='info info__4'>
             <Text className='customers__txt'>意向楼盘</Text>
             {
-              reType == 'index' ? (<Picker className='input customers__name' onChange={this.bindFloorChange} value={floorID} range={floorArray} range-key="buildingName">
+              reType != 'projectDeatil' ? (<Picker className='input customers__name' onChange={this.bindFloorChange} value={floorID} range={floorArray} range-key="buildingName">
                 <View class="picker overtext" style={floorColor}>
                   {floorArray[floorID].buildingName}
                 </View>

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-=====!!")
       })
     })
   }
@@ -142,12 +143,16 @@ export default class Index extends Component {
   }
 
   getLocation = () => {
-    const { cardInfo: { address, company } } = this.props
+    const { cardInfo: { address, company,coordinate } } = this.props
+    const coord = coordinate.split(',')
+    const latitude = parseFloat(coord[0])
+    const longitude = parseFloat(coord[1])
+    
     Taro.getLocation({ //返回可以用于Taro.openLocation的经纬度，官方提示bug: iOS 6.3.30 type 参数不生效，只会返回 wgs84 类型的坐标信息  
       success: function (res) {
         Taro.openLocation({
-          latitude: 31.979190,
-          longitude: 118.733660,
+          latitude,
+          longitude,
           name: company,
           address
         })
@@ -354,12 +359,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 +374,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 +444,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 +457,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 +478,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 +595,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

@@ -94,7 +94,7 @@ export default class Index extends Component {
         zIndex: 999
       },
       {
-        x: 100,
+        x: 80,
         y: 710,
         text: '长按识别小程序码',
         fontSize: 26,
@@ -105,7 +105,7 @@ export default class Index extends Component {
         zIndex: 100
       },
       {
-        x: 100,
+        x: 80,
         y: 755,
         text: '进入',
         fontSize: 26,
@@ -116,20 +116,20 @@ export default class Index extends Component {
         zIndex: 100
       },
       {
-        x: 170,
+        x: 140,
         y: 755,
         text: data.miniAppName,
         fontSize: 34,
         color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
-        width: (data.miniAppName || '').length * 30 + 60,
+        width: (data.miniAppName || '').length * 30 + 50,
         zIndex: 100
       },
       {
-        x: (data.miniAppName || '').length * 30 + 200,
+        x: (data.miniAppName || '').length * 30 + 156,
         y: 755,
-        text: '查看主页',
+        text: '查看',
         fontSize: 26,
         color: '#999',
         baseLine: 'middle',
@@ -160,9 +160,9 @@ export default class Index extends Component {
         borderRadius: 40,
       },
       {
-        width: 520,
+        width: 540,
         height: 160,
-        x: 60,
+        x: 50,
         y: 650,
         backgroundColor: '#F8F8F8',
         borderRadius: 10,

src/pages/checkin/checkinsuccess/index.js

@@ -1,6 +1,6 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
-import {getThumbnail } from '@utils/tools'
+import {transferImage } from '@utils/tools'
 
 
 
@@ -36,7 +36,7 @@ export default class checkinsuccess extends Component {
     return (
       <View className="checkin" style="width:100vw;height:100vh;background:rgba(245,245,245,1);" >
         <View style="text-align: center;">
-          <Image className="img" src={getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/checkin/checkinsuccessfully.png')}  ></Image>
+          <Image className="img" src={transferImage('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/checkin/checkinsuccessfully.png')}  ></Image>
         </View>
         <View>
           {this.state.addPoints && (<Text className="text1" style="">+{this.state.addPoints}积分</Text>)}

src/pages/checkin/index.js

@@ -4,8 +4,13 @@ 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 {
+  getCodeScene,
 
+} from '@services/common'
+import { parseQueryString, getQueryString } from '@utils/tools'
+import { NONAME } from 'dns';
+import ready from '@utils/ready'
 export default class checkin extends Component {
 
   state = {
@@ -15,23 +20,58 @@ 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)
-    this.setState({ id, type })
-    this.getcheckinDetails(id, type)
+    ready.queue(() => {
+      const router = Taro.getStorageSync('router')
+
+      const { id = router.query.id, type = router.query.type || '' } = parseQueryString(router.query.params)
+      console.log(id, 'id-----')
+      this.setState({ id, type })
+      this.getcheckinDetails(id, type)
+
+      // const routers = wx.getLaunchOptionsSync()
+
+      // const { query: { scene } } = routers
+      // console.log(routers, 'routers-----')
+
+
+      // console.log(scene, 'query-----')
+      // getCodeScene(scene).then(res => {
+
+      //   let params = JSON.parse(res).scene
+
+      //   let id = getQueryString(params, 'id')
+      //   let type = getQueryString(params, 'type')
+
+      //   this.setState({ id, type })
+      //   this.getcheckinDetails(id, type)
+      // })
+
+    })
+
+
+
+  }
+  // const router = Taro.getStorageSync('router')
+
+
+
+  // const { id = router.query.id , type = router.query.type || '' } = parseQueryString(router.query.params)
+  // console.log(id, 'id-----')
+  // this.setState({ id, type })
+  componentDidShow () {
+    const { id, type } = this.state
+    // 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 +83,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 +105,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 +146,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===0 &&
             <View>
               <View>
                 <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>
@@ -125,9 +167,9 @@ export default class checkin extends Component {
 
               <AtButton type='primary' className="toactivebutton" onClick={() => { this.toactivity(dynamic.dynamicId) }}>立即前往</AtButton>
             </View>
-          }        
+          }
         </View>
-      }
+        }
       </View>
 
     );

src/pages/im/index.js

@@ -78,7 +78,7 @@ export default class Chat extends Component {
       const { sendId, sendName, receiverId, receiverName } = this.$router.params
       const me = this.props.userInfo.person
       const { personId: mineId } = me
-            
+
       // 系统异常
       if (!sendId || !receiverId) {
         Taro.showToast({
@@ -134,11 +134,11 @@ export default class Chat extends Component {
         this.setState({ chatting, me }, () => {
           this.loadList(res => {
             this.toBottom()
-  
+
             const { records } = res
             const newMsg = records[0]
             const isCardMsg = newMsg && newMsg.messageType === MESSAGETYPE.CARD
-  
+
             // 如果最新一条消息不是卡片类型 则自动发送卡片信息
             if (!isCardMsg) {
               setTimeout(() => {
@@ -149,7 +149,7 @@ export default class Chat extends Component {
         });
       })
 
-      socket.wss.onMessage(res => {    
+      socket.wss.onMessage(res => {
         const data = JSON.parse(res.data)
 
         console.log('receive message ==>', data)
@@ -369,7 +369,7 @@ export default class Chat extends Component {
       console.log('发送成功')
       this.appendData(payload)
     })
- 
+
     this.setState({
       inputText: '',
       // msgList: list
@@ -504,7 +504,7 @@ export default class Chat extends Component {
           <Text className="text">常见问题</Text>
         </View>
 
-        <BackHomeBtn style={{ right: '3%' }}></BackHomeBtn>
+        <BackHomeBtn style={{ right: '3%', bottom: '20%' }}></BackHomeBtn>
         {
           visiblePrompt && (
             <View className="prompt" onClick={this.togglePromptVisible.bind(this, false)}>

src/pages/news/detail/index.js

@@ -7,7 +7,7 @@ import WxParse from '@components/wxParse/wxParse'
 import BackHomeBtn from '@components/BackHomeBtn'
 import Notice from '@components/Notice'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
-import { getDownloadURL, getThumbnail } from '@utils/tools'
+import { getDownloadURL, transferImage } from '@utils/tools'
 import {
   addNewsUv,
   favorNews,
@@ -222,7 +222,7 @@ export default class NewsDetail extends Component {
 
                   <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
                 </View>
-                {/* <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={getThumbnail(detail.newsImg)}></Image> */}
+                {/* <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={transferImage(detail.newsImg)}></Image> */}
                 <View className="detail-con">
                   <import src='../../../components/wxParse/wxParse.wxml' />
                   <template is='wxParse' data='{{wxParseData:article.nodes}}' />

src/pages/news/item.js

@@ -1,7 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import dayjs from 'dayjs'
 import './item.scss'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 
 export default class NewsItem extends Component {
   static defaultProps = {
@@ -14,7 +14,7 @@ export default class NewsItem extends Component {
     const { data } = this.props
     return (
       <View className="item" key={data.newsId} onClick={this.handleClick}>
-        <Image className="item-img"  src={getThumbnail(data.newsImg)}></Image>
+        <Image className="item-img"  src={transferImage(data.newsImg)}></Image>
         <View className="item-con">
           <View className="item-con__title">{data.newsName}</View>
           <View className="item-con__date">于{dayjs(data.createDate).format('YYYY-MM-DD  HH:mm:ss')}发布</View>

src/pages/news/item.scss

@@ -14,7 +14,7 @@
   }
 
   &-con {
-    width:450px;
+    width:430px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;

src/pages/person/customerAnalysis/followUpCustomer/index.js

@@ -6,6 +6,8 @@ import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 import { View, Text, Picker } from '@tarojs/components';
 import { queryCustomerList, addFollowRecord } from '@services/person'
+import { transferImage } from '@utils/tools'
+
 const maleImg = require('@assets/person/male.png')
 const femaleImg = require('@assets/person/female.png')
 const phoneImg = require('@assets/person/phone.png')
@@ -279,7 +281,7 @@ export default class transactionCustomer extends Taro.Component {
                 customerList.length &&
                 customerList.map((item, index) => (
                   <View class="item" key={index + 'customerList'} onClick={this.toMyCustomer.bind(this, item.customerId)}>
-                    <Image src={item.picture || require('@assets/default-avatar.png')} className='img'></Image>
+                    <Image src={transferImage(item.picture) || require('@assets/default-avatar.png')} className='img'></Image>
                     <View className="name">
                       {item.name}
                       {

src/pages/person/customerAnalysis/index.js

@@ -59,11 +59,11 @@ export default class customer extends Taro.Component {
   }
 
   render() {
-    const tabList = [{ title: '我的客户' }, { title: '客户分析' }]
+    const tabList = [{ title: '我的客户' },{ title: '客户分析' }]
     const { customerNum, current } = this.state
     return (
-      <AtTabs className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
-        <AtTabsPane current={current} index={0}>
+      <AtTabs  className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
+         <AtTabsPane current={current} index={0}>
           <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>
@@ -84,7 +84,7 @@ export default class customer extends Taro.Component {
             }
           </View>
         </AtTabsPane>
-
+       
       </AtTabs>
     )
   }

src/pages/person/customerAnalysis/item/index.js

@@ -1,7 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import dayjs from 'dayjs'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 
 export default class Item extends Component {
   static defaultProps = {
@@ -20,7 +20,7 @@ export default class Item extends Component {
           <View className={data.type == 'help' ? 'type' : 'type2'}>{data.type == 'help' ? '助力' : '拼团'}</View>
         }
 
-        <Image className="pic" mode="aspectFill" src={getThumbnail(data.mainImg || data.imgUrl)}></Image>
+        <Image className="pic" mode="aspectFill" src={transferImage(data.mainImg || data.imgUrl)}></Image>
 
         <View className="box">
 

src/pages/person/customerAnalysis/myCustomer.js

@@ -8,7 +8,7 @@ import { connect } from '@tarojs/redux'
 import './index.scss'
 import ActivityItem from './item'
 import dayjs from 'dayjs'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 import emptyImg from '@assets/empty.png'
 const maleImg = require('@assets/person/male.png')
 const femaleImg = require('@assets/person/female.png')
@@ -451,8 +451,8 @@ export default class myCustomer extends Taro.Component {
         {followVisible && this.renderFollowBox()}
         {baseVisible && this.renderBaseBox()}
         <View className="user_con" style=" margin: 0 20rpx 40rpx 20rpx; height:256rpx;box-shadow:0rpx 4rpx 12rpx 0rpx rgba(0,0,0,0.12); border-radius:12rpx;">
-          <Image className="bg" src={getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
-          <Image className="user__left__headimg" src={customerDetail.picture || require('@assets/default-avatar.png')} />
+          <Image className="bg" src={transferImage('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
+          <Image className="user__left__headimg" src={transferImage(customerDetail.picture) || require('@assets/default-avatar.png')} />
           <View className='user__left__name'>
             <View className="text">{customerDetail.name}</View>
             {

src/pages/person/customerAnalysis/transactionCustomer/index.js

@@ -5,6 +5,8 @@ import './index.scss'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 import { queryCustomerList, addFollowRecord } from '@services/person'
+import { transferImage } from '@utils/tools'
+
 const maleImg = require('@assets/person/male.png')
 const femaleImg = require('@assets/person/female.png')
 const phoneImg = require('@assets/person/phone.png')
@@ -115,7 +117,7 @@ export default class transactionCustomer extends Taro.Component {
               customerList.length &&
               customerList.map((item, index) => (
                 <View class="item" key={index + 'transaction'} onClick={this.toMyCustomer.bind(this, item.customerId)}>
-                  <Image src={item.picture || require('@assets/default-avatar.png')} className='img'></Image>
+                  <Image src={transferImage(item.picture) || require('@assets/default-avatar.png')} className='img'></Image>
                   <View className="name">
                     {item.name}
                     {

src/pages/person/favorite/index.js

@@ -5,6 +5,7 @@ import { getItemList } from '@services/item'
 import { getCardList } from '@services/card'
 import { queryNewsList } from '@services/news'
 import { buildingDynamiceList } from '@services/activity'
+import { transferImage } from '@utils/tools'
 import ProjectItem from '../../project/item'
 import NewsItem from '../../news/item'
 
@@ -126,7 +127,7 @@ export default class Index extends Component {
         {cardList.map(item => (
           <View className="card-item" key={item.id} onClick={this.navigateTo.bind(this, '/pages/card/index?id=' + item.id)}>
             <View className="flex">
-              <Image className="avatar" mode="aspectFill" src={item.avatar || item.photo}></Image>
+              <Image className="avatar" mode="aspectFill" src={transferImage(item.avatar || item.photo)}></Image>
               <Text className="name">{item.name}</Text>
             </View>
             <View className="flex item-btn__box">

src/pages/person/index.js

@@ -8,7 +8,7 @@ import Notice from '@components/Notice'
 import { getCodeMessage, putRegisterConsultant } from '@services/getCode'
 import * as actions from '@actions/user'
 import Authorize from '@components/authorize'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 import { menus } from './menus'
 
 @connect(({ user, city }) => ({ user, city }), { ...actions })
@@ -169,7 +169,7 @@ export default class Person extends Component {
       <View className="person">
         <Notice></Notice>
         <View className="info">
-          <Image className="bg" src={getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/mine/background.png')} mode='aspectFill'></Image>
+          <Image className="bg" src={transferImage('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/mine/background.png')} mode='aspectFill'></Image>
           <View className="content">
             <View className="info-block">
               <View className="avatar" onClick={this.goPersonDetail}>

src/pages/person/profile/detail/index.js

@@ -6,6 +6,7 @@ import dayjs from 'dayjs'
 import { getProfileDetail, editDocumentVerify } from '@services/user'
 
 import { uploadFiles } from '@utils/request'
+import { transferImage } from '@utils/tools'
 
 import "taro-ui/dist/style/components/image-picker.scss";
 import "taro-ui/dist/style/components/icon.scss";
@@ -175,7 +176,7 @@ export default class Profile extends Component {
                     return (
                       <View className="image-con" key={`img-${inx}`}>
                         <Image className="close-btn" src={closeImg} onClick={this.deleteImg.bind(this, (inx))} />
-                        <Image className="img" src={item.img} onClick={this.onPreview.bind(this, (item))} />
+                        <Image className="img" src={transferImage(item.img)} onClick={this.onPreview.bind(this, (item))} />
                       </View>
                     )
                   })
@@ -201,7 +202,7 @@ export default class Profile extends Component {
                   imgList.map((item, inx) => {
                     return (
                       <View className="image-con" key={`img-${inx}`}>
-                        <Image className="img" src={item.img} onClick={this.onPreview.bind(this, (item))} />
+                        <Image className="img" src={transferImage(item.img)} onClick={this.onPreview.bind(this, (item))} />
                       </View>
                     )
                   })

src/pages/person/profile/index.js

@@ -3,6 +3,7 @@ import './index.scss'
 import dayjs from 'dayjs'
 import { getDocumentVerify, commitDocumentVerify, getVerifyList } from '@services/user'
 import { uploadFiles } from '@utils/request'
+import { transferImage } from '@utils/tools'
 
 const profileBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/profile.png'
 const add = require('@assets/add.png')
@@ -234,7 +235,7 @@ export default class Profile extends Component {
                         return (
                           <View className="image-con" key={`img-${inx}`}>
                             <Image className="close-btn" src={closeImg} onClick={this.deleteImg.bind(this, (inx))} />
-                            <Image className="img" onClick={this.onPreview.bind(this, (item))} src={item.img} />
+                            <Image className="img" onClick={this.onPreview.bind(this, (item))} src={transferImage(item.img)} />
                           </View>
                         )
                       })

src/pages/policy/detail/index.js

@@ -9,6 +9,7 @@ import {
   queryPolicyDetail,
 } from '@services/policy'
 import { connect } from '@tarojs/redux'
+import { transferImage } from '@utils/tools'
 
 @connect(state => state.user)
 export default class PolicyDetail extends Component {
@@ -85,7 +86,7 @@ export default class PolicyDetail extends Component {
                     <View><Text className="iconfont icon-eye"></Text>{detail.pvNum || 0}</View>
                     {/* <View><Text className="iconfont icon-fenxiang1"></Text>{detail.shareNum || 0}</View> */}
                   </View>
-                  <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={detail.policyImg}></Image>
+                  <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={transferImage(detail.policyImg)}></Image>
                   <View className="detail-con">
                     <import src='../../../components/wxParse/wxParse.wxml' />
                     <template is='wxParse' data='{{wxParseData:article.nodes}}' />

src/pages/policy/item/index.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import dayjs from 'dayjs'
 import './item.scss'
+import { transferImage } from '@utils/tools'
 
 export default class PolicyItem extends Component {
 
@@ -14,7 +15,7 @@ export default class PolicyItem extends Component {
     const { data } = this.props
     return (
       <View className="item" key={data.policyId} onClick={this.handleClick}>
-        <Image className="item-img" mode="aspectFill" src={data.policyImg}></Image>
+        <Image className="item-img" mode="aspectFill" src={transferImage(data.policyImg)}></Image>
         <View className="item-con">
           <View className="item-con__title">{data.title}</View>
           <View className="item-con__date">{dayjs(data.createDate).format('YYYY-MM-DD')}</View>

src/pages/project/album/index.js

@@ -4,7 +4,7 @@ import './index.scss'
 import { connect } from '@tarojs/redux'
 import * as actions from '@actions/project'
 import { savePoint, updatePoint } from '@services/common'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 
 
 @connect(state => state.project, { ...actions })
@@ -98,7 +98,7 @@ export default class Index extends Component {
           {imgList.map((item, index) => {
             console.log(item, '299999933333222')
             return (
-              <Image className='photos__item-img' src={getThumbnail(item.url)} mode='aspectFill' onClick={this.previewImage.bind(this, item.url, _photosImgs)}></Image>
+              <Image className='photos__item-img' src={transferImage(item.url)} mode='aspectFill' onClick={this.previewImage.bind(this, item.url, _photosImgs)}></Image>
             )
           })}
         </View>

src/pages/project/banner/index.js

@@ -3,7 +3,7 @@ import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
 // import { cdn } from '@constants/api'
 import './index.scss'
 import emptyImg from '@assets/empty.png'
-import { getThumbnail, resizeImage } from '@utils/tools'
+import { transferImage, resizeImage } from '@utils/tools'
 
 export default class SwiperBanner extends Component {
   static defaultProps = {

src/pages/project/detail/index.js

@@ -21,7 +21,7 @@ import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn' // 按需加载
 import ready from '@utils/ready'
 import Notice from '@components/Notice'
-import { getDownloadURL, getThumbnail, sceneInShare } from '@utils/tools'
+import { getDownloadURL, transferImage, sceneInShare } from '@utils/tools'
 import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@actions/project'
 import getUserPhone from '@utils/getUserPhone'
@@ -55,7 +55,7 @@ export default class Index extends Component {
     recordId: null,
     posterShow: 'none',
     current: 1,
-    btnstate: 1,// 1显示视频 0显示图片
+    btnstate: 0,// 1显示视频 0显示图片
     albumCurrent: 0,
     videoPlayShow: 'flex',
     grantPhoneVisible: false, // 授权手机弹框
@@ -406,7 +406,7 @@ export default class Index extends Component {
       })
     } else {
       Taro.navigateTo({
-        url: `/pages/agent/recommend/index`
+        url: `/pages/agent/recommend/index?type=projectDeatil` 
       })
     }
   }
@@ -561,7 +561,7 @@ export default class Index extends Component {
               <View className="type-intro__list">
                 {
                   buildingProjectType.map(item => (
-                    <View className={buildingProjectType.length == 1 ? 'onlyone type-intro__item' : 'type-intro__item'} key={item.buildingId} style={`background: url(${getThumbnail(buildBg)}) no-repeat center;background-size: 100% 100%;`}>
+                    <View className={buildingProjectType.length == 1 ? 'onlyone type-intro__item' : 'type-intro__item'} key={item.buildingId} style={`background: url(${transferImage(buildBg)}) no-repeat center;background-size: 100% 100%;`}>
 
                       <View >
 
@@ -646,7 +646,7 @@ export default class Index extends Component {
                         >
 
                           <View>
-                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} onClick={() => this.toViewAlbum(index)}></Image>
+                            <Image className='albumimg' src={transferImage(buildingImgList[0].url)} onClick={() => this.toViewAlbum(index)}></Image>
                             <View style={{ width: '218rpx', display: 'flex', justifyContent: 'center' }} >
                               <View style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
                               <View> ({buildingImgList.length})</View>
@@ -723,7 +723,7 @@ export default class Index extends Component {
                   consultants.slice(0, 3).map(item => (
                     <View className="item" key={item.id} onClick={this.handleConsuItemClick.bind(this, item)}>
                       <View className="flex">
-                        <Image className="avatar" mode="aspectFill" src={getThumbnail(item.photo || item.avatar)}></Image>
+                        <Image className="avatar" mode="aspectFill" src={transferImage(item.photo || item.avatar)}></Image>
                         <View className='name-txt'>
                           <Text className="name">{item.userName}</Text>
                           <Text className='txt'>{item.description || ' '}</Text>
@@ -844,7 +844,7 @@ export default class Index extends Component {
                       {
                         item && (
                           <View className='house__img-info'>
-                            <Image className='house__img' src={getThumbnail(item.buildingImgList[0].url)} mode="widthFix" onClick={this.handlePreviewHxImage.bind(this, item.buildingImgList[0].url, imgUrls)}></Image>
+                            <Image className='house__img' src={transferImage(item.buildingImgList[0].url)} mode="widthFix" onClick={this.handlePreviewHxImage.bind(this, item.buildingImgList[0].url, imgUrls)}></Image>
                             <View className='house-type__state' style={`background-color: ${statusBgColors[item.marketStatus - 1]}`}>{statusOpts[item.marketStatus - 1]}</View>
                           </View>
                         )
@@ -924,7 +924,7 @@ export default class Index extends Component {
                   {
                     newsList.map(item => (
                       <View className="news-item" key={item.newsId} onClick={this.handNewsItemClick.bind(this, item.newsId)}>
-                        <Image src={getThumbnail(item.newsImg)} mode="aspectFill" className="news-item__pic"></Image>
+                        <Image src={transferImage(item.newsImg)} mode="aspectFill" className="news-item__pic"></Image>
                         <View className="news-item__title">{item.newsName}</View>
                       </View>
                     ))
@@ -1001,7 +1001,7 @@ videoContext.poster = undefined
         <Video
           src={projectDetail.videoUrl}
           // src='http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400'
-          poster={getThumbnail(imgSrc)}
+          poster={transferImage(imgSrc)}
           // poster='http://misc.aotu.io/booxood/mobile-video/cover_900x500.jpg'
           style={{
             height: '600rpx',
@@ -1063,7 +1063,7 @@ videoContext.poster = undefined
           loaded && (
             <View className='detail'>
               <Notice></Notice>
-              {(projectDetail.videoUrl == null || btnstate === 0) && (
+              {/* {(projectDetail.videoUrl == null || btnstate === 0) && ( */}
                 <View
                   className="pro__banner"
                   onClick={this.previewImage.bind(this, projectDetail.buildingImg)}>
@@ -1080,19 +1080,19 @@ videoContext.poster = undefined
                   ></Banner>
                   <Text className="pro__banner-text">{this.current}/{(projectDetail.buildingImg && projectDetail.buildingImg.length) || 0}</Text>
                 </View>
-              )}
+              {/* )} */}
 
-              {btnstate === 1 && projectDetail.videoUrl != null && this.renderVideo()}
+              {/* {btnstate === 1 && projectDetail.videoUrl != null && this.renderVideo()} */}
 
-              {btnstate === 1 && projectDetail.videoUrl != null && (<View className='media-btn'>
+              {/* {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>
-              </View>)}
+              </View>)} */}
 
-              {btnstate === 0 && projectDetail.videoUrl != null && (<View className='media-btn'>
+              {/* {btnstate === 0 && projectDetail.videoUrl != null && (<View className='media-btn'>
                 <View className='video-btn' onClick={() => this.setState({ btnstate: 1 })} >视频</View>
                 <View className='img-btn' style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }}>图片</View>
-              </View>)}
+              </View>)} */}
 
               <ScrollView
                 enableBackToTop
@@ -1165,7 +1165,7 @@ videoContext.poster = undefined
                         <View className='top__txt'>{projectDetail.pvNum || 0}人围观</View>
                         <View className='bottom__img' onClick={this.onViewFans.bind(this)}>
                           <View className="records">
-                            {records.slice(0, 9).map(item => <Image src={item.photoOravatar} className='user__img' key={item.personId} />)}
+                            {records.slice(0, 9).map(item => <Image src={transferImage(item.photoOravatar)} className='user__img' key={item.personId} />)}
                             {records.length > 9 && <Text> ···</Text>}
                           </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

@@ -44,9 +44,12 @@
       padding: 40px 0;
 
       .result-img {
-        height: 60vh;
+        height: 720.65px;
+        // 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 >

src/pages/project/index.js

@@ -17,7 +17,7 @@ import { dispatchCitySelected } from '@actions/city'
 import { ROLE_CODE } from '@constants/user'
 import { connect } from '@tarojs/redux'
 import * as actions from '@actions/project'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 import QQMapWX from '@lib/qqmap-wx-jssdk.min'
 import Notice from '@components/Notice'
 import Authorize from '@components/authorize'
@@ -38,8 +38,8 @@ export default class Index extends Component {
     keywords: '',
     loaded: false,
     maskBanner: '',
-    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1565358322510-share.jpg',
     shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
+    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1565358322510-share.jpg',
     bannerList: [],
     helpGroupList: [],
     newsList: [],
@@ -512,7 +512,7 @@ export default class Index extends Component {
           <Image
             mode="widthFix"
             className="img"
-            src={getThumbnail(maskBanner.image)}
+            src={transferImage(maskBanner.image)}
             onClick={this.handleMaskBannerClick.bind(this, maskBanner)}>
           </Image>
           <Icon className="iconfont close icon-buoumaotubiao20" onClick={this.handleMaskClose}></Icon>

src/pages/project/item/index.js

@@ -1,6 +1,6 @@
 import Taro, { Component } from '@tarojs/taro'
 import './index.scss'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 
 const dotImg = require('@assets/dot.png')
 
@@ -26,7 +26,7 @@ export default class Index extends Component {
       <View className='item' onClick={onClick.bind(this, data)}>
         <View className='item__top'>
           {console.log(data, 'data')}
-          <Image className='item__img' mode="aspectFill" src={getThumbnail(imgSrc)}></Image>
+          <Image className='item__img' mode="aspectFill" src={transferImage(imgSrc)}></Image>
           {data.marketStatus &&
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}
           <View className='item__right'>
@@ -56,8 +56,8 @@ export default class Index extends Component {
             <View className='item__bottom__right'>
               <Text className='item__bottom__seenum'>{data.pvNum || 0}人围观</Text>
               <View className='see__img'>
-                {records.slice(0, 4).map(item => <Image className='userImg' key={item.uvId} src={getThumbnail(item.photoOravatar)}></Image>)}
-                {records.length > 4 && <Image className="dot-img" src={getThumbnail(dotImg)}></Image>}
+                {records.slice(0, 4).map(item => <Image className='userImg' key={item.uvId} src={transferImage(item.photoOravatar)}></Image>)}
+                {records.length > 4 && <Image className="dot-img" src={transferImage(dotImg)}></Image>}
               </View>
             </View>
           )}

src/pages/project/map/index.js

@@ -129,7 +129,7 @@ export default class Index extends Component {
       longitude,
       name: buildingName,
       address,
-      scale: 18
+      scale: 12,
     })
   }
   // onShareAppMessage = () => {
@@ -153,6 +153,7 @@ export default class Index extends Component {
           markers={markers}
           show-location
           include-points={points}
+          scale={12}
           onCallouttap={this.showProject.bind(this)}
         >
         </Map>

src/pages/project/swiper/index.js

@@ -3,7 +3,7 @@ import { View, Swiper, SwiperItem, Image, Block } from '@tarojs/components'
 // import { cdn } from '@constants/api'
 import './index.scss'
 import emptyImg from '@assets/empty.png'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 
 export default class SwiperBanner extends Component {
   static defaultProps = {
@@ -48,7 +48,7 @@ export default class SwiperBanner extends Component {
                   mode="aspectFill"
                   style={style}
                   className='home-banner__swiper-item-img'
-                  src={getThumbnail(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || emptyImg)}
+                  src={transferImage(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || emptyImg)}
                 />
                 {type=='activity' && <View className='home-banner__swiper-item__title'> {item.title}</View>}
               </View>

src/pages/shop/banner/index.js

@@ -2,7 +2,7 @@ import Taro, { Component } from '@tarojs/taro'
 import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
 // import { cdn } from '@constants/api'
 import './index.scss'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 
 export default class SwiperBanner extends Component {
   static defaultProps = {
@@ -36,7 +36,7 @@ export default class SwiperBanner extends Component {
               <Image
                 mode="aspectFill"
                 className='home-banner__swiper-item-img'
-                src={getThumbnail(item.image)}
+                src={transferImage(item.image)}
               />
             </SwiperItem>
           ))}

src/pages/shop/detail/index.js

@@ -5,7 +5,7 @@ import { connect } from '@tarojs/redux'
 import * as actions from '@actions/shop'
 import WxParse from '@components/wxParse/wxParse'
 
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 
 let hasClick = true
 @connect(state => state.shop, { ...actions })
@@ -91,7 +91,7 @@ export default class Index extends Component {
             paddingBottom: `${this.state.visibleExcBtn ? '100rpx' : ''}`
           }}>
           <View className="detail__head">
-            <Image src={getThumbnail(goodsDetail.detailImgUrl || goodsDetail.imgUrl)} mode="widthFix" className="detail__head-pic"></Image>
+            <Image src={transferImage(goodsDetail.detailImgUrl || goodsDetail.imgUrl)} mode="widthFix" className="detail__head-pic"></Image>
             <Image src={require('@assets/shop/hot.png')} className="detail__head-hot" />
           </View>
 

src/pages/shop/index.js

@@ -3,7 +3,7 @@ import { getWindowHeight } from '@utils/style'
 import { AtTabs, AtTabsPane } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
 import './index.scss'
-import { getThumbnail } from '@utils/tools'
+import { transferImage } from '@utils/tools'
 // import Search from '@components/search'
 import Banner from './banner'
 import ready from '@utils/ready'
@@ -264,7 +264,7 @@ export default class Shop extends Component {
 
                 <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
                   {console.log(item, '--item---')}
-                  <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
+                  <Image className="item__img" mode="aspectFill" src={transferImage(item.imgUrl)} />
                   <View className="item__title">{item.goodsName}</View>
                   <View className="item__des">
                     <View>
@@ -297,7 +297,7 @@ export default class Shop extends Component {
                     {goodsList.length &&
                       goodsList.map(item => (
                         <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
-                          <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
+                          <Image className="item__img" mode="aspectFill" src={transferImage(item.imgUrl)} />
                           <View className="item__title">{item.goodsName}</View>
                           <View className="item__des">
                             <View>
@@ -347,7 +347,7 @@ export default class Shop extends Component {
           }}>
           <View className="user_box">
             <View className="user_con">
-              <Image className="bg" src={getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
+              <Image className="bg" src={transferImage('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
               <Image className="user__left__headimg" src={person.avatarurl} />
               <View className='user__left__name'>{person.nickname}</View>
               {

src/pages/shop/record/index.js

@@ -5,6 +5,7 @@ import EmptyPage from '@components/empty-page'
 import { connect } from '@tarojs/redux'
 import * as actions from '@actions/shop'
 import dayjs from 'dayjs'
+import { transferImage } from '@utils/tools'
 
 @connect(state => ({ ...state.shop, ...state.user }), { ...actions })
 export default class Index extends Component {
@@ -71,7 +72,7 @@ export default class Index extends Component {
 									<View className="title-state">{item.status==0?"未领取":"已领取"}</View>
 								</View>
 								<View className="bottom">
-									<Image className="botttom_img" mode="aspectFill" src={item.image} />
+									<Image className="botttom_img" mode="aspectFill" src={transferImage(item.image)} />
 									<View className="bottom-right">
 										<View className="bottom-right-top">
 											<View className="product-name" style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',width:'300rpx' }}>{item.targetName}</View>

src/utils/tools.js

@@ -42,6 +42,20 @@ export function resizeImage(img, size) {
   return img
 }
 
+/**
+ * 压缩图片 80%, 最大宽度 750
+ * @param {*} img 
+ */
+export function transferImage(img) {
+  if (!img) return img
+
+  if (img.indexOf('https://estateagents.oss-cn-shanghai.aliyuncs.com') === 0) {
+    return `${img}?x-oss-process=image/resize,m_lfit,w_750/quality,Q_80`
+  }
+
+  return img
+}
+
 /**
  * 解析 queryString   a=b&c=d  ==> { a:b, c:d }
  * @param {*} queryString