Browse Source

ruleToast

xujing 5 years ago
parent
commit
016f34f25b

+ 6
- 6
src/app.js View File

28
 import { UPDATE_PRELOAD } from '@/constants/common'
28
 import { UPDATE_PRELOAD } from '@/constants/common'
29
 import ready from '@/utils/ready'
29
 import ready from '@/utils/ready'
30
 import login from '@/utils/login'
30
 import login from '@/utils/login'
31
-import store  from './store'
31
+import store from './store'
32
 import socket from '@/utils/im'
32
 import socket from '@/utils/im'
33
 
33
 
34
 // const store = configStore()
34
 // const store = configStore()
107
 
107
 
108
       'pages/checkin/index',
108
       'pages/checkin/index',
109
       'pages/checkin/checkinsuccess/index',
109
       'pages/checkin/checkinsuccess/index',
110
-     
110
+
111
 
111
 
112
     ],
112
     ],
113
     window: {
113
     window: {
187
 
187
 
188
     socket.reconnect()
188
     socket.reconnect()
189
   }
189
   }
190
-  
190
+
191
   componentDidMount() {
191
   componentDidMount() {
192
     // console.info('app componentDidMount')
192
     // console.info('app componentDidMount')
193
   }
193
   }
200
     this.initData()
200
     this.initData()
201
   }
201
   }
202
 
202
 
203
-  wxPreloadData () {
203
+  wxPreloadData() {
204
     wx.setBackgroundFetchToken()
204
     wx.setBackgroundFetchToken()
205
     wx.getBackgroundFetchData({
205
     wx.getBackgroundFetchData({
206
       fetchType: 'pre',
206
       fetchType: 'pre',
214
     })
214
     })
215
   }
215
   }
216
 
216
 
217
-  initData () {
217
+  initData() {
218
     // console.info('app componentDidShow')
218
     // console.info('app componentDidShow')
219
     console.info('router1', this.$router)
219
     console.info('router1', this.$router)
220
     console.info('ready status1', ready)
220
     console.info('ready status1', ready)
298
 
298
 
299
         resolve(router)
299
         resolve(router)
300
       }
300
       }
301
-      
301
+
302
     })
302
     })
303
   }
303
   }
304
   // 在 App 类中的 render() 函数没有实际作用
304
   // 在 App 类中的 render() 函数没有实际作用

+ 8
- 4
src/components/achievePhone/index.js View File

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import getUserPhone from '@/utils/getUserPhone'
2
 import getUserPhone from '@/utils/getUserPhone'
3
 import './index.scss'
3
 import './index.scss'
4
-
4
+import { rule as ruleToast } from '@/utils/ruleToast'
5
 const grantIcon = require('@/assets/helpgroup/shouquan.png')
5
 const grantIcon = require('@/assets/helpgroup/shouquan.png')
6
 const logoImg = require('@/assets/index/logo.png')
6
 const logoImg = require('@/assets/index/logo.png')
7
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
7
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
31
 
31
 
32
         return
32
         return
33
       } else {
33
       } else {
34
-        if (typeof this.props.onSuccess === 'function') {
35
-          this.props.onSuccess(phoneNumber);
36
-        }
34
+        ruleToast('signup-agent')
35
+        setTimeout(() => {
36
+          if (typeof this.props.onSuccess === 'function') {
37
+            this.props.onSuccess(phoneNumber);
38
+          }
39
+        }, 700)
40
+
37
       }
41
       }
38
     })
42
     })
39
   }
43
   }

+ 16
- 11
src/components/authorize/index.js View File

4
 import './index.scss'
4
 import './index.scss'
5
 import getUserPhone from '@/utils/getUserPhone'
5
 import getUserPhone from '@/utils/getUserPhone'
6
 import { queryUserInfo, doUserSignin } from '@/services/user'
6
 import { queryUserInfo, doUserSignin } from '@/services/user'
7
+import { rule as ruleToast } from '@/utils/ruleToast'
7
 
8
 
8
 @connect(state => state.user, { ...actions })
9
 @connect(state => state.user, { ...actions })
9
 export default class Index extends Component {
10
 export default class Index extends Component {
26
         })
