许静 5 years ago
parent
commit
c672e400cd

+ 2
- 2
src/pages/activity/detail/assemble.js View File

443
 
443
 
444
                 <View className="rest-time">
444
                 <View className="rest-time">
445
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
445
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
446
-                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
446
+                  <Text className="row-text">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
447
                 </View>
447
                 </View>
448
                 {detail.successNum > 0 &&
448
                 {detail.successNum > 0 &&
449
                   <View className="success-num">
449
                   <View className="success-num">
520
                   </View>
520
                   </View>
521
                 </View>
521
                 </View>
522
 
522
 
523
-                <View className="assistance-text"><Text style="color:#dcdcdc">------------------- </Text><Text className="acitivty-desc">活动说明</Text><Text style="color:#dcdcdc">-------------------</Text></View>
523
+                <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
524
                 <View style="padding:0 40rpx">
524
                 <View style="padding:0 40rpx">
525
                   <Image src={detail.descImg} style="width:100%"></Image>
525
                   <Image src={detail.descImg} style="width:100%"></Image>
526
                 </View>
526
                 </View>

+ 2
- 2
src/pages/activity/detail/assistance.js View File

443
 
443
 
444
                 <View className="rest-time">
444
                 <View className="rest-time">
445
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
445
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
446
-                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
446
+                  <Text className="row-text">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
447
                 </View>
447
                 </View>
448
                 {detail.successNum > 0 &&
448
                 {detail.successNum > 0 &&
449
 
449
 
532
                     )
532
                     )
533
                   }
533
                   }
534
                 </View>
534
                 </View>
535
-                <View className="assistance-text"><Text style="color:#dcdcdc">------------------- </Text><Text className="acitivty-desc">活动说明</Text><Text style="color:#dcdcdc">-------------------</Text></View>
535
+                <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
536
                 <View style="padding:0 40rpx">
536
                 <View style="padding:0 40rpx">
537
                   <Image src={detail.activityInstructions} style="width:100%;margin-bottom:20px"></Image>
537
                   <Image src={detail.activityInstructions} style="width:100%;margin-bottom:20px"></Image>
538
                 </View>
538
                 </View>

+ 20
- 7
src/pages/activity/detail/index.scss View File

48
       color:#666;
48
       color:#666;
49
       margin-right: 10px;
49
       margin-right: 10px;
50
     }
50
     }
51
-    .row-content{
51
+    .row-text{
52
       color: #FF245A;
52
       color: #FF245A;
53
       min-width: 6em;
53
       min-width: 6em;
54
       display: inline-block;
54
       display: inline-block;
90
 .detail-wrap {
90
 .detail-wrap {
91
   background: transparent;
91
   background: transparent;
92
 }
92
 }
93
-.acitivty-desc{
94
-  margin: 0 30px;
95
-  color: $primary-color;
96
-  font-size: 32px;
97
-}
93
+
98
 .detail {
94
 .detail {
99
   background: white;
95
   background: white;
100
   border-top-left-radius: 28px;
96
   border-top-left-radius: 28px;
459
 }
455
 }
460
 .assistance-text{
456
 .assistance-text{
461
 text-align: center;
457
 text-align: center;
462
-margin: 20px 0;
458
+position: relative;
459
+white-space: nowrap;
460
+margin: 0 40px;
461
+overflow: hidden;
462
+height: 80px;
463
+line-height: 80px;
464
+color:#dcdcdc;
465
+.acitivty-desc{
466
+  color: $primary-color;
467
+  font-size: 32px;
468
+  position: absolute;
469
+  left: 50%;
470
+  margin-left: -94px;
471
+  padding: 0 30px;
472
+  background-color: #fff;
473
+ 
474
+}
463
 }
475
 }
464
 .assistance-btn {
476
 .assistance-btn {
465
   background:$primary-color;
477
   background:$primary-color;
471
   width: 320px;
483
   width: 320px;
472
   height: 100px;
484
   height: 100px;
473
   line-height: 100px;
485
   line-height: 100px;
486
+  position: absolute;
474
 }
487
 }
475
 .set-btn{
488
 .set-btn{
476
   border-radius:8px;
489
   border-radius:8px;