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

src/app.js

@@ -102,7 +102,7 @@ class App extends Component {
 
       'pages/checkin/index',
       'pages/checkin/checkinsuccess/index',
-      // 'pages/checkin/unregistered/index',
+     
 
     ],
     window: {
@@ -225,7 +225,7 @@ class App extends Component {
     return new Promise(resolve => {
       const router = this.$router.params
       let { query: { scene: paramsId } } = router
-
+console.log(paramsId,'paramsId---')
       if (paramsId) {
         // 扫码进入
         getCodeScene(paramsId).then(res => {
@@ -255,6 +255,7 @@ class App extends Component {
 
         resolve(router)
       }
+      
     })
   }
   // 在 App 类中的 render() 函数没有实际作用

src/pages/checkin/index.js

@@ -4,9 +4,13 @@ import { AtDivider, AtList, AtListItem, AtGrid, AtButton } from 'taro-ui'
 
 // import achievePhone from '@components/achievePhone'
 import { checkinDetails, checkinActive } from '@services/checkin'
-import { parseQueryString } from '@utils/tools'
-import { NONAME } from 'dns';
+import {
+  getCodeScene,
 
+} from '@services/common'
+import { parseQueryString, getQueryString } from '@utils/tools'
+import { NONAME } from 'dns';
+import ready from '@utils/ready'
 export default class checkin extends Component {
 
   state = {
@@ -16,26 +20,47 @@ export default class checkin extends Component {
   }
 
   componentWillMount () {
-    
+    ready.queue(() => {
+      const router = Taro.getStorageSync('router')
+
+      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)
+
+      // const routers = wx.getLaunchOptionsSync()
 
+      // const { query: { scene } } = routers
+      // console.log(routers, 'routers-----')
 
-    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.id , type = router.query.type || '' } = parseQueryString(router.query.params)
-    console.log(id, 'id-----')
-    this.setState({ id, type })
-    
+      // console.log(scene, 'query-----')
+      // getCodeScene(scene).then(res => {
+
+      //   let params = JSON.parse(res).scene
+
+      //   let id = getQueryString(params, 'id')
+      //   let type = getQueryString(params, 'type')
+
+      //   this.setState({ id, type })
+      //   this.getcheckinDetails(id, type)
+      // })
+
+    })
+
 
 
   }
+  // const router = Taro.getStorageSync('router')
 
-  componentDidShow(){
-    const { id , type } = this.state
-this.getcheckinDetails(id, type)
+
+
+  // const { id = router.query.id , type = router.query.type || '' } = parseQueryString(router.query.params)
+  // console.log(id, 'id-----')
+  // this.setState({ id, type })
+  componentDidShow () {
+    const { id, type } = this.state
+    // this.getcheckinDetails(id, type)
   }
   // dynamicId
   getcheckinDetails (id, type) {
@@ -66,7 +91,7 @@ this.getcheckinDetails(id, type)
         title: `失败: ${err.message}`,
         icon: 'none'
       })
-    
+
       console.error(err)
     })
   }
@@ -80,7 +105,7 @@ this.getcheckinDetails(id, type)
 
   render () {
     const { dynamic = {}, enlist = {}, person = {} } = this.state.data || {}
-    const {  activityStatus   } =  dynamic  || {}
+    const { activityStatus } = dynamic || {}
     console.log(enlist, 'enlist')
     return (
       <View className="checkin" style="width:100vw;height:100vh;" >
@@ -130,7 +155,7 @@ this.getcheckinDetails(id, type)
         </View>
           }
 
-          {!activityStatus &&
+          {activityStatus===0 &&
             <View>
               <View>
                 <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>