Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

src/pages/activity/detail/assemble.js

@@ -439,7 +439,7 @@ export default class Detail extends Component {
 
                 <View className="rest-time">
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
-                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
+                  <Text className="row-text">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
                 </View>
                 {detail.successNum > 0 &&
                   <View className="success-num">
@@ -516,7 +516,7 @@ export default class Detail extends Component {
                   </View>
                 </View>
 
-                <View className="assistance-text"><Text style="color:#dcdcdc">------------------- </Text><Text className="acitivty-desc">活动说明</Text><Text style="color:#dcdcdc">-------------------</Text></View>
+                <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
                 <View style="padding:0 40rpx">
                   <Image src={detail.descImg} style="width:100%"></Image>
                 </View>

src/pages/activity/detail/assistance.js

@@ -439,7 +439,7 @@ export default class Detail extends Component {
 
                 <View className="rest-time">
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
-                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
+                  <Text className="row-text">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
                 </View>
                 {detail.successNum > 0 &&
 
@@ -528,7 +528,7 @@ export default class Detail extends Component {
                     )
                   }
                 </View>
-                <View className="assistance-text"><Text style="color:#dcdcdc">------------------- </Text><Text className="acitivty-desc">活动说明</Text><Text style="color:#dcdcdc">-------------------</Text></View>
+                <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
                 <View style="padding:0 40rpx">
                   <Image src={detail.activityInstructions} style="width:100%;margin-bottom:20px"></Image>
                 </View>

src/pages/activity/detail/index.scss

@@ -48,7 +48,7 @@
       color:#666;
       margin-right: 10px;
     }
-    .row-content{
+    .row-text{
       color: #FF245A;
       min-width: 6em;
       display: inline-block;
@@ -90,11 +90,7 @@
 .detail-wrap {
   background: transparent;
 }
-.acitivty-desc{
-  margin: 0 30px;
-  color: $primary-color;
-  font-size: 32px;
-}
+
 .detail {
   background: white;
   border-top-left-radius: 28px;
@@ -459,7 +455,23 @@
 }
 .assistance-text{
 text-align: center;
-margin: 20px 0;
+position: relative;
+white-space: nowrap;
+margin: 0 40px;
+overflow: hidden;
+height: 80px;
+line-height: 80px;
+color:#dcdcdc;
+.acitivty-desc{
+  color: $primary-color;
+  font-size: 32px;
+  position: absolute;
+  left: 50%;
+  margin-left: -94px;
+  padding: 0 30px;
+  background-color: #fff;
+ 
+}
 }
 .assistance-btn {
   background:$primary-color;
@@ -471,6 +483,7 @@ margin: 20px 0;
   width: 320px;
   height: 100px;
   line-height: 100px;
+  position: absolute;
 }
 .set-btn{
   border-radius:8px;