Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST:  '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.0.218:8080"',
-    // WSS_HOST: '"ws://192.168.0.218:8080"',
+    HOST: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/components/TimeTicker/index.jsx

@@ -0,0 +1,39 @@
+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,
+  }
+
+  componentWillMount() {
+
+
+  }
+
+  computeProps(props) {
+    const { ready, process, over, timeRange = [] } = props
+    const now = dayjs().valueOf()
+    const [t1, t2] = timeRange
+
+    // 确定当前状态
+    let status = this.state.status
+
+  }
+
+  render() {
+    
+
+
+  }
+}

src/components/authorize/index.js

@@ -63,7 +63,7 @@ export default class Index extends Component {
         <Image className="avatar_img" src={user.avatar} />
         <View className="user_name">{user.nickname}</View>
         <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
-        <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View>
+        {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
       </View>
     )
   }

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,
@@ -543,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>
@@ -570,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>
                         }
@@ -582,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>
                     )
@@ -628,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,
@@ -528,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>
@@ -629,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

@@ -143,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
         })

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,18 +116,18 @@ 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: '查看',
         fontSize: 26,
@@ -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/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/authorize/index.js

@@ -48,7 +48,7 @@ export default class Index extends Component {
         <Image className="avatar_img" src={person.avatarurl}/>
         <View className="user_name">{person.nickname}</View>
         <Button  className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
-        <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View>
+        {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
       </View>
     )
   }

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,18 +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} >
-          <View >
-            {
-              current != 1 && <Analysis></Analysis>
-            }
-          </View>
-        </AtTabsPane>
-        <AtTabsPane current={current} index={1}>
+         <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,6 +77,14 @@ export default class customer extends Taro.Component {
             </View>
           </View>
         </AtTabsPane>
+        <AtTabsPane current={current} index={1} >
+          <View >
+            {
+              current != 0 && <Analysis></Analysis>
+            }
+          </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'
@@ -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',
@@ -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/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'
@@ -511,7 +511,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/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>