ruleToast

src/app.js

@@ -28,7 +28,7 @@ import {
 import { UPDATE_PRELOAD } from '@/constants/common'
 import ready from '@/utils/ready'
 import login from '@/utils/login'
-import store  from './store'
+import store from './store'
 import socket from '@/utils/im'
 
 // const store = configStore()
@@ -107,7 +107,7 @@ class App extends Component {
 
       'pages/checkin/index',
       'pages/checkin/checkinsuccess/index',
-     
+
 
     ],
     window: {
@@ -187,7 +187,7 @@ class App extends Component {
 
     socket.reconnect()
   }
-  
+
   componentDidMount() {
     // console.info('app componentDidMount')
   }
@@ -200,7 +200,7 @@ class App extends Component {
     this.initData()
   }
 
-  wxPreloadData () {
+  wxPreloadData() {
     wx.setBackgroundFetchToken()
     wx.getBackgroundFetchData({
       fetchType: 'pre',
@@ -214,7 +214,7 @@ class App extends Component {
     })
   }
 
-  initData () {
+  initData() {
     // console.info('app componentDidShow')
     console.info('router1', this.$router)
     console.info('ready status1', ready)
@@ -298,7 +298,7 @@ class App extends Component {
 
         resolve(router)
       }
-      
+
     })
   }
   // 在 App 类中的 render() 函数没有实际作用

src/components/achievePhone/index.js

@@ -1,7 +1,7 @@
 import Taro, { Component } from '@tarojs/taro'
 import getUserPhone from '@/utils/getUserPhone'
 import './index.scss'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 const grantIcon = require('@/assets/helpgroup/shouquan.png')
 const logoImg = require('@/assets/index/logo.png')
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
@@ -31,9 +31,13 @@ export default class Index extends Component {
 
         return
       } else {
-        if (typeof this.props.onSuccess === 'function') {
-          this.props.onSuccess(phoneNumber);
-        }
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          if (typeof this.props.onSuccess === 'function') {
+            this.props.onSuccess(phoneNumber);
+          }
+        }, 700)
+
       }
     })
   }

src/components/authorize/index.js

@@ -4,6 +4,7 @@ import * as actions from '@/actions/user'
 import './index.scss'
 import getUserPhone from '@/utils/getUserPhone'
 import { queryUserInfo, doUserSignin } from '@/services/user'
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 @connect(state => state.user, { ...actions })
 export default class Index extends Component {
@@ -26,17 +27,21 @@ export default class Index extends Component {
         })
         return
       } else {
-        this.props.dispatchUpdateUserInfoNew(this.state.user.id)
-        console.log(this.props.from,"this.props.from")
-        if (this.props.from) {
-          Taro.reLaunch({
-            url: this.props.from
-          })
-        } else {
-          Taro.reLaunch({
-            url: '/pages/person/index'
-          })
-        }
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          this.props.dispatchUpdateUserInfoNew(this.state.user.id)
+          console.log(this.props.from, "this.props.from")
+          if (this.props.from) {
+            Taro.reLaunch({
+              url: this.props.from
+            })
+          } else {
+            Taro.reLaunch({
+              url: '/pages/person/index'
+            })
+          }
+        }, 700)
+
       }
     })
   }

src/pages/activity/detail/index.js

@@ -13,6 +13,7 @@ import { getQrCodeParams } from '@/utils/qrcode'
 import { getCardDetail } from '@/services/card'
 import { ROLE_CODE } from '@/constants/user'
 import Consultant from '@/components/consultant'