27
         })
27
         return
28
         return
28
       } else {
29
       } else {
29
-        this.props.dispatchUpdateUserInfoNew(this.state.user.id)
30
-        console.log(this.props.from,"this.props.from")
31
-        if (this.props.from) {
32
-          Taro.reLaunch({
33
-            url: this.props.from
34
-          })
35
-        } else {
36
-          Taro.reLaunch({
37
-            url: '/pages/person/index'
38
-          })
39
-        }
30
+        ruleToast('signup-agent')
31
+        setTimeout(() => {
32
+          this.props.dispatchUpdateUserInfoNew(this.state.user.id)
33
+          console.log(this.props.from, "this.props.from")
34
+          if (this.props.from) {
35
+            Taro.reLaunch({
36
+              url: this.props.from
37
+            })
38
+          } else {
39
+            Taro.reLaunch({
40
+              url: '/pages/person/index'
41
+            })
42
+          }
43
+        }, 700)
44
+
40
       }
45
       }
41
     })
46
     })
42
   }
47
   }

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

13
 import { getCardDetail } from '@/services/card'
13
 import { getCardDetail } from '@/services/card'
14
 import { ROLE_CODE } from '@/constants/user'
14
 import { ROLE_CODE } from '@/constants/user'
15
 import Consultant from '@/components/consultant'
15
 import Consultant from '@/components/consultant'
