zls

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.72:8080"',
-    WSS_HOST: '"ws://192.168.0.72:8080"',
+    HOST: '"http://192.168.0.238:8080"',
+    WSS_HOST: '"ws://192.168.0.238:8080"',
   },
   weapp: {},
   h5: {}

src/pages/card/index.js

@@ -464,9 +464,9 @@ export default class Index extends Component {
     const { userInfo, cardInfo, projectDetail } = this.props
     const { person: { personType, personId, phone, tel } } = userInfo
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
-    const { buildingId } = projectDetail
+    const { buildingId,address } = projectDetail
 
-    const visitorList = visitors ? visitors.slice(0, 5) : []
+  const visitorList = visitors ? visitors.slice(0, 5) : []
     const isSelf = personId === id
 
     const isConsultant = personType === ROLE_CODE['CONSULTANT']
@@ -592,7 +592,7 @@ export default class Index extends Component {
                   </View>
                   <View className='detailed__add' onClick={this.getLocation}>
                     <View className='detailed__add__txt'>
-                      <Text className='add__txt' space='emsp'>地址　</Text> {cardInfo.address}
+                      <Text className='add__txt' space='emsp'>地址　</Text> {address}
                     </View>
                     <Text className='iconfont icon-daohangdizhi add__img'></Text>
                   </View>

src/pages/checkin/index.js

@@ -17,22 +17,28 @@ export default class checkin extends Component {
 
   componentWillMount () {
     const router = Taro.getStorageSync('router')
-    console.log('router---',router)
-    console.log('props---',this.props)
-    const { id, type } = parseQueryString(router.query.params)
-    console.log('props---',id)
+    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)
+    console.log(id, 'id-----')
     this.setState({ id, type })
     this.getcheckinDetails(id, type)
+
+
   }
   // dynamicId
   getcheckinDetails (id, type) {
     Taro.showLoading()
 
     checkinDetails(id, type).then(res => {
+      console.log('data:', res)
       Taro.hideLoading()
       this.setState({
         data: res,
-      })      
+      })
     })
   }
 
@@ -44,7 +50,7 @@ export default class checkin extends Component {
 
       // TODO: 需要依据 type 跳转
       Taro.navigateTo({
-        url: '/pages/checkin/checkinsuccess/index?addPoints=' + res.addPoints,      
+        url: '/pages/checkin/checkinsuccess/index?addPoints=' + res.addPoints,
       })
 
     }).catch((err) => {
@@ -66,7 +72,8 @@ export default class checkin extends Component {
 
   render () {
     const { dynamic = {}, enlist = {}, person = {} } = this.state.data || {}
-
+    const {  activityStatus   } =  dynamic  || {}
+    console.log(enlist, 'enlist')
     return (
       <View className="checkin" style="width:100vw;height:100vh;" >
 
@@ -106,16 +113,16 @@ export default class checkin extends Component {
           {/* {console.log(data.person.status)} */}
         </View>}
         {enlist.enlistId == null && <View className="unregistered">
-        {dynamic.activityStatus === 1 && <View style="text-align: center;color:#666666">
-          活动未开始
+          {activityStatus === 1 && <View style="text-align: center;color:#666666">
+            活动未开始
         </View>
           }
-          {dynamic.activityStatus === 2 && <View style="text-align: center;color:#666666">
-          活动已结束
+          {activityStatus === 2 && <View style="text-align: center;color:#666666">
+            活动已结束
         </View>
           }
 
-          {!dynamic.activityStatus && 
+          {!activityStatus &&
             <View>
               <View>
                 <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>
@@ -127,9 +134,9 @@ export default class checkin extends Component {
 
               <AtButton type='primary' className="toactivebutton" onClick={() => { this.toactivity(dynamic.dynamicId) }}>立即前往</AtButton>
             </View>
-          }        
+          }
         </View>
-      }
+        }
       </View>
 
     );