+import { rule as ruleToast } from '@/utils/ruleToast'
 import {
   addActivityShareNum,
   signupActivity,
@@ -99,7 +100,7 @@ export default class Detail extends Component {
       savePoint({
         event: 'detail',
         eventType: 'activity',
-        targetType:'dynamic',
+        targetType: 'dynamic',
         propertyName: '活动详情',
         buildingId: res.buildingId,
         targetId: res.dynamicId,
@@ -168,7 +169,7 @@ export default class Detail extends Component {
     savePoint({
       event: 'share',
       eventType: 'activity',
-      targetType:'dynamic',
+      targetType: 'dynamic',
       propertyName: '活动详情分享',
       consultantId: consultantId,
       sharePersonId: personId,
@@ -234,7 +235,7 @@ export default class Detail extends Component {
     savePoint({
       event: 'save',
       eventType: 'activity',
-      targetType:'dynamic',
+      targetType: 'dynamic',
       propertyName: '活动详情收藏',
       data: '{}'
     }).then(res => {
@@ -245,7 +246,10 @@ export default class Detail extends Component {
   handleGetPhone(e) {
     getUserPhone(e, (phoneNumber) => {
       if (phoneNumber) {
-        this.handleSignup()
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          this.handleSignup()
+        }, 700)
       } else {
         Taro.showToast({
           title: '报名失败',
@@ -311,7 +315,7 @@ export default class Detail extends Component {
     savePoint({
       event: 'poster',
       eventType: 'activity',
-      targetType:'dynamic',
+      targetType: 'dynamic',
       propertyName: '生成活动详情海报',
       data: '{}'
     }).then(res => {
@@ -378,7 +382,7 @@ export default class Detail extends Component {
     savePoint({
       event: 'enlist',
       eventType: 'activity',
-      targetType:'dynamic',
+      targetType: 'dynamic',
       propertyName: '活动详情报名',
       data: '{}'
     }).then(res => {

src/pages/agent/become/index.js

@@ -1,6 +1,6 @@
 import Taro, { Component } from '@tarojs/taro'
 import './index.scss'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 import { registerAgent } from '@/services/agent'
 import { connect } from '@tarojs/redux'
 import * as actions from '@/actions/user'
@@ -21,12 +21,12 @@ export default class Index extends Component {
     isChannel: false,
     user: {}
   }
-  componentDidMount () {
+  componentDidMount() {
     this.loadUserInfo()
 
 
   }
-  putMessage () {
+  putMessage() {
     const { recommendAgentCode, channelCode } = this.state
     const payload = {
       recommendAgentCode: recommendAgentCode,
@@ -67,7 +67,7 @@ export default class Index extends Component {
 
   //   })
   // }
-  bindInfo (e) {
+  bindInfo(e) {
     console.log(e.currentTarget.dataset.id)
     switch (e.currentTarget.dataset.id) {
       case 'recommendAgentCode':
@@ -84,10 +84,14 @@ export default class Index extends Component {
         break;
     }
   }
-  getPhoneNumber (e) {
+  getPhoneNumber(e) {
     getUserPhone(e, (phoneNumber) => {
       if (phoneNumber) {
-        this.putMessage()
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          this.putMessage()
+        }, 700)
+
       } else {
         Taro.showToast({
           title: '授权电话失败',
@@ -96,14 +100,14 @@ export default class Index extends Component {
       }
     })
   }
-  loadUserInfo () {
+  loadUserInfo() {
     queryUserInfo().then(user => {
       this.setState({
         user,
         phone: user.phone
       }, () => {
         if (user.personType == ROLE_CODE['DRIFT'] || user.personType == ROLE_CODE['CUSTOMER']) {
-          const code = this.$router.params.agentCode  || ''
+          const code = this.$router.params.agentCode || ''
           this.setState({
             recommendAgentCode: code
           }, () => {
@@ -117,7 +121,7 @@ export default class Index extends Component {
       })
     })
   }
-  render () {
+  render() {
     const { isChannel, recommendAgentCode } = this.state
     const { userInfo: { person: { phone } } } = this.props
     return (

src/pages/agent/recommend/index.js

@@ -4,7 +4,7 @@ import { recommendClient, getTypeData } from '@/services/client'
 import { getItemList } from '@/services/item'
 import { getCardList } from '@/services/card'
 import { savePoint, updatePoint } from '@/services/common'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 import Authorize from '@/components/authorize'
 
 import { connect } from '@tarojs/redux'
@@ -165,7 +165,6 @@ export default class Index extends Component {
     })
   }
   BindInfo(e) {
-    console.log(e, "8888888888")
     console.log(e.currentTarget.dataset.id)
     switch (e.currentTarget.dataset.id) {
       case 'name':
@@ -278,9 +277,7 @@ export default class Index extends Component {
     }
     recommendClient(param).then(res => {
       // if (res) {
-      Taro.showToast({
-        title: '提交成功'
-      })
+      ruleToast('recommend-customer')
       if (this.state.reType == 'projectDeatil') {
         savePoint({
           event: 'recommend',

src/pages/person/authorize/index.js

@@ -3,19 +3,19 @@ import { connect } from '@tarojs/redux'
 import * as actions from '@/actions/user'
 import './index.scss'
 import getUserPhone from '@/utils/getUserPhone'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 @connect(state => state.user, { ...actions })
 export default class Index extends Component {
   config = {
     navigationBarTitleText: '个人中心'
   }
   state = {
-  	person:''
+    person: ''
   }
   componentWillMount() {
-    const {userInfo:{person}} = this.props
+    const { userInfo: { person } } = this.props
     this.setState({
-    	person:person
+      person: person
     })
   }
 
@@ -28,26 +28,29 @@ export default class Index extends Component {
         })
         return
       }
-      Taro.reLaunch({
-        url: `/pages/project/index`
-      })
+      ruleToast('signup-agent')
+      setTimeout(() => {
+        Taro.reLaunch({
+          url: `/pages/project/index`
+        })
+      }, 700)
     })
   }
-  
+
   handleLogin() {
     Taro.navigateTo({
       url: `/pages/person/login/index`
     })
   }
-  
+
   render() {
-  	const {person}=this.state
+    const { person } = this.state
 
     return (
       <View className='auth-page'>
-        <Image className="avatar_img" src={person.avatarurl}/>
+        <Image className="avatar_img" src={person.avatarurl} />
         <View className="user_name">{person.nickname}</View>
-        <Button  className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
+        <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
         {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
       </View>
     )

src/pages/person/index.js

@@ -1,6 +1,5 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
-
 import { ROLE_CODE } from '@/constants/user'
 import { queryUserInfo, doUserSignin } from '@/services/user'
 import { connect } from '@tarojs/redux'
@@ -13,6 +12,7 @@ import { savePoint, } from '@/services/common'
 import { menus } from './menus'
 import login from '@/utils/login'
 export const version = Version
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 @connect(({ user, city }) => ({ user, city }), { ...actions })
 
@@ -59,9 +59,7 @@ export default class Person extends Component {
     }
 
     doUserSignin({ id }).then(res => {
-      Taro.showToast({
-        title: '签到成功'
-      })
+      ruleToast('checkin')
       savePoint({
         event: 'signin',
         eventType: 'center',

src/pages/person/profile/detail/index.js

@@ -1,13 +1,13 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import { AtImagePicker } from 'taro-ui'
-import dayjs from 'dayjs'
 import { getProfileDetail, editDocumentVerify } from '@/services/user'
 import { uploadFiles } from '@/utils/request'
 import { transferImage } from '@/utils/tools'
 import "taro-ui/dist/style/components/image-picker.scss";
 import "taro-ui/dist/style/components/icon.scss";
 import { savePoint, } from '@/services/common'
+import { rule as ruleToast } from '@/utils/ruleToast'
 const add = require('@/assets/add.png')
 const closeImg = require('@/assets/close.png')
 
@@ -107,7 +107,7 @@ export default class Profile extends Component {
           imgList: res.imgList || [],
           documentTitle: res.documentTitle,
         })
-        Taro.showToast({ icon: 'none', title: '提交成功' });
+        ruleToast('document_verify')
         savePoint({
           event: 'material',
           eventType: 'center',

src/pages/person/profile/index.js

@@ -5,7 +5,7 @@ import { getDocumentVerify, commitDocumentVerify, getVerifyList } from '@/servic
 import { uploadFiles } from '@/utils/request'
 import { transferImage } from '@/utils/tools'
 import { savePoint, } from '@/services/common'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 const profileBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/profile.png'
 const add = require('@/assets/add.png')
 const closeImg = require('@/assets/close.png')
@@ -144,7 +144,8 @@ export default class Profile extends Component {
           imgList: [],
           descVisible: false,
         })
-        Taro.showToast({ icon: 'none', title: '提交成功' });
+        ruleToast('document_verify')
+
         savePoint({
           event: 'material',
           eventType: 'center',

src/pages/project/h5Page.js

@@ -10,7 +10,7 @@ import { ROLE_CODE } from '@/constants/user'
 import { getQrCodeParams } from '@/utils/qrcode'
 import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
 import { isEmpty } from '@/utils/tools'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
 
 @connect(state => state.user, { ...actions })
@@ -303,13 +303,15 @@ export default class Index extends Component {
           icon: 'none'
         })
       } else {
-        console.log('授权手机成功')
-        this.success()
-        this.reportClient()
-        this.setState({
-          phoneVisible: false,
-          webViewVisible: true,
-        })
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          this.success()
+          this.reportClient()
+          this.setState({
+            phoneVisible: false,
+            webViewVisible: true,
+          })
+        }, 700)
       }
     })
   }

src/pages/report/login/index.js

@@ -2,6 +2,7 @@ import Taro, { Component } from '@tarojs/taro'
 import getUserPhone from '@/utils/getUserPhone'
 import { reportClient } from '@/services/report'
 import './index.scss'
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 export default class Index extends Component {
   state = {
@@ -22,18 +23,21 @@ export default class Index extends Component {
     const { recommender, buildingId } = this.state
     getUserPhone(e, (phoneNumber) => {
       if (phoneNumber) {
-        const payload = {
-          realtyConsultant: recommender, //报备人 置业顾问
-          buildingId: buildingId,
-          phone: phoneNumber
-        }
-        reportClient(payload).then(res => {
-          Taro.redirectTo({
-            url: `/pages/card/index?id=${recommender}`
+        ruleToast('signup-agent')
+        
+        setTimeout(() => {
+          const payload = {
+            realtyConsultant: recommender, //报备人 置业顾问
+            buildingId: buildingId,
+            phone: phoneNumber
+          }
+          reportClient(payload).then(res => {
+            Taro.redirectTo({
+              url: `/pages/card/index?id=${recommender}`
+            })
           })
-        })
+        },700)
 
-        
       } else {
         Taro.showToast({
           title: '授权失败，请重试',

src/pages/shop/index.js

@@ -15,6 +15,7 @@ import * as actions from '@/actions/shop'
 import { queryUserInfo, doUserSignin } from '@/services/user'
 // import getUserPhone from '@/utils/getUserPhone'
 import Authorize from '@/components/authorize'
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 @connect(({ user, shop, city }) => ({ ...user, ...shop, ...city }), { ...actions })
 export default class Shop extends Component {
@@ -179,9 +180,7 @@ export default class Shop extends Component {
     }
 
     doUserSignin({ id }).then(res => {
-      Taro.showToast({
-        title: '签到成功'
-      })
+      ruleToast('checkin')
       savePoint({
         event: 'signin',
         eventType: 'integral',

src/pages/signin/index.js

@@ -4,6 +4,7 @@ import { dispatchSignin, dispatchSigninCheck } from '@/actions/activity'
 import { connect } from '@tarojs/redux'
 import './index.scss'
 import ready from '@/utils/ready'
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 @connect(state => ({ ...state.user }), { dispatchSignin, dispatchSigninCheck })
 export default class Index extends Component {
@@ -42,27 +43,25 @@ export default class Index extends Component {
         })
         return
       }
+      ruleToast('signup-agent')
 
-      // App.zhuge.track('获取手机号', {
-      //   '手机号': phoneNumber
-      // })
-
-      this.props.dispatchSignin(1).then(res => {
-        // App.zhuge.track('签到成功', {
-        //   '活动主题': '悦见姑苏新营销之美'
-        // })
-        Taro.showToast({
-          title: '签到成功'
-        })
-        this.setState({
-          isSigned: true
-        })
-        setTimeout(() => {
-          Taro.switchTab({
-            url: `/pages/project/index`
+      setTimeout(() => {
+        this.props.dispatchSignin(1).then(res => {
+          Taro.showToast({
+            title: '签到成功'
           })
-        }, 3000)
-      })
+          this.setState({
+            isSigned: true
+          })
+          setTimeout(() => {
+            Taro.switchTab({
+              url: `/pages/project/index`
+            })
+          }, 2000)
+        })
+      }, 700)
+
+
     })
   }
   render() {

src/services/user.js

@@ -7,7 +7,8 @@ import {
   API_QUERY_DOCUMENTVERIFY,
   API_QUERY_DOCUMENTVERIFY_list,
   API_QUERY_TADRAINGE,
-  API_TACUSTOMIMG
+  API_TACUSTOMIMG,
+  API_POINTS_RULE
 } from '@/constants/api'
 
 /**
@@ -72,4 +73,9 @@ export const getHFiveDetail = payload => fetch({ url:`${API_QUERY_TADRAINGE}/${p
  * @param {*} payload
  */
 export const getIndexShare = payload => fetch({ url:API_TACUSTOMIMG, payload  })
+/**
+ * 获取积分规则
+ * @param {*} payload
+ */
+export const getPointsRule = payload => fetch({ url:API_POINTS_RULE, payload  })
 

src/utils/ruleToast.js

@@ -0,0 +1,35 @@
+import Taro, { Component } from '@tarojs/taro'
+import { getPointsRule } from '@/services/user'
+
+/**
+ * 积分提示
+ * @param {*} code
+ */
+export function rule(code) {
+
+    return new Promise((resolve, reject) => {
+        getPointsRule().then(res => {
+            const rule = (res.records || []).filter(item => item.code == code)[0]
+            switch (code) {
+                case 'checkin':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `签到成功，获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '签到成功！' })
+                // case 'share-poster':
+                //     return rule.pointsAmount > 0 ? Taro.showToast({ title: `签到成功，获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '签到成功！', icon: 'none' })
+                case 'recommend-customer':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `后台审核通过后您将获得${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '提交成功' })
+                case 'signup-agent':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `授权成功，获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '授权成功！' })
+                case 'document_verify':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `后台审核通过后您将获得${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '提交成功！' })
+                case 'activity_checkin':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `签到成功，获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '签到成功！' })
+                default:
+                    return
+            }
+        }).catch(err => {
+            console.error(err)
+            reject(err.message || err)
+        })
+    })
+
+}