feats

src/app.js

@@ -40,10 +40,10 @@ class App extends Component {
       }
     },
     pages: [
+      'pages/activity/activity',
       'pages/person/index',
       'pages/person/profile/index',
       'pages/project/index',
-      'pages/activity/activity',
       'pages/shop/index',
       'pages/project/detail/index',
       'pages/activity/assemblePage',

src/pages/activity/assistanceItem/index.js

@@ -70,7 +70,7 @@ export default class Item extends Component {
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
         <Image className="pic" src={data.img} ></Image>
-        <View className="title">{data.title} {data.status}</View>
+        <View className="title">{data.title}</View>
         {!data.verification&&
         <View className="time">{this.state.actState === 1 ? '距活动结束:' : '活动已结束'}<Text className="count-time">{this.state.actState != 2 ? this.formateLeftTime() : ''}</Text></View>
         }

src/pages/activity/detail/assemble.js

@@ -423,16 +423,32 @@ export default class Detail extends Component {
 
         {
           loaded && (
-            <View>
+            <View className="ass-page">
               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.mainImg} className="detail-banner__img"></Image>
+<<<<<<< HEAD
                 
                 <View className="rest-time">
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
                   <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
                 </View>
 
+=======
+                {
+                  groupState === GroupInProcess && actState != ActFinished &&
+                  (
+                    <View className="rest-time">
+                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '活动已结束')} </Text>
+                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
+                    </View>
+                  )
+                }
+                {detail.successNum>0 &&
+                  <View className="success-num">已成功 {detail.successNum}</View>
+
+                }
+>>>>>>> 4fa08fccaf3ed20ed1dcc549346b4b829f473145
               </View>
               <ScrollView
                 scrollY

src/pages/activity/detail/assistance.js

@@ -155,7 +155,7 @@ export default class Detail extends Component {
     this.setState({
       ltTicker: setInterval(() => {
         const [actState, leftTime] = this.compActState(startDate, endDate)
-        this.setState({actState, leftTime})
+        this.setState({ actState, leftTime })
 
         if (actState === ActFinished) {
           this.clearTicker()
@@ -251,7 +251,7 @@ export default class Detail extends Component {
       propertyName: '助力详情分享',
       data: '{}'
     })
-    
+
     if (!shares || !shares.length) {
       return {
         title: this.state.detail.title,
@@ -292,7 +292,7 @@ export default class Detail extends Component {
         this.setState({
           submitting: false,
           helpList,
-          initiateDetail: res.helpInitiateRecord,          
+          initiateDetail: res.helpInitiateRecord,
           initiateId: res.helpInitiateRecord.helpRecordInitiateId,
           helpState: res.helpInitiateRecord.status === undefined ? HelpInProcess : res.helpInitiateRecord.status,
         })
@@ -371,7 +371,7 @@ export default class Detail extends Component {
   getQRCode() {
     const [page, scene] = this.currentPageAndParams()
     const payload = { page, scene }
-  
+
     getMiniQrcode(payload).then(qrCode => {
       this.setState({ qrCode, posterVisible: true })
     })
@@ -381,7 +381,7 @@ export default class Detail extends Component {
   shareMoments = () => {
     this.getQRCode().then(() => {
       this.togglePosterVisible()
-    })    
+    })
   }
 
   render() {
@@ -418,7 +418,7 @@ export default class Detail extends Component {
       <Block>
         {/* 生成海报 */}
         {posterVisible && (<Poster tpls={posterTpls} params={posterData} onCancel={this.togglePosterVisible} onFinish={this.togglePosterVisible}></Poster>)}
-        
+
         {
           grantPhoneVisible &&
           <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
@@ -426,16 +426,32 @@ export default class Detail extends Component {
 
         {
           loaded && (
-            <View>
+            <View className="ass-page">
               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.img} className="detail-banner__img"></Image>
+<<<<<<< HEAD
                 
                 <View className="rest-time">
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
                   <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
                 </View>
 
+=======
+                {
+                  helpState === HelpInProcess && actState != ActFinished &&
+                  (
+                    <View className="rest-time">
+                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '活动已结束')} </Text>
+                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
+                    </View>
+                  )
+                }
+                {detail.successNum>0 &&
+                  <View className="success-num">已成功 {detail.successNum}</View>
+
+                }
+>>>>>>> 4fa08fccaf3ed20ed1dcc549346b4b829f473145
               </View>
               <ScrollView
                 scrollY

src/pages/activity/detail/index.scss

@@ -4,6 +4,9 @@
 //   width: 100% !important;
 //   padding: 30px 0;
 // }
+.ass-page{
+  height: 100vh;
+}
 
 .flex {
   display: flex;
@@ -19,7 +22,7 @@
 .detail-banner {
   position: relative;
   overflow: hidden;
-  height: 640px;
+  height: 624px;
   width: 100%;
 
   &__img {
@@ -43,6 +46,16 @@
       color: #FF245A;
     }
   }
+  .success-num{
+    position: absolute;
+    right:0;
+    bottom:0;
+    color: #fff;
+    background:rgba(47,6,1,0.5);
+    padding: 8px 24px 8px 46px;
+    border-radius: 100px 0 0 0;
+    font-size: 24px;
+  }
 }
 .detail-info{
   display: flex;
@@ -388,7 +401,7 @@
       font-size: 26px;
       text-align: center;
       display: block;
-      width: 100%;
+      width: 120px;
       @include text-ellipsis;
     }
     &-wait {