Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.0.84:8080"',
-    // WSS_HOST: '"ws://192.168.0.84:8080"',
+    // HOST: '"http://192.168.0.218:8080"',
+    // WSS_HOST: '"ws://192.168.0.218:8080"',
   },
   weapp: {},
   h5: {}

src/pages/checkin/index.js

@@ -16,18 +16,26 @@ export default class checkin extends Component {
   }
 
   componentWillMount () {
+    
+
+
     const router = Taro.getStorageSync('router')
     console.log('router---', parseQueryString)
     console.log(router)
     // const id = router.query.paramsId
     // const type = router.query.type || ''
 
-    const { id = router.query.paramsId, type = router.query.type || '' } = parseQueryString(router.query.params)
+    const { id = router.query.id , type = router.query.type || '' } = parseQueryString(router.query.params)
     console.log(id, 'id-----')
     this.setState({ id, type })
-    this.getcheckinDetails(id, type)
+    
 
 
+  }
+
+  componentDidShow(){
+    const { id , type } = this.state
+this.getcheckinDetails(id, type)
   }
   // dynamicId
   getcheckinDetails (id, type) {
@@ -58,7 +66,7 @@ export default class checkin extends Component {
         title: `失败: ${err.message}`,
         icon: 'none'
       })
-
+    
       console.error(err)
     })
   }