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

src/pages/activity/detail/assemble.js

@@ -85,7 +85,7 @@ export default class Detail extends Component {
   componentDidShow() {
     this.startTicker()
   }
-  
+
   componentDidHide() {
     this.stopTicker()
   }
@@ -242,7 +242,7 @@ export default class Detail extends Component {
       if (actState != ActFinished) {
         ltTicker = this.getLeftTimeTicker(res.taShareActivity.startTime, res.taShareActivity.endTime)
       }
-debugger
+      debugger
       Taro.hideLoading()
       this.setState({
         detail: res.taShareActivity,
@@ -445,7 +445,7 @@ debugger
       this.togglePosterVisible()
     })
   }
-  
+
   transTPLs2Configs(tpls, params) {
     return tpls.map((tpl) => {
       const conf = getCanvasConfig(tpl.configs, params)
@@ -501,7 +501,7 @@ debugger
     return (
       <Block>
         {/* 生成海报 */}
-        { posterVisible && !ltTicker.processing &&
+        {posterVisible && !ltTicker.processing &&
           (
             <Poster configs={posterConfigs} onCancel={this.togglePosterVisible} onFinish={this.togglePosterVisible}></Poster>
           )
@@ -599,32 +599,33 @@ debugger
                 </View>
 
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
-                <View style="padding:0 40rpx">
-                  <Image src={detail.descImg} mode="widthFix" style="width:100%;margin-bottom:20px"></Image>
+                <View style="padding:0 40rpx 180rpx 40rpx">
+                  <Image src={detail.descImg} mode="widthFix" style="width:100%;"></Image>
                 </View>
+                <View className="btn-fixed">
+                  {
+                    actState === ActBeforeStart &&
+                    (<Button className="nostart-btn" style="margin:30px auto">未开始</Button>)
+                  }
+                  {
+                    isStarter && actState === ActInProcess && groupState === GroupInProcess &&
+                    (<Button className="assistance-btn" style="margin:30px auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button>)
+                  }
+                  {
+                    !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
 
-                {
-                  actState === ActBeforeStart &&
-                  (<Button className="nostart-btn" style="margin:30px auto">未开始</Button>)
-                }
-                {
-                  isStarter && actState === ActInProcess && groupState === GroupInProcess &&
-                  (<Button className="assistance-btn" style="margin:30px auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button>)
-                }
-                {
-                  !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
-
-                  <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
-                }
-                {
-                  !isStarter && actState === ActInProcess && groupState === GroupInProcess &&
-
-                  <View className="btn-box">
-                    <Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button>
                     <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
-                  </View>
+                  }
+                  {
+                    !isStarter && actState === ActInProcess && groupState === GroupInProcess &&
 
-                }
+                    <View className="btn-box">
+                      <Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button>
+                      <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                    </View>
+
+                  }
+                </View>
               </ScrollView>
 
               <action-sheet hidden={!actionSheetVisible} bindchange={this.toggleActionVisible}>

src/pages/activity/detail/index.js

@@ -103,7 +103,7 @@ export default class Detail extends Component {
     console.log(personId, "personId")
 
     addActivityShareNum(dynamicId)
-    
+
 
     savePoint({
       event: 'share',
@@ -119,7 +119,7 @@ export default class Detail extends Component {
       path: `/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}`,//分享地址
       imageUrl: shareContents[0].shareContentImg
     }
-    
+
   }
 
   handleSignup() {
@@ -381,12 +381,16 @@ export default class Detail extends Component {
                   <Text className="txt">收藏</Text>
                 </Button>
                 {
-                  parseInt(detail.isEnlist) != 0 && (parseInt(detail.isEnlist) == 2 ? (<Button disabled='true' className='submit-btn hasSigned'>报名人数已满</Button>) : ((phone ? (
+                  parseInt(detail.isEnlist) != 0 && detail.activityStatus != 2 && (parseInt(detail.isEnlist) == 2 ? (<Button disabled='true' className='submit-btn hasSigned'>报名人数已满</Button>) : ((phone ? (
                     <Button disabled={isSign} className={`submit-btn ${isSign ? 'hasSigned' : ''}`} onClick={this.handleSignup}>{isSign ? '已报名' : '立即报名'}</Button>
                   ) : (
                       <Button disabled={isSign} className='submit-btn' open-type="getPhoneNumber" onGetphonenumber={this.handleGetPhone}>{isSign ? '已报名' : '立即报名'}</Button>
                     ))))
                 }
+                {detail.activityStatus == 2 &&
+                  <Button disabled='true' className='submit-btn hasSigned' >立即报名</Button>
+                }
+
                 {/* {phone ? (
                   <Button disabled={isSign} className={`submit-btn ${isSign ? 'hasSigned' : ''}`} onClick={this.handleSignup}>{isSign ? '已报名' : '立即报名'}</Button>
                 ) : (

src/pages/activity/detail/index.scss

@@ -517,3 +517,13 @@ color:#dcdcdc;
   padding: 50px 30px ;
   width: 100%;
 }
+.btn-fixed{
+  position: fixed;
+  width: 100%;
+  height: 140px;
+  padding: 20px 0;
+  bottom: 0;
+  left:0;
+  background-color: #fff;
+  border-top: 1px solid #eee;
+}