Browse Source

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

周立森 5 years ago
parent
commit
fe9417bcac
38 changed files with 151 additions and 94 deletions
  1. 4
    4
      config/dev.js
  2. 39
    0
      src/components/TimeTicker/index.jsx
  3. 1
    1
      src/components/authorize/index.js
  4. 2
    1
      src/pages/activity/assembleItem/index.js
  5. 3
    1
      src/pages/activity/assistanceItem/index.js
  6. 5
    5
      src/pages/activity/detail/assemble.js
  7. 3
    3
      src/pages/activity/detail/assistance.js
  8. 2
    2
      src/pages/activity/detail/index.js
  9. 2
    2
      src/pages/activity/item/index.js
  10. 4
    4
      src/pages/agent/recommend/index.js
  11. 7
    3
      src/pages/card/index.js
  12. 7
    7
      src/pages/card/poster.js
  13. 2
    2
      src/pages/checkin/checkinsuccess/index.js
  14. 2
    2
      src/pages/news/detail/index.js
  15. 2
    2
      src/pages/news/item.js
  16. 1
    1
      src/pages/news/item.scss
  17. 1
    1
      src/pages/person/authorize/index.js
  18. 3
    1
      src/pages/person/customerAnalysis/followUpCustomer/index.js
  19. 10
    9
      src/pages/person/customerAnalysis/index.js
  20. 2
    2
      src/pages/person/customerAnalysis/item/index.js
  21. 3
    3
      src/pages/person/customerAnalysis/myCustomer.js
  22. 3
    1
      src/pages/person/customerAnalysis/transactionCustomer/index.js
  23. 2
    1
      src/pages/person/favorite/index.js
  24. 2
    2
      src/pages/person/index.js
  25. 3
    2
      src/pages/person/profile/detail/index.js
  26. 2
    1
      src/pages/person/profile/index.js
  27. 2
    1
      src/pages/policy/detail/index.js
  28. 2
    1
      src/pages/policy/item/index.js
  29. 2
    2
      src/pages/project/album/index.js
  30. 1
    1
      src/pages/project/banner/index.js
  31. 9
    9
      src/pages/project/detail/index.js
  32. 2
    2
      src/pages/project/index.js
  33. 4
    4
      src/pages/project/item/index.js
  34. 2
    2
      src/pages/project/swiper/index.js
  35. 2
    2
      src/pages/shop/banner/index.js
  36. 2
    2
      src/pages/shop/detail/index.js
  37. 4
    4
      src/pages/shop/index.js
  38. 2
    1
      src/pages/shop/record/index.js

+ 4
- 4
config/dev.js View File

5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://47.101.36.130:8085"',//测试
6
     // HOST: '"http://47.101.36.130:8085"',//测试
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
8
-    HOST:  '"https://dev.jinchengjiaye.com"',//测试
9
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
8
+    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
9
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
     // HOST: '"https://lt.pawoma.cn"',
10
     // HOST: '"https://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    // HOST: '"http://192.168.0.218:8080"',
13
-    // WSS_HOST: '"ws://192.168.0.218:8080"',
12
+    HOST: '"http://192.168.0.84:8080"',
13
+    WSS_HOST: '"ws://192.168.0.84:8080"',
14
   },
14
   },
15
   weapp: {},
15
   weapp: {},
16
   h5: {}
16
   h5: {}

+ 39
- 0
src/components/TimeTicker/index.jsx View File

1
+import Taro from '@tarojs/taro'
2
+import dayjs from 'dayjs'
3
+
4
+// 未开始
5
+const STATUS_READY = -1
6
+
7
+// 进行中
8
+const STATUS_PROCESSING = 0
9
+
10
+// 已结束
11
+const STATUS_OVER = 1
12
+
13
+export default class TimeTicker extends Taro.Component {
14
+
15
+  state = {
16
+    status: STATUS_READY,
17
+  }
18
+
19
+  componentWillMount() {
20
+
21
+
22
+  }
23
+
24
+  computeProps(props) {
25
+    const { ready, process, over, timeRange = [] } = props
26
+    const now = dayjs().valueOf()
27
+    const [t1, t2] = timeRange
28
+
29
+    // 确定当前状态
30
+    let status = this.state.status
31
+
32
+  }
33
+
34
+  render() {
35
+    
36
+
37
+
38
+  }
39
+}

+ 1
- 1
src/components/authorize/index.js View File

63
         <Image className="avatar_img" src={user.avatar} />
63
         <Image className="avatar_img" src={user.avatar} />
64
         <View className="user_name">{user.nickname}</View>
64
         <View className="user_name">{user.nickname}</View>
65
         <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
65
         <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
66
-        <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View>
66
+        {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
67
       </View>
67
       </View>
68
     )
68
     )
69
   }
69
   }

+ 2
- 1
src/pages/activity/assembleItem/index.js View File

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

+ 3
- 1
src/pages/activity/assistanceItem/index.js View File

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

+ 5
- 5
src/pages/activity/detail/assemble.js View File

10
 // import WxParse from '@components/wxParse/wxParse'
10
 // import WxParse from '@components/wxParse/wxParse'
11
 // import getUserPhone from '@utils/getUserPhone'
11
 // import getUserPhone from '@utils/getUserPhone'
12
 import ready from '@utils/ready'
12
 import ready from '@utils/ready'