16
+import { rule as ruleToast } from '@/utils/ruleToast'
16
 import {
17
 import {
17
   addActivityShareNum,
18
   addActivityShareNum,
18
   signupActivity,
19
   signupActivity,
99
       savePoint({
100
       savePoint({
100
         event: 'detail',
101
         event: 'detail',
101
         eventType: 'activity',
102
         eventType: 'activity',
102
-        targetType:'dynamic',
103
+        targetType: 'dynamic',
103
         propertyName: '活动详情',
104
         propertyName: '活动详情',
104
         buildingId: res.buildingId,
105
         buildingId: res.buildingId,
105
         targetId: res.dynamicId,
106
         targetId: res.dynamicId,
168
     savePoint({
169
     savePoint({
169
       event: 'share',
170
       event: 'share',
170
       eventType: 'activity',
171
       eventType: 'activity',
171
-      targetType:'dynamic',
172
+      targetType: 'dynamic',
172
       propertyName: '活动详情分享',
173
       propertyName: '活动详情分享',
173
       consultantId: consultantId,
174
       consultantId: consultantId,
174
       sharePersonId: personId,
175
       sharePersonId: personId,
234
     savePoint({
235
     savePoint({
235
       event: 'save',
236
       event: 'save',
236
       eventType: 'activity',
237
       eventType: 'activity',
237
-      targetType:'dynamic',
238
+      targetType: 'dynamic',
238
       propertyName: '活动详情收藏',
239
       propertyName: '活动详情收藏',
239
       data: '{}'
240
       data: '{}'
240
     }).then(res => {
241
     }).then(res => {
245
   handleGetPhone(e) {
246
   handleGetPhone(e) {
246
     getUserPhone(e, (phoneNumber) => {
247
     getUserPhone(e, (phoneNumber) => {
247
       if (phoneNumber) {
248
       if (phoneNumber) {
248
-        this.handleSignup()
249
+        ruleToast('signup-agent')
250
+        setTimeout(() => {
251
+          this.handleSignup()
252
+        }, 700)
249
       } else {
253
       } else {
250
         Taro.showToast({
254
         Taro.showToast({
251
           title: '报名失败',
255
           title: '报名失败',
311
     savePoint({
315
     savePoint({
312
       event: 'poster',
316
       event: 'poster',
313
       eventType: 'activity',
317
       eventType: 'activity',
314
-      targetType:'dynamic',
318
+      targetType: 'dynamic',
315
       propertyName: '生成活动详情海报',
319
       propertyName: '生成活动详情海报',
316
       data: '{}'
320
       data: '{}'
317
     }).then(res => {
321
     }).then(res => {
378
     savePoint({
382
     savePoint({
379
       event: 'enlist',
383
       event: 'enlist',
380
       eventType: 'activity',
384
       eventType: 'activity',
381
-      targetType:'dynamic',
385
+      targetType: 'dynamic',
382
       propertyName: '活动详情报名',
386
       propertyName: '活动详情报名',
383
       data: '{}'
387
       data: '{}'
384
     }).then(res => {
388
     }).then(res => {

+ 13
- 9
src/pages/agent/become/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
-
3
+import { rule as ruleToast } from '@/utils/ruleToast'
4
 import { registerAgent } from '@/services/agent'
4
 import { registerAgent } from '@/services/agent'
5
 import { connect } from '@tarojs/redux'
5
 import { connect } from '@tarojs/redux'
6
 import * as actions from '@/actions/user'
6
 import * as actions from '@/actions/user'
21
     isChannel: false,
21
     isChannel: false,
22
     user: {}
22
     user: {}
23
   }
23
   }
24
-  componentDidMount () {
24
+  componentDidMount() {
25
     this.loadUserInfo()
25
     this.loadUserInfo()
26
 
26
 
27
 
27
 
28
   }
28
   }
29
-  putMessage () {
29
+  putMessage() {
30
     const { recommendAgentCode, channelCode } = this.state
30
     const { recommendAgentCode, channelCode } = this.state
31
     const payload = {
31
     const payload = {
32
       recommendAgentCode: recommendAgentCode,
32
       recommendAgentCode: recommendAgentCode,
67
 
67
 
68
   //   })
68
   //   })
69
   // }
69
   // }
70
-  bindInfo (e) {
70
+  bindInfo(e) {
71
     console.log(e.currentTarget.dataset.id)
71
     console.log(e.currentTarget.dataset.id)
72
     switch (e.currentTarget.dataset.id) {
72
     switch (e.currentTarget.dataset.id) {
73
       case 'recommendAgentCode':
73
       case 'recommendAgentCode':
84
         break;
84
         break;
85
     }
85
     }
86
   }
86
   }
87
-  getPhoneNumber (e) {
87
+  getPhoneNumber(e) {
88
     getUserPhone(e, (phoneNumber) => {
88
     getUserPhone(e, (phoneNumber) => {
89
       if (phoneNumber) {
89
       if (phoneNumber) {
90
-        this.putMessage()
90
+        ruleToast('signup-agent')
91
+        setTimeout(() => {
92
+          this.putMessage()
93
+        }, 700)
94
+
91
       } else {
95
       } else {
92
         Taro.showToast({
96
         Taro.showToast({
93
           title: '授权电话失败',
97
           title: '授权电话失败',
96
       }
100
       }
97
     })
101
     })
98
   }
102
   }
99
-  loadUserInfo () {
103
+  loadUserInfo() {
100
     queryUserInfo().then(user => {
104
     queryUserInfo().then(user => {
101
       this.setState({
105
       this.setState({
102
         user,
106
         user,
103
         phone: user.phone
107
         phone: user.phone
104
       }, () => {
108
       }, () => {
105
         if (user.personType == ROLE_CODE['DRIFT'] || user.personType == ROLE_CODE['CUSTOMER']) {
109
         if (user.personType == ROLE_CODE['DRIFT'] || user.personType == ROLE_CODE['CUSTOMER']) {
106
-          const code = this.$router.params.agentCode  || ''
110
+          const code = this.$router.params.agentCode || ''
107
           this.setState({
111
           this.setState({
108
             recommendAgentCode: code
112
             recommendAgentCode: code
109
           }, () => {
113
           }, () => {
117
       })
121
       })
118
     })
122
     })
119
   }
123
   }
120
-  render () {
124
+  render() {
121
     const { isChannel, recommendAgentCode } = this.state
125
     const { isChannel, recommendAgentCode } = this.state
122
     const { userInfo: { person: { phone } } } = this.props
126
     const { userInfo: { person: { phone } } } = this.props
123
     return (
127
     return (

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

4
 import { getItemList } from '@/services/item'
4
 import { getItemList } from '@/services/item'
5
 import { getCardList } from '@/services/card'
5
 import { getCardList } from '@/services/card'
6
 import { savePoint, updatePoint } from '@/services/common'
6
 import { savePoint, updatePoint } from '@/services/common'
7
-
7
+import { rule as ruleToast } from '@/utils/ruleToast'
8
 import Authorize from '@/components/authorize'
8
 import Authorize from '@/components/authorize'
9
 
9
 
10
 import { connect } from '@tarojs/redux'
10
 import { connect } from '@tarojs/redux'
165
     })
165
     })
166
   }
166
   }
167
   BindInfo(e) {
167
   BindInfo(e) {
168
-    console.log(e, "8888888888")
169
     console.log(e.currentTarget.dataset.id)
168
     console.log(e.currentTarget.dataset.id)
170
     switch (e.currentTarget.dataset.id) {
169
     switch (e.currentTarget.dataset.id) {
171
       case 'name':
170
       case 'name':
278
     }
277
     }
279
     recommendClient(param).then(res => {
278
     recommendClient(param).then(res => {
280
       // if (res) {
279
       // if (res) {
281
-      Taro.showToast({
282
-        title: '提交成功'
283
-      })
280
+      ruleToast('recommend-customer')
284
       if (this.state.reType == 'projectDeatil') {
281
       if (this.state.reType == 'projectDeatil') {
285
         savePoint({
282
         savePoint({
286
           event: 'recommend',
283
           event: 'recommend',

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

3
 import * as actions from '@/actions/user'
3
 import * as actions from '@/actions/user'
4
 import './index.scss'
4
 import './index.scss'
5
 import getUserPhone from '@/utils/getUserPhone'
5
 import getUserPhone from '@/utils/getUserPhone'
6
-
6
+import { rule as ruleToast } from '@/utils/ruleToast'
7
 @connect(state => state.user, { ...actions })
7
 @connect(state => state.user, { ...actions })
8
 export default class Index extends Component {
8
 export default class Index extends Component {
9
   config = {
9
   config = {
10
     navigationBarTitleText: '个人中心'
10
     navigationBarTitleText: '个人中心'
11
   }
11
   }
12
   state = {
12
   state = {
13
-  	person:''
13
+    person: ''
14
   }
14
   }
15
   componentWillMount() {
15
   componentWillMount() {
16
-    const {userInfo:{person}} = this.props
16
+    const { userInfo: { person } } = this.props
17
     this.setState({
17
     this.setState({
18
-    	person:person
18
+      person: person
19
     })
19
     })
20
   }
20
   }
21
 
21
 
28
         })
28
         })
29
         return
29
         return
30
       }
30
       }
31
-      Taro.reLaunch({
32
-        url: `/pages/project/index`
33
-      })
31
+      ruleToast('signup-agent')
32
+      setTimeout(() => {
33
+        Taro.reLaunch({
34
+          url: `/pages/project/index`
35
+        })
36
+      }, 700)
34
     })
37
     })
35
   }
38
   }
36
-  
39
+
37
   handleLogin() {
40
   handleLogin() {
38
     Taro.navigateTo({
41
     Taro.navigateTo({
39
       url: `/pages/person/login/index`
42
       url: `/pages/person/login/index`
40
     })
43
     })
41
   }
44
   }
42
-  
45
+
43
   render() {
46
   render() {
44
-  	const {person}=this.state
47
+    const { person } = this.state
45
 
48
 
46
     return (
49
     return (
47
       <View className='auth-page'>
50
       <View className='auth-page'>
48
-        <Image className="avatar_img" src={person.avatarurl}/>
51
+        <Image className="avatar_img" src={person.avatarurl} />
49
         <View className="user_name">{person.nickname}</View>
52
         <View className="user_name">{person.nickname}</View>
50
-        <Button  className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
53
+        <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
51
         {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
54
         {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
52
       </View>
55
       </View>
53
     )
56
     )

+ 2
- 4
src/pages/person/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
-
4
 import { ROLE_CODE } from '@/constants/user'
3
 import { ROLE_CODE } from '@/constants/user'
5
 import { queryUserInfo, doUserSignin } from '@/services/user'
4
 import { queryUserInfo, doUserSignin } from '@/services/user'
6
 import { connect } from '@tarojs/redux'
5
 import { connect } from '@tarojs/redux'
13
 import { menus } from './menus'
12
 import { menus } from './menus'
14
 import login from '@/utils/login'
13
 import login from '@/utils/login'
15
 export const version = Version
14
 export const version = Version
15
+import { rule as ruleToast } from '@/utils/ruleToast'
16
 
16
 
17
 @connect(({ user, city }) => ({ user, city }), { ...actions })
17
 @connect(({ user, city }) => ({ user, city }), { ...actions })
18
 
18
 
59
     }
59
     }
60
 
60
 
61
     doUserSignin({ id }).then(res => {
61
     doUserSignin({ id }).then(res => {
62
-      Taro.showToast({
63
-        title: '签到成功'
64
-      })
62
+      ruleToast('checkin')
65
       savePoint({
63
       savePoint({
66
         event: 'signin',
64
         event: 'signin',
67
         eventType: 'center',
65
         eventType: 'center',

+ 2
- 2
src/pages/person/profile/detail/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 { AtImagePicker } from 'taro-ui'
3
 import { AtImagePicker } from 'taro-ui'
4
-import dayjs from 'dayjs'
5
 import { getProfileDetail, editDocumentVerify } from '@/services/user'
4
 import { getProfileDetail, editDocumentVerify } from '@/services/user'
6
 import { uploadFiles } from '@/utils/request'
5
 import { uploadFiles } from '@/utils/request'
7
 import { transferImage } from '@/utils/tools'
6
 import { transferImage } from '@/utils/tools'
8
 import "taro-ui/dist/style/components/image-picker.scss";
7
 import "taro-ui/dist/style/components/image-picker.scss";
9
 import "taro-ui/dist/style/components/icon.scss";
8
 import "taro-ui/dist/style/components/icon.scss";
10
 import { savePoint, } from '@/services/common'
9
 import { savePoint, } from '@/services/common'
10
+import { rule as ruleToast } from '@/utils/ruleToast'
11
 const add = require('@/assets/add.png')
11
 const add = require('@/assets/add.png')
12
 const closeImg = require('@/assets/close.png')
12
 const closeImg = require('@/assets/close.png')
13
 
13
 
107
           imgList: res.imgList || [],
107
           imgList: res.imgList || [],
108
           documentTitle: res.documentTitle,
108
           documentTitle: res.documentTitle,
109
         })
109
         })
110
-        Taro.showToast({ icon: 'none', title: '提交成功' });
110
+        ruleToast('document_verify')
111
         savePoint({
111
         savePoint({
112
           event: 'material',
112
           event: 'material',
113
           eventType: 'center',
113
           eventType: 'center',

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

5
 import { uploadFiles } from '@/utils/request'
5
 import { uploadFiles } from '@/utils/request'
6
 import { transferImage } from '@/utils/tools'
6
 import { transferImage } from '@/utils/tools'
7
 import { savePoint, } from '@/services/common'
7
 import { savePoint, } from '@/services/common'
8
-
8
+import { rule as ruleToast } from '@/utils/ruleToast'
9
 const profileBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/profile.png'
9
 const profileBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/profile.png'
10
 const add = require('@/assets/add.png')
10
 const add = require('@/assets/add.png')
11
 const closeImg = require('@/assets/close.png')
11
 const closeImg = require('@/assets/close.png')
144
           imgList: [],
144
           imgList: [],
145
           descVisible: false,
145
           descVisible: false,
146
         })
146
         })
147
-        Taro.showToast({ icon: 'none', title: '提交成功' });
147
+        ruleToast('document_verify')
148
+
148
         savePoint({
149
         savePoint({
149
           event: 'material',
150
           event: 'material',
150
           eventType: 'center',
151
           eventType: 'center',

+ 10
- 8
src/pages/project/h5Page.js View File

10
 import { getQrCodeParams } from '@/utils/qrcode'
10
 import { getQrCodeParams } from '@/utils/qrcode'
11
 import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
11
 import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
12
 import { isEmpty } from '@/utils/tools'
12
 import { isEmpty } from '@/utils/tools'
13
-
13
+import { rule as ruleToast } from '@/utils/ruleToast'
14
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
14
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
15
 
15
 
16
 @connect(state => state.user, { ...actions })
16
 @connect(state => state.user, { ...actions })
303
           icon: 'none'
303
           icon: 'none'
304
         })
304
         })
305
       } else {
305
       } else {
306
-        console.log('授权手机成功')
307
-        this.success()
308
-        this.reportClient()
309
-        this.setState({
310
-          phoneVisible: false,
311
-          webViewVisible: true,
312
-        })
306
+        ruleToast('signup-agent')
307
+        setTimeout(() => {
308
+          this.success()
309
+          this.reportClient()
310
+          this.setState({
311
+            phoneVisible: false,
312
+            webViewVisible: true,
313
+          })
314
+        }, 700)
313
       }
315
       }
314
     })
316
     })
315
   }
317
   }

+ 14
- 10
src/pages/report/login/index.js View File

2
 import getUserPhone from '@/utils/getUserPhone'
2
 import getUserPhone from '@/utils/getUserPhone'
3
 import { reportClient } from '@/services/report'
3
 import { reportClient } from '@/services/report'
4
 import './index.scss'
4
 import './index.scss'
5
+import { rule as ruleToast } from '@/utils/ruleToast'
5
 
6
 
6
 export default class Index extends Component {
7
 export default class Index extends Component {
7
   state = {
8
   state = {
22
     const { recommender, buildingId } = this.state
23
     const { recommender, buildingId } = this.state
23
     getUserPhone(e, (phoneNumber) => {
24
     getUserPhone(e, (phoneNumber) => {
24
       if (phoneNumber) {
25
       if (phoneNumber) {
25
-        const payload = {
26
-          realtyConsultant: recommender, //报备人 置业顾问
27
-          buildingId: buildingId,
28
-          phone: phoneNumber
29
-        }
30
-        reportClient(payload).then(res => {
31
-          Taro.redirectTo({
32
-            url: `/pages/card/index?id=${recommender}`
26
+        ruleToast('signup-agent')
27
+        
28
+        setTimeout(() => {
29
+          const payload = {
30
+            realtyConsultant: recommender, //报备人 置业顾问
31
+            buildingId: buildingId,
32
+            phone: phoneNumber
33
+          }
34
+          reportClient(payload).then(res => {
35
+            Taro.redirectTo({
36
+              url: `/pages/card/index?id=${recommender}`
37
+            })
33
           })
38
           })
34
-        })
39
+        },700)
35
 
40
 
36
-        
37
       } else {
41
       } else {
38
         Taro.showToast({
42
         Taro.showToast({
39
           title: '授权失败,请重试',
43
           title: '授权失败,请重试',

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

15
 import { queryUserInfo, doUserSignin } from '@/services/user'
15
 import { queryUserInfo, doUserSignin } from '@/services/user'
16
 // import getUserPhone from '@/utils/getUserPhone'
16
 // import getUserPhone from '@/utils/getUserPhone'
17
 import Authorize from '@/components/authorize'
17
 import Authorize from '@/components/authorize'
18
+import { rule as ruleToast } from '@/utils/ruleToast'
18
 
19
 
19
 @connect(({ user, shop, city }) => ({ ...user, ...shop, ...city }), { ...actions })
20
 @connect(({ user, shop, city }) => ({ ...user, ...shop, ...city }), { ...actions })
20
 export default class Shop extends Component {
21
 export default class Shop extends Component {
179
     }
180
     }
180
 
181
 
181
     doUserSignin({ id }).then(res => {
182
     doUserSignin({ id }).then(res => {
182
-      Taro.showToast({
183
-        title: '签到成功'
184
-      })
183
+      ruleToast('checkin')
185
       savePoint({
184
       savePoint({
186
         event: 'signin',
185
         event: 'signin',
187
         eventType: 'integral',
186
         eventType: 'integral',

+ 18
- 19
src/pages/signin/index.js View File

4
 import { connect } from '@tarojs/redux'
4
 import { connect } from '@tarojs/redux'
5
 import './index.scss'
5
 import './index.scss'
6
 import ready from '@/utils/ready'
6
 import ready from '@/utils/ready'
7
+import { rule as ruleToast } from '@/utils/ruleToast'
7
 
8
 
8
 @connect(state => ({ ...state.user }), { dispatchSignin, dispatchSigninCheck })
9
 @connect(state => ({ ...state.user }), { dispatchSignin, dispatchSigninCheck })
9
 export default class Index extends Component {
10
 export default class Index extends Component {
42
         })
43
         })
43
         return
44
         return
44
       }
45
       }
46
+      ruleToast('signup-agent')
45
 
47
 
46
-      // App.zhuge.track('获取手机号', {
47
-      //   '手机号': phoneNumber
48
-      // })
49
-
50
-      this.props.dispatchSignin(1).then(res => {
51
-        // App.zhuge.track('签到成功', {
52
-        //   '活动主题': '悦见姑苏新营销之美'
53
-        // })
54
-        Taro.showToast({
55
-          title: '签到成功'
56
-        })
57
-        this.setState({
58
-          isSigned: true
59
-        })
60
-        setTimeout(() => {
61
-          Taro.switchTab({
62
-            url: `/pages/project/index`
48
+      setTimeout(() => {
49
+        this.props.dispatchSignin(1).then(res => {
50
+          Taro.showToast({
51
+            title: '签到成功'
63
           })
52
           })
64
-        }, 3000)
65
-      })
53
+          this.setState({
54
+            isSigned: true
55
+          })
56
+          setTimeout(() => {
57
+            Taro.switchTab({
58
+              url: `/pages/project/index`
59
+            })
60
+          }, 2000)
61
+        })
62
+      }, 700)
63
+
64
+
66
     })
65
     })
67
   }
66
   }
68
   render() {
67
   render() {

+ 7
- 1
src/services/user.js View File

7
   API_QUERY_DOCUMENTVERIFY,
7
   API_QUERY_DOCUMENTVERIFY,
8
   API_QUERY_DOCUMENTVERIFY_list,
8
   API_QUERY_DOCUMENTVERIFY_list,
9
   API_QUERY_TADRAINGE,
9
   API_QUERY_TADRAINGE,
10
-  API_TACUSTOMIMG
10
+  API_TACUSTOMIMG,
11
+  API_POINTS_RULE
11
 } from '@/constants/api'
12
 } from '@/constants/api'
12
 
13
 
13
 /**
14
 /**
72
  * @param {*} payload
73
  * @param {*} payload
73
  */
74
  */
74
 export const getIndexShare = payload => fetch({ url:API_TACUSTOMIMG, payload  })
75
 export const getIndexShare = payload => fetch({ url:API_TACUSTOMIMG, payload  })
76
+/**
77
+ * 获取积分规则
78
+ * @param {*} payload
79
+ */
80
+export const getPointsRule = payload => fetch({ url:API_POINTS_RULE, payload  })
75
 
81
 

+ 35
- 0
src/utils/ruleToast.js View File

1
+import Taro, { Component } from '@tarojs/taro'
2
+import { getPointsRule } from '@/services/user'
3
+
4
+/**
5
+ * 积分提示
6
+ * @param {*} code
7
+ */
8
+export function rule(code) {
9
+
10
+    return new Promise((resolve, reject) => {
11
+        getPointsRule().then(res => {
12
+            const rule = (res.records || []).filter(item => item.code == code)[0]
13
+            switch (code) {
14
+                case 'checkin':
15
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `签到成功,获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '签到成功!' })
16
+                // case 'share-poster':
17
+                //     return rule.pointsAmount > 0 ? Taro.showToast({ title: `签到成功,获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '签到成功!', icon: 'none' })
18
+                case 'recommend-customer':
19
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `后台审核通过后您将获得${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '提交成功' })
20
+                case 'signup-agent':
21
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `授权成功,获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '授权成功!' })
22
+                case 'document_verify':
23
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `后台审核通过后您将获得${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '提交成功!' })
24
+                case 'activity_checkin':
25
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `签到成功,获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '签到成功!' })
26
+                default:
27
+                    return
28
+            }
29
+        }).catch(err => {
30
+            console.error(err)
31
+            reject(err.message || err)
32
+        })
33
+    })
34
+
35
+}