xujing 5 年前
父节点
当前提交
c0c6109ac6

+ 1
- 3
src/pages/person/customerAnalysis/followUpCustomer/index.js 查看文件

252
   handleChatClick(item, e) {
252
   handleChatClick(item, e) {
253
     e.stopPropagation()
253
     e.stopPropagation()
254
 
254
 
255
-    const { userInfo: { person: { personId, nickname, name } } } = this.props
256
-    const { userInfo: { miniApp: { tpls } } } = this.props
255
+    const { user: { userInfo: { miniApp: { tpls }, person: { personId, nickname, name } } } } = this.props
257
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true))[0].tplId
256
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true))[0].tplId
258
     wx.requestSubscribeMessage({
257
     wx.requestSubscribeMessage({
259
       tmplIds: [tplId],
258
       tmplIds: [tplId],
260
       success(res) {
259
       success(res) {
261
-
262
       },
260
       },
263
       fail(res) {
261
       fail(res) {
264
 
262
 

+ 5
- 9
src/pages/person/customerAnalysis/myCustomer.js 查看文件

368
   }
368
   }
369
   handleChatClick(item, e) {
369
   handleChatClick(item, e) {
370
     e.stopPropagation()
370
     e.stopPropagation()
371
-
372
-    const { userInfo: { person: { personId, nickname, name } } } = this.props
373
-    const { userInfo: {miniApp:{tpls}}} = this.props
374
-    const tplId=(tpls.filter(x => x.tplType == noticeType.TPL_NOTICE&&x.isSubscribe == true))[0].tplId
371
+    const { user: { userInfo: { miniApp: { tpls }, person: { personId, nickname, name } } } } = this.props
372
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true))[0].tplId
375
     wx.requestSubscribeMessage({
373
     wx.requestSubscribeMessage({
376
       tmplIds: [tplId],
374
       tmplIds: [tplId],
377
-      success (res) {
378
-
375
+      success(res) {
379
       },
376
       },
380
-      fail(res){
381
-
377
+      fail(res) {
382
       },
378
       },
383
-      complete(){
379
+      complete() {
384
         Taro.navigateTo({
380
         Taro.navigateTo({
385
           url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
381
           url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
386
         })
382
         })

+ 16
- 3
src/pages/person/customerAnalysis/transactionCustomer/index.js 查看文件

89
   }
89
   }
90
   handleChatClick(item, e) {
90
   handleChatClick(item, e) {
91
     e.stopPropagation()
91
     e.stopPropagation()
92
-    const { userInfo: { person: { personId, nickname, name } } } = this.props
93
-    Taro.navigateTo({
94
-      url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
92
+
93
+    const { user: { userInfo: { miniApp: { tpls }, person: { personId, nickname, name } } } } = this.props
94
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true))[0].tplId
95
+    wx.requestSubscribeMessage({
96
+      tmplIds: [tplId],
97
+      success(res) {
98
+      },
99
+      fail(res) {
100
+
101
+      },
102
+      complete() {
103
+        Taro.navigateTo({
104
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
105
+        })
106
+      }
95
     })
107
     })
96
   }
108
   }
109
+
97
   render() {
110
   render() {
98
     const { customerList, isEmpty, hasMore } = this.state
111
     const { customerList, isEmpty, hasMore } = this.state
99
 
112
 

+ 7
- 6
src/pages/person/myShare/index.js 查看文件

4
 import './index.scss'
4
 import './index.scss'
5
 import { getSharePersonList } from '@services/person'
5
 import { getSharePersonList } from '@services/person'
6
 import { savePoint, updatePoint } from '@services/common'
6
 import { savePoint, updatePoint } from '@services/common'
7
+import { transferImage} from '@utils/tools'
7
 import dayjs from 'dayjs';
8
 import dayjs from 'dayjs';
8
 
9
 
9
 @connect(state => state.user)
10
 @connect(state => state.user)
101
   renderBuilding(item) {
102
   renderBuilding(item) {
102
     return (
103
     return (
103
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
104
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
104
-        <Image className="img" src={item.drainageImg}></Image>
105
+        <Image className="img" src={transferImage(item.drainageImg)}></Image>
105
         <View className="name">{item.buildingName}</View>
106
         <View className="name">{item.buildingName}</View>
106
         <View className="price"> {item.price ? item.price : ''} </View>
107
         <View className="price"> {item.price ? item.price : ''} </View>
107
         <View className="num"> {item.buildingNum?item.buildingNum:'0'}人查看了分享 </View>
108
         <View className="num"> {item.buildingNum?item.buildingNum:'0'}人查看了分享 </View>
113
   renderH5(item) {
114
   renderH5(item) {
114
     return (
115
     return (
115
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
116
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
116
-        <Image className="img" src={item.drainageImg}></Image>
117
+        <Image className="img" src={transferImage(item.drainageImg)}></Image>
117
         <View className="name">{item.drainageName}</View>
118
         <View className="name">{item.drainageName}</View>
118
         <View className="num"> {item.drainageShareNum?item.drainageShareNum:'0'}人查看了分享 </View>
119
         <View className="num"> {item.drainageShareNum?item.drainageShareNum:'0'}人查看了分享 </View>
119
       </View>
120
       </View>
123
   renderGroup(item) {
124
   renderGroup(item) {
124
     return (
125
     return (
125
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
126
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
126
-        <Image className="img" src={item.groupActivityImg}></Image>
127
+        <Image className="img" src={transferImage(item.groupActivityImg)}></Image>
127
         <View className="name">{item.groupActivityName}</View>
128
         <View className="name">{item.groupActivityName}</View>
128
         <View className="num"> {item.groupActivityShareNum?item.groupActivityShareNum:'0'}人查看了分享 </View>
129
         <View className="num"> {item.groupActivityShareNum?item.groupActivityShareNum:'0'}人查看了分享 </View>
129
       </View>
130
       </View>
133
   renderHelp(item) {
134
   renderHelp(item) {
134
     return (
135
     return (
135
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
136
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
136
-        <Image className="img" src={item.helpActivityImg}></Image>
137
+        <Image className="img" src={transferImage(item.helpActivityImg)}></Image>
137
         <View className="name">{item.helpActivityName}</View>
138
         <View className="name">{item.helpActivityName}</View>
138
         <View className="num"> {item.helpActivityShareNum?item.helpActivityShareNum:'0'}人查看了分享 </View>
139
         <View className="num"> {item.helpActivityShareNum?item.helpActivityShareNum:'0'}人查看了分享 </View>
139
       </View>
140
       </View>
143
   renderNews(item) {
144
   renderNews(item) {
144
     return (
145
     return (
145
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
146
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
146
-        <Image className="img" src={item.newsImg}></Image>
147
+        <Image className="img" src={transferImage(item.newsImg)}></Image>
147
         <View className="name">{item.newsName}</View>
148
         <View className="name">{item.newsName}</View>
148
         <View className="num"> {item.newsNum?item.newsNum:'0'}人查看了分享 </View>
149
         <View className="num"> {item.newsNum?item.newsNum:'0'}人查看了分享 </View>
149
       </View>
150
       </View>
153
   renderActivity(item) {
154
   renderActivity(item) {
154
     return (
155
     return (
155
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
156
       <View className="share-item" onClick={this.handleItemClick.bind(this, item.targetId)}>
156
-        <Image className="img" src={item.activityImg}></Image>
157
+        <Image className="img" src={transferImage(item.activityImg)}></Image>
157
         <View className="name">{item.activityName}</View>
158
         <View className="name">{item.activityName}</View>
158
         <View className="num"> {item.activityShareNum?item.activityShareNum:'0'}人查看了分享 </View>
159
         <View className="num"> {item.activityShareNum?item.activityShareNum:'0'}人查看了分享 </View>
159
       </View>
160
       </View>

+ 1
- 1
src/pages/person/myShare/index.scss 查看文件

79
           font-size: 40px;
79
           font-size: 40px;
80
           color: #000;
80
           color: #000;
81
           font-weight: 500;
81
           font-weight: 500;
82
-          max-width: 300px;
82
+          width: 300px;
83
           @include text-ellipsis;
83
           @include text-ellipsis;
84
           margin-right: 24px;
84
           margin-right: 24px;
85
         }
85
         }

+ 1
- 1
src/pages/project/activity/index.js 查看文件

59
                                     {(item.type == 'help' || item.type == 'group') &&
59
                                     {(item.type == 'help' || item.type == 'group') &&
60
                                         <View className={item.type == 'help' ? 'type' : 'type2'}>{item.type == 'help' ? '助力' : '拼团'}</View>
60
                                         <View className={item.type == 'help' ? 'type' : 'type2'}>{item.type == 'help' ? '助力' : '拼团'}</View>
61
                                     }
61
                                     }
62
-                                    <Image className="img" src={transferImage(item.img)}></Image>
62
+                                    <Image className="img" mode="aspectFill" src={transferImage(item.img)}></Image>
63
                                     <View className="title">{item.title}</View>
63
                                     <View className="title">{item.title}</View>
64
                                     <View className="time">参与截止时间</View>
64
                                     <View className="time">参与截止时间</View>
65
                                     <View className="time">{dayjs(item.endDate).format('YYYY-MM-DD HH:mm:ss')}</View>
65
                                     <View className="time">{dayjs(item.endDate).format('YYYY-MM-DD HH:mm:ss')}</View>

+ 3
- 3
src/pages/project/banner/index.js 查看文件

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 { transferImage, resizeImage } 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 = {
54
               className='home-banner__swiper-item'
54
               className='home-banner__swiper-item'
55
             >
55
             >
56
               <Image
56
               <Image
57
-                mode="widthFix"
57
+                mode="aspectFill"
58
                 style={style}
58
                 style={style}
59
                 className='home-banner__swiper-item-img'
59
                 className='home-banner__swiper-item-img'
60
-                src={resizeImage(item.image || item.url || item.img || emptyImg)}
60
+                src={transferImage(item.image || item.url || item.img || emptyImg)}
61
               />
61
               />
62
             </SwiperItem>
62
             </SwiperItem>
63
           ))}
63
           ))}

+ 2
- 1
src/pages/project/swiper/index.js 查看文件

4
 import './index.scss'
4
 import './index.scss'
5
 import emptyImg from '@assets/empty.png'
5
 import emptyImg from '@assets/empty.png'
6
 import { transferImage } from '@utils/tools'
6
 import { transferImage } from '@utils/tools'
7
+const forwardImg = require('@assets/index/forward.png')
7
 
8
 
8
 export default class SwiperBanner extends Component {
9
 export default class SwiperBanner extends Component {
9
   static defaultProps = {
10
   static defaultProps = {
47
                 {
48
                 {
48
                   forwardShow &&
49
                   forwardShow &&
49
                   <View>
50
                   <View>
50
-                    <Image className='forward' src={require('@assets/index/forward.png')}></Image>
51
+                    <Image className='forward' src={forwardImg}></Image>
51
                     <Text className="text">详情</Text>
52
                     <Text className="text">详情</Text>
52
                   </View>
53
                   </View>
53
                 }
54
                 }