Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"http://127.0.0.1:8081"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

src/pages/mine/index.jsx

@@ -6,8 +6,9 @@ import Taro from '@tarojs/taro'
 import '@/assets/css/iconfont.css'
 import { fetch } from '@/utils/request'
 import { API_PUT_REGISTERCONSULTANT } from '@/constants/api'
-import login from '@/utils/login'
 import { getImgURL } from '@/utils/image'
+import { UPDATE_USER_INFO } from '@/constants/user'
+import store from '@/store'
 import './index.scss'
 import NeedLogin from './components/NeedLogin'
 import MineMenuList from './tabData'
@@ -22,17 +23,18 @@ export default withLayout(() => {
   const [IsPull, setPull] = useState(false)
   const [ShowLogin, setShowLogin] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
+  const { dispatch } = store
 
   useEffect(() => {
     setShowLogin(false)
-    if(user?.userInfo?.person?.personId) {
+    if (user?.userInfo?.person?.personId) {
       const person = user.userInfo.person
       setUserRole(person.personType === 'customer' || person.personType === 'drift' ? 1 : person.personType === 'estate agent' ? 2 : person.personType === 'Realty Consultant' ? 3 : 4)
     }
   }, [user])
 
   useEffect(() => {
-    if(UserRole !== null) {
+    if (UserRole !== null) {
       setMenuList(UserRole === 1 ? MineMenuList.User : UserRole === 2 ? MineMenuList.Broker : UserRole === 3 ? MineMenuList.Adviser : MineMenuList.Resident)
     }
   }, [UserRole])
@@ -52,13 +54,17 @@ export default withLayout(() => {
 
   const MenuClick = (router) => {
     return () => {
-      if(router === 'propertyConsultant') {
+      if (router === 'propertyConsultant') {
         fetch({ url: API_PUT_REGISTERCONSULTANT, method: 'put' }).then(() => {
           Taro.showToast({
             title: '匹配成功',
-            icon: 'none'
+            icon: 'none',
+            duration: 2000
           })
-          login({path: '', scene: ''})
+          dispatch({ type: UPDATE_USER_INFO, payload: { personType: 'Realty Consultant' } })
+          setTimeout(() => {
+            Taro.navigateBack({ delta: 1 })
+          }, 2000)
         }).catch(() => {
           Taro.showToast({
             title: '匹配失败，请联系相关管理人员',

src/pages/mine/tabData.js

@@ -16,7 +16,7 @@ const MineMenuList = {
     [
       { name: '成为驻场管理', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
       { name: '成为置业顾问', icon: require('../../assets/mine-icon4.png'), router: 'propertyConsultant' },
-      { name: '成为专业经纪人', icon: require('../../assets/mine-icon2.png'), router: null }
+      { name: '成为专业经纪人', icon: require('../../assets/mine-icon2.png'), router: '/pages/mine/toBeAgent/index' }
     ]
   ],
   Broker: [ // 经纪人

src/pages/mine/toBeAgent/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '成为经纪人'
+}

src/pages/mine/toBeAgent/index.jsx

@@ -0,0 +1,56 @@
+import { useState } from 'react'
+import Taro from '@tarojs/taro'
+import withLayout from '@/layout'
+import { ScrollView, Input } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_REGISTER_AGENT } from '@/constants/api'
+import { UPDATE_USER_INFO } from '@/constants/user'
+import store from '@/store'
+import './index.scss'
+
+export default withLayout(() => {
+
+  const [Code, setCode] = useState('')
+  const { dispatch } = store
+
+  const ToSubmit = () => {
+    if (Code !== '') {
+      fetch({ url: `${API_REGISTER_AGENT}?channelCode=${Code}`, method: 'put' }).then(() => {
+        Taro.showToast({ title: '绑定成功', icon: 'none', duration: 2000 })
+        dispatch({ type: UPDATE_USER_INFO, payload: { personType: 'estate agent' } })
+        setTimeout(() => {
+          Taro.navigateBack({ delta: 1 })
+        }, 2000)
+      })
+    } else {
+      Taro.showToast({
+        title: '请输入渠道验证码',
+        icon: 'none'
+      })
+    }
+  }
+
+  const CodeChange = (e) => {
+    setCode(e.detail.value)
+  }
+
+  return (
+    <view className='Page toBeAgent'>
+
+      <ScrollView scroll-y>
+        <view className='PageContent'>
+
+          <view className='Input'>
+            <Input placeholder='请输入渠道验证码 (必填)' onInput={CodeChange}></Input>
+          </view>
+
+          <view className='Btn'>
+            <text onClick={ToSubmit}>提交</text>
+          </view>
+
+        </view>
+      </ScrollView>
+
+    </view>
+  )
+})

src/pages/mine/toBeAgent/index.scss

@@ -0,0 +1,44 @@
+.Page.toBeAgent {
+  background: #fff;
+  height: 100vh;
+  width: 100%;
+  > scroll-view {
+    width: 100%;
+    height: 100%;
+    .PageContent {
+      position: relative;
+      overflow: hidden;
+      min-height: 100vh;
+      >.Input {
+        padding: 0 30px;
+        position: relative;
+        overflow: hidden;
+        margin-top: 30px;
+        >input {
+          display: block;
+          font-size: 28px;
+          line-height: 80px;
+          height: 80px;
+          text-indent: 20px;
+          border: 2px solid rgba(0, 0, 0, 0.08);
+          border-radius: 8px;
+        }
+      }
+      >.Btn {
+        padding: 40px;
+        position: relative;
+        overflow: hidden;
+        > text {
+          display: block;
+          text-align: center;
+          font-size: 32px;
+          line-height: 92px;
+          background: #193c83;
+          color: #fff;
+          font-weight: bold;
+          border-radius: 92px;
+        }
+      }
+    }
+  }
+}

src/pages/mine/toBeManager/index.jsx

@@ -4,19 +4,23 @@ import withLayout from '@/layout'
 import { ScrollView, Input } from '@tarojs/components'
 import { fetch } from '@/utils/request'
 import { API_TOBE_MANAGER } from '@/constants/api'
+import { UPDATE_USER_INFO } from '@/constants/user'
+import store from '@/store'
 import './index.scss'
 
 export default withLayout(() => {
-
+  
   const [Code, setCode] = useState('')
+  const { dispatch } = store
 
   const ToSubmit = () => {
     if (Code !== '') {
-      fetch({ url: API_TOBE_MANAGER, method: 'post', payload: { marketingCode: Code } }).then((res) => {
-        Taro.showToast({
-          title: '绑定成功',
-          icon: 'none'
-        })
+      fetch({ url: API_TOBE_MANAGER, method: 'post', payload: { marketingCode: Code } }).then(() => {
+        Taro.showToast({ title: '绑定成功', icon: 'none', duration: 2000 })
+        dispatch({ type: UPDATE_USER_INFO, payload: { personType: 'marketing' } })
+        setTimeout(() => {
+          Taro.navigateBack({ delta: 1 })
+        }, 2000)
       })
     } else {
       Taro.showToast({

src/routes.js

@@ -265,6 +265,12 @@ const routes = [
     pkg: 'main',
     type: 'mine',
   },
+  {
+    name: '成为经纪人',
+    page: 'pages/mine/toBeAgent/index',
+    pkg: 'main',
+    type: 'mine',
+  },
   {
     name: '推荐客户',
     page: 'pages/mine/recommendUser/index',