许静 5 年前
父节点
当前提交
5483e53a46
共有 4 个文件被更改,包括 32 次插入11 次删除
  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 查看文件

40
       }
40
       }
41
     },
41
     },
42
     pages: [
42
     pages: [
43
+      'pages/activity/activity',
43
       'pages/person/index',
44
       'pages/person/index',
44
       'pages/person/profile/index',
45
       'pages/person/profile/index',
45
       'pages/project/index',
46
       'pages/project/index',
46
-      'pages/activity/activity',
47
       'pages/shop/index',
47
       'pages/shop/index',
48
       'pages/project/detail/index',
48
       'pages/project/detail/index',
49
       'pages/activity/assemblePage',
49
       'pages/activity/assemblePage',

+ 5
- 1
src/pages/activity/detail/assemble.js 查看文件

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

+ 11
- 7
src/pages/activity/detail/assistance.js 查看文件

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

+ 15
- 2
src/pages/activity/detail/index.scss 查看文件

4
 //   width: 100% !important;
4
 //   width: 100% !important;
5
 //   padding: 30px 0;
5
 //   padding: 30px 0;
6
 // }
6
 // }
7
+.ass-page{
8
+  height: 100vh;
9
+}
7
 
10
 
8
 .flex {
11
 .flex {
9
   display: flex;
12
   display: flex;
19
 .detail-banner {
22
 .detail-banner {
20
   position: relative;
23
   position: relative;
21
   overflow: hidden;
24
   overflow: hidden;
22
-  height: 640px;
25
+  height: 624px;
23
   width: 100%;
26
   width: 100%;
24
 
27
 
25
   &__img {
28
   &__img {
43
       color: #FF245A;
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
 .detail-info{
60
 .detail-info{
48
   display: flex;
61
   display: flex;
388
       font-size: 26px;
401
       font-size: 26px;
389
       text-align: center;
402
       text-align: center;
390
       display: block;
403
       display: block;
391
-      width: 100%;
404
+      width: 120px;
392
       @include text-ellipsis;
405
       @include text-ellipsis;
393
     }
406
     }
394
     &-wait {
407
     &-wait {