xujing 5 years ago
parent
commit
c0c6109ac6

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

@@ -252,13 +252,11 @@ export default class transactionCustomer extends Taro.Component {
252 252
   handleChatClick(item, e) {
253 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 256
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true))[0].tplId
258 257
     wx.requestSubscribeMessage({
259 258
       tmplIds: [tplId],
260 259
       success(res) {
261
-
262 260
       },
263 261
       fail(res) {
264 262
 

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

@@ -368,19 +368,15 @@ export default class myCustomer extends Taro.Component {
368 368
   }
369 369
   handleChatClick(item, e) {
370 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 373
     wx.requestSubscribeMessage({
376 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 380
         Taro.navigateTo({
385 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 View File

@@ -89,11 +89,24 @@ export default class transactionCustomer extends Taro.Component {
89 89
   }
90 90
   handleChatClick(item, e) {
91 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 110
   render() {
98 111
     const { customerList, isEmpty, hasMore } = this.state
99 112
 

+ 7
- 6
src/pages/person/myShare/index.js View File

@@ -4,6 +4,7 @@ import { connect } from '@tarojs/redux'
4 4
 import './index.scss'
5 5
 import { getSharePersonList } from '@services/person'
6 6
 import { savePoint, updatePoint } from '@services/common'
7
+import { transferImage} from '@utils/tools'
7 8
 import dayjs from 'dayjs';
8 9
 
9 10
 @connect(state => state.user)
@@ -101,7 +102,7 @@ export default class Person extends Component {
101 102
   renderBuilding(item) {
102 103
     return (
103 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 106
         <View className="name">{item.buildingName}</View>
106 107
         <View className="price"> {item.price ? item.price : ''} </View>
107 108
         <View className="num"> {item.buildingNum?item.buildingNum:'0'}人查看了分享 </View>
@@ -113,7 +114,7 @@ export default class Person extends Component {
113 114
   renderH5(item) {
114 115
     return (
115 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 118
         <View className="name">{item.drainageName}</View>
118 119
         <View className="num"> {item.drainageShareNum?item.drainageShareNum:'0'}人查看了分享 </View>
119 120
       </View>
@@ -123,7 +124,7 @@ export default class Person extends Component {
123 124
   renderGroup(item) {
124 125
     return (
125 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 128
         <View className="name">{item.groupActivityName}</View>
128 129
         <View className="num"> {item.groupActivityShareNum?item.groupActivityShareNum:'0'}人查看了分享 </View>
129 130
       </View>
@@ -133,7 +134,7 @@ export default class Person extends Component {
133 134
   renderHelp(item) {
134 135
     return (
135 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 138
         <View className="name">{item.helpActivityName}</View>
138 139
         <View className="num"> {item.helpActivityShareNum?item.helpActivityShareNum:'0'}人查看了分享 </View>
139 140
       </View>
@@ -143,7 +144,7 @@ export default class Person extends Component {
143 144
   renderNews(item) {
144 145
     return (
145 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 148
         <View className="name">{item.newsName}</View>
148 149
         <View className="num"> {item.newsNum?item.newsNum:'0'}人查看了分享 </View>
149 150
       </View>
@@ -153,7 +154,7 @@ export default class Person extends Component {
153 154
   renderActivity(item) {
154 155
     return (
155 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 158
         <View className="name">{item.activityName}</View>
158 159
         <View className="num"> {item.activityShareNum?item.activityShareNum:'0'}人查看了分享 </View>
159 160
       </View>

+ 1
- 1
src/pages/person/myShare/index.scss View File

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

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

@@ -59,7 +59,7 @@ export default class SwiperBanner extends Component {
59 59
                                     {(item.type == 'help' || item.type == 'group') &&
60 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 63
                                     <View className="title">{item.title}</View>
64 64
                                     <View className="time">参与截止时间</View>
65 65
                                     <View className="time">{dayjs(item.endDate).format('YYYY-MM-DD HH:mm:ss')}</View>

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

@@ -3,7 +3,7 @@ import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
3 3
 // import { cdn } from '@constants/api'
4 4
 import './index.scss'
5 5
 import emptyImg from '@assets/empty.png'
6
-import { transferImage, resizeImage } from '@utils/tools'
6
+import { transferImage} from '@utils/tools'
7 7
 
8 8
 export default class SwiperBanner extends Component {
9 9
   static defaultProps = {
@@ -54,10 +54,10 @@ export default class SwiperBanner extends Component {
54 54
               className='home-banner__swiper-item'
55 55
             >
56 56
               <Image
57
-                mode="widthFix"
57
+                mode="aspectFill"
58 58
                 style={style}
59 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 62
             </SwiperItem>
63 63
           ))}

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

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