13
-import { getDownloadURL, times, formateLeftTime, getCanvasConfig, getThumbnail } from '@utils/tools'
13
+import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
14
 import {
14
 import {
15
   getGroupDetail,
15
   getGroupDetail,
16
   createGroupActivity,
16
   createGroupActivity,
543
             <View className="ass-page">
543
             <View className="ass-page">
544
               <Notice></Notice>
544
               <Notice></Notice>
545
               <View className="detail-banner">
545
               <View className="detail-banner">
546
-                <Image mode="widthFix" src={getThumbnail(detail.mainImg)} className="detail-banner__img"></Image>
546
+                <Image mode="widthFix" src={transferImage(detail.mainImg)} className="detail-banner__img"></Image>
547
 
547
 
548
                 <View className="rest-time">
548
                 <View className="rest-time">
549
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
549
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
570
                     groupState === GroupSuccess &&
570
                     groupState === GroupSuccess &&
571
                     (
571
                     (
572
                       <Block>
572
                       <Block>
573
-                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={getThumbnail(successImg)}></Image>
573
+                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={transferImage(successImg)}></Image>
574
                         {
574
                         {
575
                           verificationCode && <View className="hexiaoma" style="margin:0 auto 40rpx auto">核销码: {verificationCode}</View>
575
                           verificationCode && <View className="hexiaoma" style="margin:0 auto 40rpx auto">核销码: {verificationCode}</View>
576
                         }
576
                         }
582
                     groupState === GroupFailure &&
582
                     groupState === GroupFailure &&
583
                     (
583
                     (
584
                       <View>
584
                       <View>
585
-                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={getThumbnail(failImg)}></Image>
585
+                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={transferImage(failImg)}></Image>
586
                         <View className="fail-text" style="margin:0 auto 40rpx auto">活动已超时,拼团失败!</View>
586
                         <View className="fail-text" style="margin:0 auto 40rpx auto">活动已超时,拼团失败!</View>
587
                       </View>
587
                       </View>
588
                     )
588
                     )
628
 
628
 
629
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
629
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
630
                 <View style="padding:0 40rpx 180rpx 40rpx">
630
                 <View style="padding:0 40rpx 180rpx 40rpx">
631
-                  <Image src={getThumbnail(detail.descImg)} mode="widthFix" style="width:100%;"></Image>
631
+                  <Image src={transferImage(detail.descImg)} mode="widthFix" style="width:100%;"></Image>
632
                 </View>
632
                 </View>
633
                 {(actState === ActBeforeStart || (isStarter && actState === ActInProcess && groupState === GroupInProcess) || (!isStarter && actState === ActInProcess && groupState != GroupInProcess) || (!isStarter && actState === ActInProcess && groupState === GroupInProcess)) &&
633
                 {(actState === ActBeforeStart || (isStarter && actState === ActInProcess && groupState === GroupInProcess) || (!isStarter && actState === ActInProcess && groupState != GroupInProcess) || (!isStarter && actState === ActInProcess && groupState === GroupInProcess)) &&
634
                   <View className="btn-fixed">
634
                   <View className="btn-fixed">

+ 3
- 3
src/pages/activity/detail/assistance.js View File

10
 // import WxParse from '@components/wxParse/wxParse'
10
 // import WxParse from '@components/wxParse/wxParse'
11
 // import getUserPhone from '@utils/getUserPhone'
11
 // import getUserPhone from '@utils/getUserPhone'
12
 import ready from '@utils/ready'
12
 import ready from '@utils/ready'
13
-import { getDownloadURL, times, formateLeftTime, getCanvasConfig, getThumbnail } from '@utils/tools'
13
+import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
14
 import {
14
 import {
15
   getHelpDetail,
15
   getHelpDetail,
16
   createHelpActivity,
16
   createHelpActivity,
528
             <View className="ass-page">
528
             <View className="ass-page">
529
               <Notice></Notice>
529
               <Notice></Notice>
530
               <View className="detail-banner">
530
               <View className="detail-banner">
531
-                <Image mode="aspectFill" src={getThumbnail(detail.img)} className="detail-banner__img"></Image>
531
+                <Image mode="aspectFill" src={transferImage(detail.img)} className="detail-banner__img"></Image>
532
 
532
 
533
                 <View className="rest-time">
533
                 <View className="rest-time">
534
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
534
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
629
                 </View>
629
                 </View>
630
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
630
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
631
                 <View style="padding:0 40rpx">
631
                 <View style="padding:0 40rpx">
632
-                  <Image src={getThumbnail(detail.activityInstructions)} mode="widthFix" style="width:100%;margin-bottom:20px;"></Image>
632
+                  <Image src={transferImage(detail.activityInstructions)} mode="widthFix" style="width:100%;margin-bottom:20px;"></Image>
633
                 </View>
633
                 </View>
634
 
634
 
635
               </ScrollView>
635
               </ScrollView>

+ 2
- 2
src/pages/activity/detail/index.js View File

7
 import WxParse from '@components/wxParse/wxParse'
7
 import WxParse from '@components/wxParse/wxParse'
8
 import getUserPhone from '@utils/getUserPhone'
8
 import getUserPhone from '@utils/getUserPhone'
9
 import ready from '@utils/ready'
9
 import ready from '@utils/ready'
10
-import { getDownloadURL, times, getThumbnail } from '@utils/tools'
10
+import { getDownloadURL, times, transferImage } from '@utils/tools'
11
 import {
11
 import {
12
   addActivityShareNum,
12
   addActivityShareNum,
13
   signupActivity,
13
   signupActivity,
324
             <View>
324
             <View>
325
               <Notice></Notice>
325
               <Notice></Notice>
326
               <View className="detail-banner">
326
               <View className="detail-banner">
327
-                <Image mode="aspectFill" src={getThumbnail(detail.imgUrl)} className="detail-banner__img"></Image>
327
+                <Image mode="aspectFill" src={transferImage(detail.imgUrl)} className="detail-banner__img"></Image>
328
               </View>
328
               </View>
329
               <ScrollView
329
               <ScrollView
330
                 scrollY
330
                 scrollY

+ 2
- 2
src/pages/activity/item/index.js View File

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

+ 4
- 4
src/pages/agent/recommend/index.js View File

66
     const { type } = this.$router.params
66
     const { type } = this.$router.params
67
 
67
 
68
     this.setState({
68
     this.setState({
69
-      reType: type,
69
+      reType: type || "",
70
 
70
 
71
     }, () => {
71
     }, () => {
72
       console.log(this.state.sex, "sex")
72
       console.log(this.state.sex, "sex")
73
       console.log('buildingName' + this.props.proList.records[0].buildingName)
73
       console.log('buildingName' + this.props.proList.records[0].buildingName)
74
-      if (this.state.reType != 'index') {
74
+      if (this.state.reType == 'projectDeatil') {
75
         this.setState({
75
         this.setState({
76
           intention: this.props.projectDetail.buildingName ? this.props.projectDetail.buildingName : this.props.proList.records[0].buildingName,
76
           intention: this.props.projectDetail.buildingName ? this.props.projectDetail.buildingName : this.props.proList.records[0].buildingName,
77
           floor: this.props.projectDetail.buildingId ? this.props.projectDetail.buildingId : this.props.proList.records[0].buildingId
77
           floor: this.props.projectDetail.buildingId ? this.props.projectDetail.buildingId : this.props.proList.records[0].buildingId
422
 
422
 
423
   renderDetail() {
423
   renderDetail() {
424
     const { reType, name, phone, floorArray, floorID, floorColor, intention, adviserArray, adviserID, adviserColor, remarks, radioList } = this.state
424
     const { reType, name, phone, floorArray, floorID, floorColor, intention, adviserArray, adviserID, adviserColor, remarks, radioList } = this.state
425
- 
425
+
426
     return (
426
     return (
427
       <View className='recommend__customers'>
427
       <View className='recommend__customers'>
428
         <View className='submit__infor ani'>
428
         <View className='submit__infor ani'>
451
           <View className='info info__4'>
451
           <View className='info info__4'>
452
             <Text className='customers__txt'>意向楼盘</Text>
452
             <Text className='customers__txt'>意向楼盘</Text>
453
             {
453
             {
454
-              reType == 'index' ? (<Picker className='input customers__name' onChange={this.bindFloorChange} value={floorID} range={floorArray} range-key="buildingName">
454
+              reType != 'projectDeatil' ? (<Picker className='input customers__name' onChange={this.bindFloorChange} value={floorID} range={floorArray} range-key="buildingName">
455
                 <View class="picker overtext" style={floorColor}>
455
                 <View class="picker overtext" style={floorColor}>
456
                   {floorArray[floorID].buildingName}
456
                   {floorArray[floorID].buildingName}
457
                 </View>
457
                 </View>

+ 7
- 3
src/pages/card/index.js View File

143
   }
143
   }
144
 
144
 
145
   getLocation = () => {
145
   getLocation = () => {
146
-    const { cardInfo: { address, company } } = this.props
146
+    const { cardInfo: { address, company,coordinate } } = this.props
147
+    const coord = coordinate.split(',')
148
+    const latitude = parseFloat(coord[0])
149
+    const longitude = parseFloat(coord[1])
150
+    
147
     Taro.getLocation({ //返回可以用于Taro.openLocation的经纬度,官方提示bug: iOS 6.3.30 type 参数不生效,只会返回 wgs84 类型的坐标信息  
151
     Taro.getLocation({ //返回可以用于Taro.openLocation的经纬度,官方提示bug: iOS 6.3.30 type 参数不生效,只会返回 wgs84 类型的坐标信息  
148
       success: function (res) {
152
       success: function (res) {
149
         Taro.openLocation({
153
         Taro.openLocation({
150
-          latitude: 31.979190,
151
-          longitude: 118.733660,
154
+          latitude,
155
+          longitude,
152
           name: company,
156
           name: company,
153
           address
157
           address
154
         })
158
         })

+ 7
- 7
src/pages/card/poster.js View File

94
         zIndex: 999
94
         zIndex: 999
95
       },
95
       },
96
       {
96
       {
97
-        x: 100,
97
+        x: 80,
98
         y: 710,
98
         y: 710,
99
         text: '长按识别小程序码',
99
         text: '长按识别小程序码',
100
         fontSize: 26,
100
         fontSize: 26,
105
         zIndex: 100
105
         zIndex: 100
106
       },
106
       },
107
       {
107
       {
108
-        x: 100,
108
+        x: 80,
109
         y: 755,
109
         y: 755,
110
         text: '进入',
110
         text: '进入',
111
         fontSize: 26,
111
         fontSize: 26,
116
         zIndex: 100
116
         zIndex: 100
117
       },
117
       },
118
       {
118
       {
119
-        x: 170,
119
+        x: 140,
120
         y: 755,
120
         y: 755,
121
         text: data.miniAppName,
121
         text: data.miniAppName,
122
         fontSize: 34,
122
         fontSize: 34,
123
         color: 'red',
123
         color: 'red',
124
         baseLine: 'middle',
124
         baseLine: 'middle',
125
         lineHeight: 48,
125
         lineHeight: 48,
126
-        width: (data.miniAppName || '').length * 30 + 60,
126
+        width: (data.miniAppName || '').length * 30 + 50,
127
         zIndex: 100
127
         zIndex: 100
128
       },
128
       },
129
       {
129
       {
130
-        x: (data.miniAppName || '').length * 30 + 200,
130
+        x: (data.miniAppName || '').length * 30 + 156,
131
         y: 755,
131
         y: 755,
132
         text: '查看',
132
         text: '查看',
133
         fontSize: 26,
133
         fontSize: 26,
160
         borderRadius: 40,
160
         borderRadius: 40,
161
       },
161
       },
162
       {
162
       {
163
-        width: 520,
163
+        width: 540,
164
         height: 160,
164
         height: 160,
165
-        x: 60,
165
+        x: 50,
166
         y: 650,
166
         y: 650,
167
         backgroundColor: '#F8F8F8',
167
         backgroundColor: '#F8F8F8',
168
         borderRadius: 10,
168
         borderRadius: 10,

+ 2
- 2
src/pages/checkin/checkinsuccess/index.js View File

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

+ 2
- 2
src/pages/news/detail/index.js View File

7
 import BackHomeBtn from '@components/BackHomeBtn'
7
 import BackHomeBtn from '@components/BackHomeBtn'
8
 import Notice from '@components/Notice'
8
 import Notice from '@components/Notice'
9
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
9
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
10
-import { getDownloadURL, getThumbnail } from '@utils/tools'
10
+import { getDownloadURL, transferImage } from '@utils/tools'
11
 import {
11
 import {
12
   addNewsUv,
12
   addNewsUv,
13
   favorNews,
13
   favorNews,
222
 
222
 
223
                   <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
223
                   <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
224
                 </View>
224
                 </View>
225
-                {/* <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={getThumbnail(detail.newsImg)}></Image> */}
225
+                {/* <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={transferImage(detail.newsImg)}></Image> */}
226
                 <View className="detail-con">
226
                 <View className="detail-con">
227
                   <import src='../../../components/wxParse/wxParse.wxml' />
227
                   <import src='../../../components/wxParse/wxParse.wxml' />
228
                   <template is='wxParse' data='{{wxParseData:article.nodes}}' />
228
                   <template is='wxParse' data='{{wxParseData:article.nodes}}' />

+ 2
- 2
src/pages/news/item.js View File

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

+ 1
- 1
src/pages/news/item.scss View File

14
   }
14
   }
15
 
15
 
16
   &-con {
16
   &-con {
17
-    width:450px;
17
+    width:430px;
18
     display: flex;
18
     display: flex;
19
     flex-direction: column;
19
     flex-direction: column;
20
     justify-content: space-between;
20
     justify-content: space-between;

+ 1
- 1
src/pages/person/authorize/index.js View File

48
         <Image className="avatar_img" src={person.avatarurl}/>
48
         <Image className="avatar_img" src={person.avatarurl}/>
49
         <View className="user_name">{person.nickname}</View>
49
         <View className="user_name">{person.nickname}</View>
50
         <Button  className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
50
         <Button  className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
51
-        <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View>
51
+        {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
52
       </View>
52
       </View>
53
     )
53
     )
54
   }
54
   }

+ 3
- 1
src/pages/person/customerAnalysis/followUpCustomer/index.js View File

6
 import { connect } from '@tarojs/redux'
6
 import { connect } from '@tarojs/redux'
7
 import { View, Text, Picker } from '@tarojs/components';
7
 import { View, Text, Picker } from '@tarojs/components';
8
 import { queryCustomerList, addFollowRecord } from '@services/person'
8
 import { queryCustomerList, addFollowRecord } from '@services/person'
9
+import { transferImage } from '@utils/tools'
10
+
9
 const maleImg = require('@assets/person/male.png')
11
 const maleImg = require('@assets/person/male.png')
10
 const femaleImg = require('@assets/person/female.png')
12
 const femaleImg = require('@assets/person/female.png')
11
 const phoneImg = require('@assets/person/phone.png')
13
 const phoneImg = require('@assets/person/phone.png')
279
                 customerList.length &&
281
                 customerList.length &&
280
                 customerList.map((item, index) => (
282
                 customerList.map((item, index) => (
281
                   <View class="item" key={index + 'customerList'} onClick={this.toMyCustomer.bind(this, item.customerId)}>
283
                   <View class="item" key={index + 'customerList'} onClick={this.toMyCustomer.bind(this, item.customerId)}>
282
-                    <Image src={item.picture || require('@assets/default-avatar.png')} className='img'></Image>
284
+                    <Image src={transferImage(item.picture) || require('@assets/default-avatar.png')} className='img'></Image>
283
                     <View className="name">
285
                     <View className="name">
284
                       {item.name}
286
                       {item.name}
285
                       {
287
                       {

+ 10
- 9
src/pages/person/customerAnalysis/index.js View File

59
   }
59
   }
60
 
60
 
61
   render() {
61
   render() {
62
-    const tabList = [{ title: '客户分析' }, { title: '我的客户' }]
62
+    const tabList = [{ title: '我的客户' },{ title: '客户分析' }]
63
     const { customerNum, current } = this.state
63
     const { customerNum, current } = this.state
64
     return (
64
     return (
65
       <AtTabs  className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
65
       <AtTabs  className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
66
-        <AtTabsPane current={current} index={0} >
67
-          <View >
68
-            {
69
-              current != 1 && <Analysis></Analysis>
70
-            }
71
-          </View>
72
-        </AtTabsPane>
73
-        <AtTabsPane current={current} index={1}>
66
+         <AtTabsPane current={current} index={0}>
74
           <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
67
           <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
75
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
68
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
76
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>
69
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>
84
             </View>
77
             </View>
85
           </View>
78
           </View>
86
         </AtTabsPane>
79
         </AtTabsPane>
80
+        <AtTabsPane current={current} index={1} >
81
+          <View >
82
+            {
83
+              current != 0 && <Analysis></Analysis>
84
+            }
85
+          </View>
86
+        </AtTabsPane>
87
+       
87
       </AtTabs>
88
       </AtTabs>
88
     )
89
     )
89
   }
90
   }

+ 2
- 2
src/pages/person/customerAnalysis/item/index.js View File

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

+ 3
- 3
src/pages/person/customerAnalysis/myCustomer.js View File

8
 import './index.scss'
8
 import './index.scss'
9
 import ActivityItem from './item'
9
 import ActivityItem from './item'
10
 import dayjs from 'dayjs'
10
 import dayjs from 'dayjs'
11
-import { getThumbnail } from '@utils/tools'
11
+import { transferImage } from '@utils/tools'
12
 import emptyImg from '@assets/empty.png'
12
 import emptyImg from '@assets/empty.png'
13
 const maleImg = require('@assets/person/male.png')
13
 const maleImg = require('@assets/person/male.png')
14
 const femaleImg = require('@assets/person/female.png')
14
 const femaleImg = require('@assets/person/female.png')
451
         {followVisible && this.renderFollowBox()}
451
         {followVisible && this.renderFollowBox()}
452
         {baseVisible && this.renderBaseBox()}
452
         {baseVisible && this.renderBaseBox()}
453
         <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;">
453
         <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;">
454
-          <Image className="bg" src={getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
455
-          <Image className="user__left__headimg" src={customerDetail.picture || require('@assets/default-avatar.png')} />
454
+          <Image className="bg" src={transferImage('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
455
+          <Image className="user__left__headimg" src={transferImage(customerDetail.picture) || require('@assets/default-avatar.png')} />
456
           <View className='user__left__name'>
456
           <View className='user__left__name'>
457
             <View className="text">{customerDetail.name}</View>
457
             <View className="text">{customerDetail.name}</View>
458
             {
458
             {

+ 3
- 1
src/pages/person/customerAnalysis/transactionCustomer/index.js View File

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

+ 2
- 1
src/pages/person/favorite/index.js View File

5
 import { getCardList } from '@services/card'
5
 import { getCardList } from '@services/card'
6
 import { queryNewsList } from '@services/news'
6
 import { queryNewsList } from '@services/news'
7
 import { buildingDynamiceList } from '@services/activity'
7
 import { buildingDynamiceList } from '@services/activity'
8
+import { transferImage } from '@utils/tools'
8
 import ProjectItem from '../../project/item'
9
 import ProjectItem from '../../project/item'
9
 import NewsItem from '../../news/item'
10
 import NewsItem from '../../news/item'
10
 
11
 
126
         {cardList.map(item => (
127
         {cardList.map(item => (
127
           <View className="card-item" key={item.id} onClick={this.navigateTo.bind(this, '/pages/card/index?id=' + item.id)}>
128
           <View className="card-item" key={item.id} onClick={this.navigateTo.bind(this, '/pages/card/index?id=' + item.id)}>
128
             <View className="flex">
129
             <View className="flex">
129
-              <Image className="avatar" mode="aspectFill" src={item.avatar || item.photo}></Image>
130
+              <Image className="avatar" mode="aspectFill" src={transferImage(item.avatar || item.photo)}></Image>
130
               <Text className="name">{item.name}</Text>
131
               <Text className="name">{item.name}</Text>
131
             </View>
132
             </View>
132
             <View className="flex item-btn__box">
133
             <View className="flex item-btn__box">

+ 2
- 2
src/pages/person/index.js View File

8
 import { getCodeMessage, putRegisterConsultant } from '@services/getCode'
8
 import { getCodeMessage, putRegisterConsultant } from '@services/getCode'
9
 import * as actions from '@actions/user'
9
 import * as actions from '@actions/user'
10
 import Authorize from '@components/authorize'
10
 import Authorize from '@components/authorize'
11
-import { getThumbnail } from '@utils/tools'
11
+import { transferImage } from '@utils/tools'
12
 import { menus } from './menus'
12
 import { menus } from './menus'
13
 
13
 
14
 @connect(({ user, city }) => ({ user, city }), { ...actions })
14
 @connect(({ user, city }) => ({ user, city }), { ...actions })
169
       <View className="person">
169
       <View className="person">
170
         <Notice></Notice>
170
         <Notice></Notice>
171
         <View className="info">
171
         <View className="info">
172
-          <Image className="bg" src={getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/mine/background.png')} mode='aspectFill'></Image>
172
+          <Image className="bg" src={transferImage('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/mine/background.png')} mode='aspectFill'></Image>
173
           <View className="content">
173
           <View className="content">
174
             <View className="info-block">
174
             <View className="info-block">
175
               <View className="avatar" onClick={this.goPersonDetail}>
175
               <View className="avatar" onClick={this.goPersonDetail}>

+ 3
- 2
src/pages/person/profile/detail/index.js View File

6
 import { getProfileDetail, editDocumentVerify } from '@services/user'
6
 import { getProfileDetail, editDocumentVerify } from '@services/user'
7
 
7
 
8
 import { uploadFiles } from '@utils/request'
8
 import { uploadFiles } from '@utils/request'
9
+import { transferImage } from '@utils/tools'
9
 
10
 
10
 import "taro-ui/dist/style/components/image-picker.scss";
11
 import "taro-ui/dist/style/components/image-picker.scss";
11
 import "taro-ui/dist/style/components/icon.scss";
12
 import "taro-ui/dist/style/components/icon.scss";
175
                     return (
176
                     return (
176
                       <View className="image-con" key={`img-${inx}`}>
177
                       <View className="image-con" key={`img-${inx}`}>
177
                         <Image className="close-btn" src={closeImg} onClick={this.deleteImg.bind(this, (inx))} />
178
                         <Image className="close-btn" src={closeImg} onClick={this.deleteImg.bind(this, (inx))} />
178
-                        <Image className="img" src={item.img} onClick={this.onPreview.bind(this, (item))} />
179
+                        <Image className="img" src={transferImage(item.img)} onClick={this.onPreview.bind(this, (item))} />
179
                       </View>
180
                       </View>
180
                     )
181
                     )
181
                   })
182
                   })
201
                   imgList.map((item, inx) => {
202
                   imgList.map((item, inx) => {
202
                     return (
203
                     return (
203
                       <View className="image-con" key={`img-${inx}`}>
204
                       <View className="image-con" key={`img-${inx}`}>
204
-                        <Image className="img" src={item.img} onClick={this.onPreview.bind(this, (item))} />
205
+                        <Image className="img" src={transferImage(item.img)} onClick={this.onPreview.bind(this, (item))} />
205
                       </View>
206
                       </View>
206
                     )
207
                     )
207
                   })
208
                   })

+ 2
- 1
src/pages/person/profile/index.js View File

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

+ 2
- 1
src/pages/policy/detail/index.js View File

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

+ 2
- 1
src/pages/policy/item/index.js View File

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

+ 2
- 2
src/pages/project/album/index.js View File

4
 import { connect } from '@tarojs/redux'
4
 import { connect } from '@tarojs/redux'
5
 import * as actions from '@actions/project'
5
 import * as actions from '@actions/project'
6
 import { savePoint, updatePoint } from '@services/common'
6
 import { savePoint, updatePoint } from '@services/common'
7
-import { getThumbnail } from '@utils/tools'
7
+import { transferImage } from '@utils/tools'
8
 
8
 
9
 
9
 
10
 @connect(state => state.project, { ...actions })
10
 @connect(state => state.project, { ...actions })
98
           {imgList.map((item, index) => {
98
           {imgList.map((item, index) => {
99
             console.log(item, '299999933333222')
99
             console.log(item, '299999933333222')
100
             return (
100
             return (
101
-              <Image className='photos__item-img' src={getThumbnail(item.url)} mode='aspectFill' onClick={this.previewImage.bind(this, item.url, _photosImgs)}></Image>
101
+              <Image className='photos__item-img' src={transferImage(item.url)} mode='aspectFill' onClick={this.previewImage.bind(this, item.url, _photosImgs)}></Image>
102
             )
102
             )
103
           })}
103
           })}
104
         </View>
104
         </View>

+ 1
- 1
src/pages/project/banner/index.js View File

3
 // import { cdn } from '@constants/api'
3
 // import { cdn } from '@constants/api'
4
 import './index.scss'
4
 import './index.scss'
5
 import emptyImg from '@assets/empty.png'
5
 import emptyImg from '@assets/empty.png'
6
-import { getThumbnail, resizeImage } from '@utils/tools'
6
+import { transferImage, resizeImage } from '@utils/tools'
7
 
7
 
8
 export default class SwiperBanner extends Component {
8
 export default class SwiperBanner extends Component {
9
   static defaultProps = {
9
   static defaultProps = {

+ 9
- 9
src/pages/project/detail/index.js View File

21
 import 'dayjs/locale/zh-cn' // 按需加载
21
 import 'dayjs/locale/zh-cn' // 按需加载
22
 import ready from '@utils/ready'
22
 import ready from '@utils/ready'
23
 import Notice from '@components/Notice'
23
 import Notice from '@components/Notice'
24
-import { getDownloadURL, getThumbnail, sceneInShare } from '@utils/tools'
24
+import { getDownloadURL, transferImage, sceneInShare } from '@utils/tools'
25
 import { connect } from '@tarojs/redux'
25
 import { connect } from '@tarojs/redux'
26
 import { dispatchProjectDetail } from '@actions/project'
26
 import { dispatchProjectDetail } from '@actions/project'
27
 import getUserPhone from '@utils/getUserPhone'
27
 import getUserPhone from '@utils/getUserPhone'
406
       })
406
       })
407
     } else {
407
     } else {
408
       Taro.navigateTo({
408
       Taro.navigateTo({
409
-        url: `/pages/agent/recommend/index`
409
+        url: `/pages/agent/recommend/index?type=projectDeatil` 
410
       })
410
       })
411
     }
411
     }
412
   }
412
   }
561
               <View className="type-intro__list">
561
               <View className="type-intro__list">
562
                 {
562
                 {
563
                   buildingProjectType.map(item => (
563
                   buildingProjectType.map(item => (
564
-                    <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%;`}>
564
+                    <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%;`}>
565
 
565
 
566
                       <View >
566
                       <View >
567
 
567
 
646
                         >
646
                         >
647
 
647
 
648
                           <View>
648
                           <View>
649
-                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} onClick={() => this.toViewAlbum(index)}></Image>
649
+                            <Image className='albumimg' src={transferImage(buildingImgList[0].url)} onClick={() => this.toViewAlbum(index)}></Image>
650
                             <View style={{ width: '218rpx', display: 'flex', justifyContent: 'center' }} >
650
                             <View style={{ width: '218rpx', display: 'flex', justifyContent: 'center' }} >
651
                               <View style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
651
                               <View style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
652
                               <View> ({buildingImgList.length})</View>
652
                               <View> ({buildingImgList.length})</View>
723
                   consultants.slice(0, 3).map(item => (
723
                   consultants.slice(0, 3).map(item => (
724
                     <View className="item" key={item.id} onClick={this.handleConsuItemClick.bind(this, item)}>
724
                     <View className="item" key={item.id} onClick={this.handleConsuItemClick.bind(this, item)}>
725
                       <View className="flex">
725
                       <View className="flex">
726
-                        <Image className="avatar" mode="aspectFill" src={getThumbnail(item.photo || item.avatar)}></Image>
726
+                        <Image className="avatar" mode="aspectFill" src={transferImage(item.photo || item.avatar)}></Image>
727
                         <View className='name-txt'>
727
                         <View className='name-txt'>
728
                           <Text className="name">{item.userName}</Text>
728
                           <Text className="name">{item.userName}</Text>
729
                           <Text className='txt'>{item.description || ' '}</Text>
729
                           <Text className='txt'>{item.description || ' '}</Text>
844
                       {
844
                       {
845
                         item && (
845
                         item && (
846
                           <View className='house__img-info'>
846
                           <View className='house__img-info'>
847
-                            <Image className='house__img' src={getThumbnail(item.buildingImgList[0].url)} mode="widthFix" onClick={this.handlePreviewHxImage.bind(this, item.buildingImgList[0].url, imgUrls)}></Image>
847
+                            <Image className='house__img' src={transferImage(item.buildingImgList[0].url)} mode="widthFix" onClick={this.handlePreviewHxImage.bind(this, item.buildingImgList[0].url, imgUrls)}></Image>
848
                             <View className='house-type__state' style={`background-color: ${statusBgColors[item.marketStatus - 1]}`}>{statusOpts[item.marketStatus - 1]}</View>
848
                             <View className='house-type__state' style={`background-color: ${statusBgColors[item.marketStatus - 1]}`}>{statusOpts[item.marketStatus - 1]}</View>
849
                           </View>
849
                           </View>
850
                         )
850
                         )
924
                   {
924
                   {
925
                     newsList.map(item => (
925
                     newsList.map(item => (
926
                       <View className="news-item" key={item.newsId} onClick={this.handNewsItemClick.bind(this, item.newsId)}>
926
                       <View className="news-item" key={item.newsId} onClick={this.handNewsItemClick.bind(this, item.newsId)}>
927
-                        <Image src={getThumbnail(item.newsImg)} mode="aspectFill" className="news-item__pic"></Image>
927
+                        <Image src={transferImage(item.newsImg)} mode="aspectFill" className="news-item__pic"></Image>
928
                         <View className="news-item__title">{item.newsName}</View>
928
                         <View className="news-item__title">{item.newsName}</View>
929
                       </View>
929
                       </View>
930
                     ))
930
                     ))
1001
         <Video
1001
         <Video
1002
           src={projectDetail.videoUrl}
1002
           src={projectDetail.videoUrl}
1003
           // src='http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400'
1003
           // src='http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400'
1004
-          poster={getThumbnail(imgSrc)}
1004
+          poster={transferImage(imgSrc)}
1005
           // poster='http://misc.aotu.io/booxood/mobile-video/cover_900x500.jpg'
1005
           // poster='http://misc.aotu.io/booxood/mobile-video/cover_900x500.jpg'
1006
           style={{
1006
           style={{
1007
             height: '600rpx',
1007
             height: '600rpx',
1165
                         <View className='top__txt'>{projectDetail.pvNum || 0}人围观</View>
1165
                         <View className='top__txt'>{projectDetail.pvNum || 0}人围观</View>
1166
                         <View className='bottom__img' onClick={this.onViewFans.bind(this)}>
1166
                         <View className='bottom__img' onClick={this.onViewFans.bind(this)}>
1167
                           <View className="records">
1167
                           <View className="records">
1168
-                            {records.slice(0, 9).map(item => <Image src={item.photoOravatar} className='user__img' key={item.personId} />)}
1168
+                            {records.slice(0, 9).map(item => <Image src={transferImage(item.photoOravatar)} className='user__img' key={item.personId} />)}
1169
                             {records.length > 9 && <Text> ···</Text>}
1169
                             {records.length > 9 && <Text> ···</Text>}
1170
                           </View>
1170
                           </View>
1171
 
1171
 

+ 2
- 2
src/pages/project/index.js View File

17
 import { ROLE_CODE } from '@constants/user'
17
 import { ROLE_CODE } from '@constants/user'
18
 import { connect } from '@tarojs/redux'
18
 import { connect } from '@tarojs/redux'
19
 import * as actions from '@actions/project'
19
 import * as actions from '@actions/project'
20
-import { getThumbnail } from '@utils/tools'
20
+import { transferImage } from '@utils/tools'
21
 import QQMapWX from '@lib/qqmap-wx-jssdk.min'
21
 import QQMapWX from '@lib/qqmap-wx-jssdk.min'
22
 import Notice from '@components/Notice'
22
 import Notice from '@components/Notice'
23
 import Authorize from '@components/authorize'
23
 import Authorize from '@components/authorize'
511
           <Image
511
           <Image
512
             mode="widthFix"
512
             mode="widthFix"
513
             className="img"
513
             className="img"
514
-            src={getThumbnail(maskBanner.image)}
514
+            src={transferImage(maskBanner.image)}
515
             onClick={this.handleMaskBannerClick.bind(this, maskBanner)}>
515
             onClick={this.handleMaskBannerClick.bind(this, maskBanner)}>
516
           </Image>
516
           </Image>
517
           <Icon className="iconfont close icon-buoumaotubiao20" onClick={this.handleMaskClose}></Icon>
517
           <Icon className="iconfont close icon-buoumaotubiao20" onClick={this.handleMaskClose}></Icon>

+ 4
- 4
src/pages/project/item/index.js View File

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import './index.scss'
2
 import './index.scss'
3
-import { getThumbnail } from '@utils/tools'
3
+import { transferImage } from '@utils/tools'
4
 
4
 
5
 const dotImg = require('@assets/dot.png')
5
 const dotImg = require('@assets/dot.png')
6
 
6
 
26
       <View className='item' onClick={onClick.bind(this, data)}>
26
       <View className='item' onClick={onClick.bind(this, data)}>
27
         <View className='item__top'>
27
         <View className='item__top'>
28
           {console.log(data, 'data')}
28
           {console.log(data, 'data')}
29
-          <Image className='item__img' mode="aspectFill" src={getThumbnail(imgSrc)}></Image>
29
+          <Image className='item__img' mode="aspectFill" src={transferImage(imgSrc)}></Image>
30
           {data.marketStatus &&
30
           {data.marketStatus &&
31
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}
31
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}
32
           <View className='item__right'>
32
           <View className='item__right'>
56
             <View className='item__bottom__right'>
56
             <View className='item__bottom__right'>
57
               <Text className='item__bottom__seenum'>{data.pvNum || 0}人围观</Text>
57
               <Text className='item__bottom__seenum'>{data.pvNum || 0}人围观</Text>
58
               <View className='see__img'>
58
               <View className='see__img'>
59
-                {records.slice(0, 4).map(item => <Image className='userImg' key={item.uvId} src={getThumbnail(item.photoOravatar)}></Image>)}
60
-                {records.length > 4 && <Image className="dot-img" src={getThumbnail(dotImg)}></Image>}
59
+                {records.slice(0, 4).map(item => <Image className='userImg' key={item.uvId} src={transferImage(item.photoOravatar)}></Image>)}
60
+                {records.length > 4 && <Image className="dot-img" src={transferImage(dotImg)}></Image>}
61
               </View>
61
               </View>
62
             </View>
62
             </View>
63
           )}
63
           )}

+ 2
- 2
src/pages/project/swiper/index.js View File

3
 // import { cdn } from '@constants/api'
3
 // import { cdn } from '@constants/api'
4
 import './index.scss'
4
 import './index.scss'
5
 import emptyImg from '@assets/empty.png'
5
 import emptyImg from '@assets/empty.png'
6
-import { getThumbnail } from '@utils/tools'
6
+import { transferImage } from '@utils/tools'
7
 
7
 
8
 export default class SwiperBanner extends Component {
8
 export default class SwiperBanner extends Component {
9
   static defaultProps = {
9
   static defaultProps = {
48
                   mode="aspectFill"
48
                   mode="aspectFill"
49
                   style={style}
49
                   style={style}
50
                   className='home-banner__swiper-item-img'
50
                   className='home-banner__swiper-item-img'
51
-                  src={getThumbnail(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || emptyImg)}
51
+                  src={transferImage(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || emptyImg)}
52
                 />
52
                 />
53
                 {type=='activity' && <View className='home-banner__swiper-item__title'> {item.title}</View>}
53
                 {type=='activity' && <View className='home-banner__swiper-item__title'> {item.title}</View>}
54
               </View>
54
               </View>

+ 2
- 2
src/pages/shop/banner/index.js View File

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

+ 2
- 2
src/pages/shop/detail/index.js View File

5
 import * as actions from '@actions/shop'
5
 import * as actions from '@actions/shop'
6
 import WxParse from '@components/wxParse/wxParse'
6
 import WxParse from '@components/wxParse/wxParse'
7
 
7
 
8
-import { getThumbnail } from '@utils/tools'
8
+import { transferImage } from '@utils/tools'
9
 
9
 
10
 let hasClick = true
10
 let hasClick = true
11
 @connect(state => state.shop, { ...actions })
11
 @connect(state => state.shop, { ...actions })
91
             paddingBottom: `${this.state.visibleExcBtn ? '100rpx' : ''}`
91
             paddingBottom: `${this.state.visibleExcBtn ? '100rpx' : ''}`
92
           }}>
92
           }}>
93
           <View className="detail__head">
93
           <View className="detail__head">
94
-            <Image src={getThumbnail(goodsDetail.detailImgUrl || goodsDetail.imgUrl)} mode="widthFix" className="detail__head-pic"></Image>
94
+            <Image src={transferImage(goodsDetail.detailImgUrl || goodsDetail.imgUrl)} mode="widthFix" className="detail__head-pic"></Image>
95
             <Image src={require('@assets/shop/hot.png')} className="detail__head-hot" />
95
             <Image src={require('@assets/shop/hot.png')} className="detail__head-hot" />
96
           </View>
96
           </View>
97
 
97
 

+ 4
- 4
src/pages/shop/index.js View File

3
 import { AtTabs, AtTabsPane } from 'taro-ui'
3
 import { AtTabs, AtTabsPane } from 'taro-ui'
4
 import "taro-ui/dist/style/components/tabs.scss"
4
 import "taro-ui/dist/style/components/tabs.scss"
5
 import './index.scss'
5
 import './index.scss'
6
-import { getThumbnail } from '@utils/tools'
6
+import { transferImage } from '@utils/tools'
7
 // import Search from '@components/search'
7
 // import Search from '@components/search'
8
 import Banner from './banner'
8
 import Banner from './banner'
9
 import ready from '@utils/ready'
9
 import ready from '@utils/ready'
264
 
264
 
265
                 <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
265
                 <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
266
                   {console.log(item, '--item---')}
266
                   {console.log(item, '--item---')}
267
-                  <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
267
+                  <Image className="item__img" mode="aspectFill" src={transferImage(item.imgUrl)} />
268
                   <View className="item__title">{item.goodsName}</View>
268
                   <View className="item__title">{item.goodsName}</View>
269
                   <View className="item__des">
269
                   <View className="item__des">
270
                     <View>
270
                     <View>
297
                     {goodsList.length &&
297
                     {goodsList.length &&
298
                       goodsList.map(item => (
298
                       goodsList.map(item => (
299
                         <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
299
                         <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
300
-                          <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
300
+                          <Image className="item__img" mode="aspectFill" src={transferImage(item.imgUrl)} />
301
                           <View className="item__title">{item.goodsName}</View>
301
                           <View className="item__title">{item.goodsName}</View>
302
                           <View className="item__des">
302
                           <View className="item__des">
303
                             <View>
303
                             <View>
347
           }}>
347
           }}>
348
           <View className="user_box">
348
           <View className="user_box">
349
             <View className="user_con">
349
             <View className="user_con">
350
-              <Image className="bg" src={getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
350
+              <Image className="bg" src={transferImage('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
351
               <Image className="user__left__headimg" src={person.avatarurl} />
351
               <Image className="user__left__headimg" src={person.avatarurl} />
352
               <View className='user__left__name'>{person.nickname}</View>
352
               <View className='user__left__name'>{person.nickname}</View>
353
               {
353
               {

+ 2
- 1
src/pages/shop/record/index.js View File

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