|
@@ -26,7 +26,7 @@ import {
|
26
|
26
|
} from '@constants/user'
|
27
|
27
|
import ready from '@utils/ready'
|
28
|
28
|
import login from '@utils/login'
|
29
|
|
-import store from './store'
|
|
29
|
+import store from './store'
|
30
|
30
|
import socket from '@utils/im'
|
31
|
31
|
|
32
|
32
|
// const store = configStore()
|
|
@@ -107,7 +107,7 @@ class App extends Component {
|
107
|
107
|
|
108
|
108
|
'pages/checkin/index',
|
109
|
109
|
'pages/checkin/checkinsuccess/index',
|
110
|
|
-
|
|
110
|
+
|
111
|
111
|
|
112
|
112
|
],
|
113
|
113
|
window: {
|
|
@@ -177,7 +177,7 @@ class App extends Component {
|
177
|
177
|
|
178
|
178
|
socket.reconnect()
|
179
|
179
|
}
|
180
|
|
-
|
|
180
|
+
|
181
|
181
|
componentDidMount() {
|
182
|
182
|
// console.info('app componentDidMount')
|
183
|
183
|
}
|
|
@@ -187,7 +187,7 @@ class App extends Component {
|
187
|
187
|
this.initData()
|
188
|
188
|
}
|
189
|
189
|
|
190
|
|
- initData () {
|
|
190
|
+ initData() {
|
191
|
191
|
// console.info('app componentDidShow')
|
192
|
192
|
console.info('router1', this.$router)
|
193
|
193
|
console.info('ready status1', ready)
|
|
@@ -230,8 +230,10 @@ class App extends Component {
|
230
|
230
|
})
|
231
|
231
|
}
|
232
|
232
|
|
|
233
|
+
|
233
|
234
|
getRouterParams() {
|
234
|
235
|
return new Promise(resolve => {
|
|
236
|
+ console.log('------getRouterParams------>', this.$router)
|
235
|
237
|
const router = this.$router.params
|
236
|
238
|
const originQuery = { ...router.query };
|
237
|
239
|
let { query: { scene: paramsId }, scene } = router
|
|
@@ -265,12 +267,13 @@ class App extends Component {
|
265
|
267
|
originQuery,
|
266
|
268
|
paramsId: router.query.id || '',
|
267
|
269
|
from: router.query.from || 'search',
|
268
|
|
- recommender: router.query.recommender || ''
|
|
270
|
+ recommender: router.query.recommender || '',
|
|
271
|
+ targetId: router.query.id
|
269
|
272
|
})
|
270
|
273
|
|
271
|
274
|
resolve(router)
|
272
|
275
|
}
|
273
|
|
-
|
|
276
|
+
|
274
|
277
|
})
|
275
|
278
|
}
|
276
|
279
|
// 在 App 类中的 render() 函数没有实际作用
|