林凡 5 years ago
parent
commit
08149d2cfe

+ 2
- 2
config/dev.js View File

@@ -9,8 +9,8 @@ module.exports = {
9 9
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10 10
     // HOST: '"https://lt.pawoma.cn"',
11 11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    HOST: '"http://192.168.2.52:8080"',
13
-    WSS_HOST: '"ws://192.168.2.52:8080"',
12
+    HOST: '"http://192.168.2.51:8080"',
13
+    WSS_HOST: '"ws://192.168.2.51:8080"',
14 14
     Version:'V3.5.2.2_12102'
15 15
   },
16 16
   weapp: {},

+ 1
- 0
src/pages/person/accessRecord.js View File

@@ -7,6 +7,7 @@ import { savePoint, updatePoint } from '@services/common'
7 7
 import dayjs from 'dayjs';
8 8
 
9 9
 @connect(state => state.user)
10
+
10 11
 export default class Person extends Component {
11 12
   config = {
12 13
     navigationBarTitleText: '访客信息'

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

@@ -10,6 +10,7 @@ import * as actions from '@actions/user'
10 10
 import Authorize from '@components/authorize'
11 11
 import { transferImage } from '@utils/tools'
12 12
 import { menus } from './menus'
13
+import login from '@utils/login'
13 14
 export const version = Version
14 15
 
15 16
 @connect(({ user, city }) => ({ user, city }), { ...actions })
@@ -36,7 +37,6 @@ export default class Person extends Component {
36 37
   }
37 38
 
38 39
   loadUserInfo () {
39
-
40 40
     queryUserInfo().then(user => {
41 41
       const [roleSetting, roleName] = this.getRoleName(user.personType)
42 42
 
@@ -95,7 +95,20 @@ export default class Person extends Component {
95 95
     else {
96 96
       putRegisterConsultant().then(res => {
97 97
         Taro.setStorageSync('userId',res.userId)
98
-        this.loadUserInfo()
98
+        const  payload={
99
+          path:'',
100
+          scene:''
101
+        }
102
+
103
+        login(payload, res => {
104
+          this.loadUserInfo()
105
+        })
106
+        
107
+        Taro.showToast({
108
+          title: "匹配成功",
109
+          icon: "none",
110
+          duration: 3000
111
+        })
99 112
 
100 113
         // this.setState({
101 114
         //   consultant:true,

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

@@ -26,7 +26,7 @@
26 26
   .comfire{
27 27
     width:680px;
28 28
     height:90px;
29
-    background:rgba(255,71,64,1);
29
+    background:#bb9c79;
30 30
     border-radius:14px;
31 31
     margin: 0 auto;
32 32
     text-align: center;

+ 4
- 5
src/pages/project/h5Page.js View File

@@ -55,6 +55,7 @@ export default class Index extends Component {
55 55
   onShareAppMessage = () => {
56 56
     const { pageInfo } = this.state
57 57
     const currentPage = this.currentPageAndParams().join('?')
58
+    console.log(currentPage)
58 59
     return {
59 60
       title: pageInfo.shareTitle,
60 61
       path: currentPage,
@@ -114,7 +115,7 @@ export default class Index extends Component {
114 115
       console.log(router, "router")
115 116
       const hFiveId = this.$router.params.id || router.query.id || ""
116 117
       console.log(hFiveId, "hFiveId")
117
-      // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
118
+      // h5id 、第一个分享人ID、置业顾问ID、分享人ID
118 119
       getHFiveDetail(hFiveId).then(res => {
119 120
         Taro.hideLoading()
120 121
         if (res.status == 1) {
@@ -241,6 +242,7 @@ export default class Index extends Component {
241 242
   }
242 243
   // 报备客户
243 244
   reportClient() {
245
+
244 246
     const router = Taro.getStorageSync('router')
245 247
     const consultant = this.$router.params.consultant || router.query.consultant || ""
246 248
     const {
@@ -255,12 +257,9 @@ export default class Index extends Component {
255 257
         showToast: false
256 258
       }
257 259
       reportClient(payload).then(res => {
260
+        debugger
258 261
         console.log('恭喜您绑定成功')
259 262
       })
260
-      // .catch(err => {
261
-      //   console.error(err)
262
-
263
-      // })
264 263
     }
265 264
   }
266 265
 

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

@@ -698,4 +698,4 @@ export default class Index extends Component {
698 698
       </Block>
699 699
     )
700 700
   }
701
-}
701
+}

+ 1
- 1
src/utils/login.js View File

@@ -58,4 +58,4 @@ export default function (payload, callback) {
58 58
       })
59 59
     }
60 60
   })
61
-}
61
+}

+ 1
- 1
src/utils/request.js View File

@@ -91,7 +91,7 @@ export const fetch = async (options) => {
91 91
     if (err.message) {
92 92
       errMessage = err.message
93 93
     }
94
-
94
+    
95 95
     Taro.showToast({
96 96
       title: errMessage,
97 97
       icon: 'none'