许静 5 jaren geleden
bovenliggende
commit
5483e53a46
4 gewijzigde bestanden met toevoegingen van 32 en 11 verwijderingen
  1. 1
    1
      src/app.js
  2. 5
    1
      src/pages/activity/detail/assemble.js
  3. 11
    7
      src/pages/activity/detail/assistance.js
  4. 15
    2
      src/pages/activity/detail/index.scss

+ 1
- 1
src/app.js Bestand weergeven

@@ -40,10 +40,10 @@ class App extends Component {
40 40
       }
41 41
     },
42 42
     pages: [
43
+      'pages/activity/activity',
43 44
       'pages/person/index',
44 45
       'pages/person/profile/index',
45 46
       'pages/project/index',
46
-      'pages/activity/activity',
47 47
       'pages/shop/index',
48 48
       'pages/project/detail/index',
49 49
       'pages/activity/assemblePage',

+ 5
- 1
src/pages/activity/detail/assemble.js Bestand weergeven

@@ -416,7 +416,7 @@ export default class Detail extends Component {
416 416
 
417 417
         {
418 418
           loaded && (
419
-            <View>
419
+            <View className="ass-page">
420 420
               <Notice></Notice>
421 421
               <View className="detail-banner">
422 422
                 <Image mode="widthFix" src={detail.mainImg} className="detail-banner__img"></Image>
@@ -429,6 +429,10 @@ export default class Detail extends Component {
429 429
                     </View>
430 430
                   )
431 431
                 }
432
+                {detail.successNum>0 &&
433
+                  <View className="success-num">已成功 {detail.successNum}</View>
434
+
435
+                }
432 436
               </View>
433 437
               <ScrollView
434 438
                 scrollY

+ 11
- 7
src/pages/activity/detail/assistance.js Bestand weergeven

@@ -156,7 +156,7 @@ export default class Detail extends Component {
156 156
     this.setState({
157 157
       ltTicker: setInterval(() => {
158 158
         const [actState, leftTime] = this.compActState(startDate, endDate)
159
-        this.setState({actState, leftTime})
159
+        this.setState({ actState, leftTime })
160 160
 
161 161
         if (actState === ActFinished) {
162 162
           this.clearTicker()
@@ -250,7 +250,7 @@ export default class Detail extends Component {
250 250
       propertyName: '助力详情分享',
251 251
       data: '{}'
252 252
     })
253
-    
253
+
254 254
     if (!shares || !shares.length) {
255 255
       return {
256 256
         title: this.state.detail.title,
@@ -291,7 +291,7 @@ export default class Detail extends Component {
291 291
         this.setState({
292 292
           submitting: false,
293 293
           helpList,
294
-          initiateDetail: res.helpInitiateRecord,          
294
+          initiateDetail: res.helpInitiateRecord,
295 295
           initiateId: res.helpInitiateRecord.helpRecordInitiateId,
296 296
           helpState: res.helpInitiateRecord.status === undefined ? HelpInProcess : res.helpInitiateRecord.status,
297 297
         })
@@ -365,7 +365,7 @@ export default class Detail extends Component {
365 365
   getQRCode() {
366 366
     const [page, scene] = this.currentPageAndParams()
367 367
     const payload = { page, scene }
368
-  
368
+
369 369
     getMiniQrcode(payload).then(qrCode => {
370 370
       this.setState({ qrCode, posterVisible: true })
371 371
     })
@@ -375,7 +375,7 @@ export default class Detail extends Component {
375 375
   shareMoments = () => {
376 376
     this.getQRCode().then(() => {
377 377
       this.togglePosterVisible()
378
-    })    
378
+    })
379 379
   }
380 380
 
381 381
   render() {
@@ -412,7 +412,7 @@ export default class Detail extends Component {
412 412
       <Block>
413 413
         {/* 生成海报 */}
414 414
         {posterVisible && (<Poster tpls={posterTpls} params={posterData} onCancel={this.togglePosterVisible} onFinish={this.togglePosterVisible}></Poster>)}
415
-        
415
+
416 416
         {
417 417
           grantPhoneVisible &&
418 418
           <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
@@ -420,7 +420,7 @@ export default class Detail extends Component {
420 420
 
421 421
         {
422 422
           loaded && (
423
-            <View>
423
+            <View className="ass-page">
424 424
               <Notice></Notice>
425 425
               <View className="detail-banner">
426 426
                 <Image mode="widthFix" src={detail.img} className="detail-banner__img"></Image>
@@ -433,6 +433,10 @@ export default class Detail extends Component {
433 433
                     </View>
434 434
                   )
435 435
                 }
436
+                {detail.successNum>0 &&
437
+                  <View className="success-num">已成功 {detail.successNum}</View>
438
+
439
+                }
436 440
               </View>
437 441
               <ScrollView
438 442
                 scrollY

+ 15
- 2
src/pages/activity/detail/index.scss Bestand weergeven

@@ -4,6 +4,9 @@
4 4
 //   width: 100% !important;
5 5
 //   padding: 30px 0;
6 6
 // }
7
+.ass-page{
8
+  height: 100vh;
9
+}
7 10
 
8 11
 .flex {
9 12
   display: flex;
@@ -19,7 +22,7 @@
19 22
 .detail-banner {
20 23
   position: relative;
21 24
   overflow: hidden;
22
-  height: 640px;
25
+  height: 624px;
23 26
   width: 100%;
24 27
 
25 28
   &__img {
@@ -43,6 +46,16 @@
43 46
       color: #FF245A;
44 47
     }
45 48
   }
49
+  .success-num{
50
+    position: absolute;
51
+    right:0;
52
+    bottom:0;
53
+    color: #fff;
54
+    background:rgba(47,6,1,0.5);
55
+    padding: 8px 24px 8px 46px;
56
+    border-radius: 100px 0 0 0;
57
+    font-size: 24px;
58
+  }
46 59
 }
47 60
 .detail-info{
48 61
   display: flex;
@@ -388,7 +401,7 @@
388 401
       font-size: 26px;
389 402
       text-align: center;
390 403
       display: block;
391
-      width: 100%;
404
+      width: 120px;
392 405
       @include text-ellipsis;
393 406
     }
394 407
     &-wait {