zls

src/pages/checkin/checkinsuccess/index.js

@@ -5,6 +5,25 @@ import './index.scss'
 
 
 export default class checkinsuccess extends Component {
+  state = {
+    
+    addPoints:'',
+  }
+    componentWillMount () {
+    console.log(this.$router.params, '22222')
+
+    const  addPoints  = this.$router.params.addPoints
+    this.setState({
+      addPoints:addPoints
+    })
+    // this.setState({
+    //   id: id
+    // })
+    // console.log(id, type)
+    // this.getcheckinDetails(id, type)
+    // // this.getcheckinDetails()
+// addPoints  = this.$router.params.addPoints
+  }
 
   toshop () {
     wx.switchTab({
@@ -20,7 +39,7 @@ export default class checkinsuccess extends Component {
           <Image className="img" src={require('@assets/checkin/checkinsuccessfully.png')}  ></Image>
         </View>
         <View>
-          <Text className="text1" style="">+20积分</Text>
+          <Text className="text1" style="">+{this.state.addPoints}积分</Text>
           <Text className="text2" style="">恭喜您签到成功!</Text>
         </View>
         <View >

src/pages/checkin/index.js

@@ -10,7 +10,7 @@ import { checkinDetails, checkinActive } from '@services/checkin'
 export default class checkin extends Component {
 
   state = {
-    id:'',
+    id: '',
     // ischeck:''
     // isLogin: false,
     // user: {},
@@ -21,10 +21,12 @@ export default class checkin extends Component {
   }
 
   componentWillMount () {
-    console.log(this.$router.params,'22222')
+    console.log(this.$router.params, '22222')
 
     const { id, type } = this.$router.params
-
+    this.setState({
+      id: id
+    })
     console.log(id, type)
     this.getcheckinDetails(id, type)
     // this.getcheckinDetails()
@@ -33,14 +35,14 @@ export default class checkin extends Component {
   // dynamicId
   getcheckinDetails (id, type) {
     console.log('1111')
-    // const id = '39a0e51e6fea9cb758abed08dd7fb16b'
+    // const aid = '39a0e51e6fea9cb758abed08dd7fb16b'
     Taro.showLoading()
     checkinDetails(id, type).then(res => {
       Taro.hideLoading()
       this.setState({
         data: res
       })
-      console.log('1111', res)
+      console.log('1111', res.enlist.attendNum)
     })
   }
 
@@ -52,7 +54,8 @@ export default class checkin extends Component {
     checkinActive(enlistId).then(res => {
       Taro.hideLoading()
       Taro.navigateTo({
-        url: '/pages/checkin/checkinsuccess/index'
+        url: '/pages/checkin/checkinsuccess/index?addPoints=' + res.addPoints,
+      
       })
     }).catch((err) => {
       console.log('签到失败')
@@ -63,54 +66,68 @@ export default class checkin extends Component {
 
 
   }
-
-  toactivity () {
+  // toshop () {
+  //   wx.switchTab({
+  //     url: '/pages/shop/index'
+  //   });
+  // }
+  toactivity = (id) => {
+ 
+    // console.log("this.state.data.dynamic.dynamicId")
+    console.log(id)
+    console.log(this.state.data.dynamic.dynamicId)
     Taro.navigateTo({
-      // url: '/pages/checkin/checkinsuccess/index'
+      // url: '/pages/activity/detail/index?id=' + item.id`/pages/card/list/index?buildingId=${this.$router.params.buildingId}`
+      url: '/pages/activity/detail/index',
+      query: {
+        id: id
+      }
     })
   }
 
   render () {
-    const { data = { person: {}, dynamic: {} }, style } = this.props
 
+    // const { data = { person: {}, dynamic: {} }, style } = this.props
+    // console.log("data"  ,this.data)
     return (
       <View className="checkin" style="width:100vw;height:100vh;" >
 
         {/* <checkinsuccess></checkinsuccess> */}
         {/* <achievePhone></achievePhone> */}
         <View>
-          <Image className="img" src={data.dynamic.imgUrl}  ></Image>
+          <Image className="img" src={this.state.data.dynamic.imgUrl}  ></Image>
         </View>
         <View style="margin-bottom:20px"  >
-          <View className="text1"> <Text>{data.dynamic.title}</Text></View>
+          <View className="text1"> <Text>{this.state.data.dynamic.title}</Text></View>
         </View >
 
-        {data.enlist != null && <View>
-          <View style="text-align: center;">
-            <Text className="line">- - - - - - - - - </Text>
-            <Text className="text2">活动报名信息</Text>
-            <Text className="line">- - - - - - - - - </Text>
+        {this.state.data.enlist.enlistId != null && <View>
+          <View style="text-align: center;display:inline-block;width:100vw;">
+            <View style="text-align: center;display:inline-block;" className="line">- - - - - - - - - - - - - -   </View>
+            <View style="display:inline-block;" className="text2">活动报名信息</View>
+            <View style="text-align: center;display:inline-block;" className="line">- - - - - - - - - - - - -  </View>
           </View>
 
           <View className="text3">
             <View className='at-row'>
               <View className='at-col at-col-3'>用户名：</View>
-              <View className='at-col at-col-9'>{data.person.name || data.person.nickname}</View>
+              <View className='at-col at-col-9'>{this.state.data.person.name || this.state.data.person.nickname}</View>
             </View>
             <View className='at-row'>
               <View className='at-col at-col-3'>手机号：</View>
-              <View className='at-col at-col-9'>{data.person.tel || data.person.phone}</View>
+              <View className='at-col at-col-9'>{this.state.data.person.tel || this.state.data.person.phone}</View>
             </View>
             <View className='at-row'>
               <View className='at-col at-col-3'>参与人数：</View>
-              <View className='at-col at-col-9'>{(data.enlist || {}).attendNum}</View>
+              <View className='at-col at-col-9'>{(this.state.data.enlist.attendNum || 1)}人</View>
             </View>
           </View>
 
-          {!data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkin.png')} onClick={this.checkinActive}   ></Image>}
-          {data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkined.png')}></Image>}
+          {this.state.data.enlist.isCheckin === 0 && <Image className="checkinImg" src={require('@assets/checkin/checkin.png')} onClick={this.checkinActive}   ></Image>}
+          {this.state.data.enlist.isCheckin === 1 && <Image className="checkinImg" src={require('@assets/checkin/checkined.png')}></Image>}
+          {/* {console.log(data.person.status)} */}
         </View>}
-        {data.enlist == null && <View className="unregistered">
+        {this.state.data.enlist.enlistId == null && <View className="unregistered">
           <View>
             <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>
           </View>
@@ -118,8 +135,8 @@ export default class checkin extends Component {
             <Text className="messageText" >您还未报名当前活动,请先前往活动报名页报名成功后再进行扫码签到~ </Text>
 
           </View>
-
-          <AtButton type='primary' className="toactivebutton">立即前往</AtButton>
+{console.log(this.state.data.dynamic.dynamicId)}
+          <AtButton type='primary' className="toactivebutton" onClick={() => { this.toactivity(this.state.data.dynamic.dynamicId) }}>立即前往</AtButton>
           {/* <Image src={require('@assets/checkin/checkin.png')}  style="position: absolute; width:110px;height:110px ;bottom:12vh;left:132.5px"  ></Image> */}
         </View>}
       </View>

src/pages/checkin/index.scss

@@ -6,8 +6,8 @@
 
 .img {
   width: 750px;
-  height: 426px;
-  margin-bottom: 40px
+  height: 368px;
+  margin-bottom: 20px
 }
 
 .text1 {
@@ -19,13 +19,13 @@
   color: rgba(51, 51, 51, 1);
   line-height: 50px;
   font-weight: bold;
-  padding-left: 80px;
+  padding-left: 40px;
   // padding-top: 40px;
   margin-bottom: 40px;
 }
 
 .text2 {
-  width: 200px;
+  // width: 200px;
   height: 48px;
   font-size: 34px;
   font-family: PingFangSC-Medium, PingFang SC;
@@ -35,6 +35,7 @@
   letter-spacing: -0.82px;
   padding: 0 36px;
   margin-bottom: 20px;
+  white-space: nowrap;
 }
 
 .line {
@@ -42,12 +43,15 @@
   // text-align:center;
   // padding-top:30px;
   // border-bottom:2px dashed #000;
-
+  color:rgba(0, 0, 0, 0.12);
   // border-style:solid;
+  overflow: hidden;
   width: 200px;
-  height: 2px;
+  // height: 2px;
   border: 3px solid rgba(0, 0, 0, 0.12);
   border: none;
+  white-space: nowrap;
+  
 }
 
 .text3 {
@@ -116,7 +120,8 @@
   position: absolute;
   width: 220px;
   height: 220px;
-  bottom: 12vh;
+  bottom: 10vh;
   left: 265px
 }
 
+