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

src/constants/api.js

@@ -149,4 +149,7 @@ export const API_HELP_DETAIL = resolvePath('helpActivity')
 export const API_HELP_CREATE = resolvePath('helpInitiateRecord')
 export const API_HELP_FRIEND = resolvePath('helpRecord')
 
-//
+// 拼团
+export const API_GROUP_DETAIL = resolvePath('taShareActivity')
+export const API_GROUP_CREATE = resolvePath('taShareRecord')
+export const API_GROUP_JOIN = resolvePath('taShareChildRecord')

src/pages/activity/detail/assemble.js

@@ -1,19 +1,18 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import Notice from '@components/Notice'
-import BackHomeBtn from '@components/BackHomeBtn'
-import Poster from './poster'
+// import BackHomeBtn from '@components/BackHomeBtn'
+import AchievePhone from '@components/achievePhone'
+import Poster from '@components/Poster'
 import dayjs from 'dayjs'
-import WxParse from '@components/wxParse/wxParse'
-import getUserPhone from '@utils/getUserPhone'
+// import WxParse from '@components/wxParse/wxParse'
+// import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
-import { getDownloadURL } from '@utils/tools'
+import { getDownloadURL, times, formateLeftTime } from '@utils/tools'
 import {
-  addActivityShareNum,
-  signupActivity,
-  favorActivity,
-  cancelFavorActivity,
-  queryActivityDetail
+  getGroupDetail,
+  createGroupActivity,
+  joinGroupBuy,
 } from '@services/activity'
 import {
   getMiniQrcode,
@@ -22,6 +21,16 @@ import {
 } from '@services/common'
 import { connect } from '@tarojs/redux'
 
+// 活动状态
+const ActBeforeStart = 0;
+const ActInProcess = 1;
+const ActFinished = 2;
+
+// 发起的拼团状态
+const GroupInProcess = 1;
+const GroupSuccess = 0;
+const GroupFailure = 2;
+
 @connect(state => state.user)
 export default class Detail extends Component {
   config = {
@@ -29,364 +38,503 @@ export default class Detail extends Component {
   }
 
   state = {
-    id: null,
+    id: null, // 活动ID
+    recordId: undefined,  // 发起拼团ID
     loaded: false,
-    detail: {},
-    recordId: null,
-    isSaved: false,
-    isSign: false,
-    posterShow: false,
-    posterData: {},
-    posterVisible: false,
-    selector: ['1', '2', '3'],
-    selectorChecked: '1',
-    canChoose: 'none',
-    inputName: ''
+    detail: {}, // 活动详情
+    recordDetail: {}, // 发团记录
+    memberList: [], // 团员记录
+    shares: [], // 分享设置
+    posters: [], // 海报模板
+    leftTime: 0,  // 剩余时间
+    ltTicker: undefined,  // 剩余时间计时器
+    actState: ActBeforeStart,  // 活动本身状态
+    groupState: GroupInProcess, // 发起拼团活动的状态
+    isStarter: true, // 是否发起人
+    submitting: false, // 是否提交中
+    actionSheetVisible: false, // 底部分享好友
+    posterVisible: false, // 海报分享
+    grantPhoneVisible: false, // 授权电话
+    grantAvatarVisible: false, // 授权头像
   }
 
   componentWillMount() {
     ready.queue(() => {
-      const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id || '2fe920719b8b0db50011441462e647ad'
-      this.setState({ id }, () => {
-        this.loadDetail()
-      })
+      // 必须授权电话
+      if (this.toggleGrantPhone()) {
+        this.initPageData()
+      }
     })
   }
+
   componentWillUnmount() {
-    const { recordId } = this.state
-    recordId && updatePoint(recordId)
+    this.clearTicker()
   }
 
-  loadDetail() {
-    const { id } = this.state
-    Taro.showLoading()
-    queryActivityDetail(id).then(res => {
-      Taro.hideLoading()
-      const { isSaved, isSign } = res
-      this.setState({
-        detail: res,
-        isSaved,
-        isSign,
-        loaded: true
-      }, () => {
-        const { detail } = this.state
-        if (detail.posters[0].posterImg) {
-          this.setState({
-            posterShow: true
-          })
-        }
-      })
-      WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
-
-      savePoint({
-        event: 'detail',
-        eventType: 'activity',
-        propertyName: '活动详情',
-        buildingId: res.buildingId,
-        targetId: res.dynamicId,
-        data: '{}'
-      }).then(res1 => {
-        this.setState({
-          recordId: res1.recordId
-        })
-        console.log('活动详情')
+  // 初始化页面数据
+  initPageData = () => {
+    if (!this.state.detail.groupActivityId) {
+      const router = Taro.getStorageSync('router')
+      const id = this.$router.params.id || router.query.id
+      const recordId = this.$router.params.recordId || router.query.recordId
+
+      this.setState({ id, recordId }, () => {
+        this.loadDetail()
       })
-    })
+    }
   }
-  onShareAppMessage = () => {
-    const { detail: { shareContents, title, dynamicId, url } } = this.state
-    const { userInfo: { person: { personId } } } = this.props
-
-    addActivityShareNum(dynamicId)
 
-    savePoint({
-      event: 'share',
-      eventType: 'activity',
-      propertyName: '活动详情分享',
-      data: '{}'
-    }).then(res => {
-      console.log('活动详情分享')
-    })
-    return {
-      title: shareContents[0].shareContentTitle,
-      path: `/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}`,//分享地址
-      imageUrl: shareContents[0].shareContentImg
+  // 清除 ticker
+  clearTicker() {
+    if (this.state.ltTicker) {
+      clearInterval(this.state.ltTicker)
+      this.setState({ ltTicker: undefined })
     }
   }
 
-  handleSignup() {
-    const { detail: { buildingId, dynamicId }, isSign } = this.state
-    const { userInfo: { person: { phone, name, nickname } } } = this.props
+  // 调起授权电话
+  toggleGrantPhone = () => {
+    const { userInfo: { person: { phone } } } = this.props
+    if (!phone) {
+      this.setState({ grantPhoneVisible: true })
+      return false
+    }
 
-    if (isSign) {
-      Taro.showToast({
-        icon: 'none',
-        title: '你已报名成功'
-      })
-      return
+    return true
+  }
+
+  // 调起授权头像
+  toggleGrantAvatar = () => {
+    const { userInfo: { person: { avatarurl } } } = this.props
+    if (!avatarurl) {
+      this.setState({ grantAvatarVisible: true })
+      return false
     }
 
+    return true
+  }
+  
+  // 打开关闭 ActionSheet 面板
+  toggleActionVisible = () => {
     this.setState({
-      canChoose: 'block'
+      actionSheetVisible: !this.state.actionSheetVisible
     })
   }
 
-  handleFavor() {
-    const { detail: { dynamicId }, isSaved } = this.state
-    if (isSaved) {
-      cancelFavorActivity(dynamicId).then(res => {
-        Taro.showToast({
-          title: '已取消收藏'
-        })
-        this.setState({
-          isSaved: false
-        })
-      })
+  // 打开关闭海报面板
+  togglePosterVisible = () => {
+    this.setState({
+      posterVisible: !this.state.posterVisible,
+      actionSheetVisible: false
+    })
+  }
+
+  compActState = (startDate, endDate) => {
+    const st = dayjs(startDate).valueOf()
+    const ed = dayjs(endDate).valueOf()
+    const nw = dayjs().valueOf()
+
+    if (st > nw) {
+      // 活动未开始
+      return [ActBeforeStart, st - nw]
+    } else if (ed > nw) {
+      // 活动进行中
+      return [ActInProcess, ed - nw]
     } else {
-      favorActivity(dynamicId).then(res => {
-        Taro.showToast({
-          title: '收藏成功'
-        })
-        this.setState({
-          isSaved: true
-        })
-      })
+      // 活动已结束
+      return [ActFinished, 0]
     }
-    savePoint({
-      event: 'save',
-      eventType: 'activity',
-      propertyName: '活动详情收藏',
-      data: '{}'
-    }).then(res => {
-      console.log('活动详情收藏')
-    })
   }
 
-  handleGetPhone(e) {
-    getUserPhone(e, (phoneNumber) => {
-      if (phoneNumber) {
-        this.handleSignup()
-      } else {
-        Taro.showToast({
-          title: '报名失败',
-          icon: 'none'
-        })
-      }
+  // 计时器更新剩余时间
+  updateLeftTime(startDate, endDate) {
+    this.setState({
+      ltTicker: setInterval(() => {
+        const [actState, leftTime] = this.compActState(startDate, endDate)
+        this.setState({actState, leftTime})
+
+        if (actState === ActFinished) {
+          this.clearTicker()
+        }
+      }, 1000)
     })
   }
-  getPosterData = () => {
-    return new Promise(resolve => {
-      const { posterData } = this.state
-      if (posterData.qrcode) {
-        resolve(posterData)
-        return
-      }
 
-      const { userInfo: { person } } = this.props
-      const { avatarurl, nickname, personId } = person
-      const { detail: { dynamicId, posters, createDate } } = this.state
-      const payload = {
-        "scene": `id=${dynamicId}&from=dynamic_share&recommender=${personId}`,
-        "page": 'pages/activity/detail/index',
+  loadDetail() {
+    const { id, recordId } = this.state
+    const { userInfo } = this.props
+
+    Taro.showLoading()
+    getGroupDetail(id, recordId).then(res => {
+      this.clearTicker()
+
+      const recordDetail = res.taShareRecord || {}
+      let [actState, leftTime] = this.compActState(res.taShareActivity.startTime, res.taShareActivity.endTime)
+
+      if (res.taShareActivity.status != 1) {
+        actState = ActFinished
       }
-      debugger
-      const _avatarurl = getDownloadURL(avatarurl, 'avatar');
-      getMiniQrcode(payload).then(qrcode => {
-        let data = {
-          qrcode,//小程序二维码
-          nickname,//访问者名字
-          avatarurl: _avatarurl,//访问者头像
-          poster: posters[0].posterImg,
-          title: posters[0].posterTitle,//海报标题
-          createDate: createDate,//时间
-        }
-        resolve(data)
+
+      Taro.hideLoading()
+      this.setState({
+        detail: res.taShareActivity,
+        recordDetail,
+        recordId: recordDetail.recordId,
+        groupState: recordDetail.status === undefined ? GroupInProcess : recordDetail.status,
+        shares: res.shareContentList || [],
+        posters: res.postList || [],
+        posterTpls: res.posterTemplateList || [],
+        memberList: res.shareChildRecordList || [],
+        loaded: true,
+        isStarter: !recordDetail.personId || userInfo.person.personId === recordDetail.personId,
+        actState,
+        leftTime,
       })
+
+      if (actState != ActFinished) {
+        this.updateLeftTime(res.taShareActivity.startTime, res.taShareActivity.endTime)
+      }
+
+      // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
+
+      // savePoint({
+      //   event: 'detail',
+      //   eventType: 'group',
+      //   propertyName: '拼团详情',
+      //   buildingId: res.buildingId,
+      //   targetId: res.groupActivityId,
+      //   data: '{}'
+      // }).then(res1 => {
+      //   this.setState({
+      //     recordId: res1.recordId
+      //   })
+      // })
     })
   }
-  // 开始生成海报
-  togglePosterStatus = (flag) => {
-    if (flag) {
-      this.getPosterData().then(posterData => {
-        this.setState({
-          posterVisible: !!flag,
-          posterData
-        })
-      })
-      // App.zhuge.track('生成活动详情海报')
-    } else {
-      this.setState({
-        posterVisible: !!flag
-      })
+
+  currentPageAndParams() {
+    const { id, recordId } = this.state
+    const { userInfo: { person: { personId } } } = this.props
+
+    let queryParams = [
+      `id=${id}`,
+      `from=group_share`,
+      `recommender=${personId}`
+    ]
+    if (recordId) {
+      queryParams.push(`recordId=${recordId}`)
     }
+
+    const res = [
+      'pages/activity/detail/assemble',
+      queryParams.join('&'),
+    ]
+
+    console.log('--page-params->', res)
+    return res
+  }
+
+
+  onShareAppMessage = () => {
+    const { shares } = this.state
+    const currentPage = this.currentPageAndParams().join('?')
+
     savePoint({
-      event: 'poster',
-      eventType: 'activity',
-      propertyName: '生成活动详情海报',
+      event: 'share',
+      eventType: 'group',
+      propertyName: '拼团详情分享',
       data: '{}'
-    }).then(res => {
-      console.log('生成活动详情海报')
     })
-  }
 
-  handleMoreClick() {
-    // App.zhuge.track('查看置业顾问列表')
-    console.log()
-    Taro.navigateTo({
-      url: `/pages/card/list/index?buildingId=${this.$router.params.buildingId}`
-    })
-  }
+    if (!shares || !shares.length) {
+      return {
+        title: this.state.detail.activityName,
+        path: currentPage,//分享地址
+        imageUrl: this.state.detail.mainImg
+      }
+    }
 
-  onChange = e => {
-    this.setState({
-      selectorChecked: this.state.selector[e.detail.value]
-    })
+    return {
+      title: shares[0].shareContentTitle,
+      path: currentPage,//分享地址
+      imageUrl: shares[0].shareContentImg
+    }
   }
+  
+  // 立即参团
+  joinGroup = () => {
+    if (this.state.submitting) return
 
-  onInputText = e => {
-    this.setState({
-      inputName: e.detail.value
+    Taro.showLoading()
+    this.setState({ submitting: true }, () => {
+      const { detail, recordDetail } = this.state
+      const person = this.props.userInfo.person
+
+      joinGroupBuy({
+        recordId: recordDetail.recordId,
+        groupActivityId: detail.groupActivityId,
+        personId: person.personId,
+        nickname: person.name || person.nickname,
+        phone: person.tel || person.phone,
+        avatarurl: person.avatarurl,
+      }).then((res) => {
+        Taro.hideLoading()
+        const memberList = this.state.memberList || []
+        memberList.push(res.taShareChildRecord)
+
+        this.setState({
+          submitting: false,
+          memberList,
+          recordDetail: res.taShareRecord,          
+          recordId: res.taShareRecord.recordId,
+          groupState: res.taShareRecord.status === undefined ? GroupInProcess : res.taShareRecord.status,
+        })
+
+        Taro.showToast({
+          title: '参团成功',
+          icon: 'success'
+        })
+      }).catch(err => {
+        console.log('err:', err)
+        Taro.hideLoading()
+        this.setState({ submitting: false })
+      })
     })
   }
 
-  comfire = e => {
+  // 发起我的拼团
+  startMine = () => {
+    // 必须授权头像
+    if (this.toggleGrantAvatar()) {
+      const detail = this.state.detail
+      const person = this.props.userInfo.person
 
-    const { detail: { buildingId, dynamicId }, isSign, selectorChecked, inputName } = this.state
-    const { userInfo: { person: { phone, name, nickname, tel } } } = this.props
-
-    if (inputName == '') {
-      Taro.showToast({
-        title: '请输入姓名',
-        icon: 'none'
+      return new Promise((resolve, reject) => {
+        createGroupActivity({
+          groupActivityId: detail.groupActivityId,
+          personId: person.personId,
+          nickname: person.name || person.nickname,
+          phone: person.tel || person.phone,
+          avatarurl: person.avatarurl,
+        }).then(res => {
+          this.setState({
+            recordDetail: res,
+            recordId: res.recordId,
+            memberList: [],
+            isStarter: true,
+            groupState: GroupInProcess,
+          }, resolve)
+        }).catch(err => {
+          console.log('err:', err)
+          Taro.showToast({
+            title: '发起失败: ' + err.message,
+            icon: 'none'
+          })
+          reject()
+        })
       })
-      return
     }
 
-    const payload = {
-      buildingId,
-      dynamicId,
-      name: inputName,
-      phone: phone ? phone : tel,
-      attendNum: selectorChecked
+    return Promise.reject()
+  }
+  
+  // 请求好友参团
+  groupBuyInvite = () => {
+    // 必须授权头像
+    if (this.toggleGrantAvatar()) {
+      const recordDetail = this.state.recordDetail
+      if (!recordDetail.recordId) {
+        // 如果是未发起的拼团, 先以当前人身份发起
+        this.startMine().then(() => {
+          this.toggleActionVisible()
+        })
+      } else {
+        this.toggleActionVisible()
+      }
     }
+  }
 
-    signupActivity(payload).then(res => {
-      Taro.showToast({
-        title: '报名成功'
-      })
-      this.setState({
-        isSign: true,
-        canChoose: 'none'
-      })
-    })
-
-    savePoint({
-      event: 'enlist',
-      eventType: 'activity',
-      propertyName: '活动详情报名',
-      data: '{}'
-    }).then(res => {
-      console.log('活动详情报名 ')
+  getQRCode() {
+    const [page, scene] = this.currentPageAndParams()
+    const payload = { page, scene }
+  
+    getMiniQrcode(payload).then(qrCode => {
+      this.setState({ qrCode, posterVisible: true })
     })
   }
 
-  hideModal() {
-    this.setState({
-      canChoose: 'none'
-    })
+  // 发送朋友圈
+  shareMoments = () => {
+    this.getQRCode().then(() => {
+      this.togglePosterVisible()
+    })    
   }
 
   render() {
-    const { detail, loaded, isSaved, isSign, posterVisible, posterData, posterShow } = this.state
-    const { userInfo: { person: { phone } } } = this.props
+    const {
+      recordId,
+      recordDetail,
+      detail,
+      loaded,
+      actState,
+      posterVisible,
+      isStarter,
+      memberList,
+      groupState,
+      actionSheetVisible,
+      grantPhoneVisible,
+      posterTpls,
+      posters,
+      qrCode,
+      leftTime,
+    } = this.state
+
+    const { userInfo } = this.props
+    const posterData = {
+      title: posters[0] ? posters[0].posterTitle : '',
+      desc: posters[0] ? posters[0].posterDescription : '',
+      poster: posters[0] ? posters[0].posterImg : '',
+      name: userInfo.person.name || userInfo.person.nickname,
+      qrcode: qrCode,
+      avatarurl: getDownloadURL(userInfo.person.avatarurl, 'avatar') || '',
+    }
+
+    // 团长显示团长核销码, 参团的显示参团核销码
+    const verificationCode = isStarter ? recordDetail.verificationCode : (memberList.filter(x => x.personId === userInfo.person.personId)[0] || {}).verificationCode
+
+    const joinedNum = detail.groupBuyPeople - (recordDetail.recordId ? 1 : 0) - memberList.length
+
     return (
       <Block>
         {/* 生成海报 */}
-        {posterVisible && (<Poster data={posterData} toggle={this.togglePosterStatus}></Poster>)}
+        {posterVisible && (<Poster tpls={posterTpls} params={posterData} onCancel={this.togglePosterVisible} onFinish={this.togglePosterVisible}></Poster>)}
+        
+        {
+          grantPhoneVisible &&
+          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+        }
 
         {
           loaded && (
             <View>
               <Notice></Notice>
               <View className="detail-banner">
-                <Image mode="widthFix" src={detail.imgUrl} className="detail-banner__img"></Image>
-                <View className="rest-time">
-                  <Text className="row-label">活动剩余时间：</Text>
-                  <Text className="row-content">{dayjs(detail.enlistEnd).format('YYYY-MM-DD hh:mm:ss')}</Text>
-                </View>
+                <Image mode="widthFix" src={detail.mainImg} className="detail-banner__img"></Image>
+                {
+                  groupState === GroupInProcess && actState != ActFinished &&
+                  (
+                    <View className="rest-time">
+                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '活动已结束')} </Text>
+                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
+                    </View>
+                  )
+                }
               </View>
               <ScrollView
                 scrollY
                 className="detail-wrap">
                 <View className="detail">
-                  <View class="detail-title">{detail.title}</View>
+                  <View class="detail-title">{detail.activityName}</View>
+                  {
+                    groupState === GroupSuccess &&
+                    (
+                      <Block>
+                        <Image className="status__img" src={"TODO:"}></Image>
+                        <View className="hexiaoma">核销码: {verificationCode}</View>
+                      </Block>
+                    )
+                  }
+                  
+                  {
+                    groupState === GroupFailure &&
+                    (
+                      <View>
+                        <Image className="status__img" src={"TODO:"}></Image>
+                        <View className="fail-text">活动已超时,拼团失败!</View>
+                      </View>
+                    )
+                  }
+
                   <View className="detail-info">
-                    <View style="margin-right:30px">所需<Text style="color:#FF245A">300</Text>积分</View>
-                    <Image style="width:20px;height:20px;margin-right:2px" src={require('@assets/mine/regiment.png')} ></Image>
-                    <Text >5人团</Text>
+                    <View style="margin-right:30px">所需<Text style="color:#FF245A">{detail.integral}</Text>积分</View>
+                    <Image style="width:20px;height:20px;margin-right:2px" src={"TODO:"} ></Image>
+                    <Text >{detail.groupBuyPeople}人团</Text>
                   </View>
 
-                  <Image src={require('@assets/shop/banner1.jpg')} className="my__img"></Image>
+                  <Image src={"TODO:"} className="my__img"></Image>
 
                   <View className='tools-main'>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待拼团</Text>
-                    </View>
+                    {
+                      recordDetail.recordId &&
+                      (
+                        <View className='tools-item'>
+                          <Image src={recordDetail.avatarurl} className='tools-item-img'></Image>
+                          <Image src={"TODO: 团长标志"} className='tools-item-img'></Image>
+                          <Text className='tools-item-txt'>recordDetail.nickname</Text>
+                        </View>
+                      )
+                    }
+                    {
+                      memberList.map((it, inx) => {
+                        return (
+                          <View className='tools-item' key={`group-${inx}`}>
+                            <Image src={it.avatarurl} className='tools-item-img'></Image>
+                            <Text className='tools-item-txt'>{it.nickname}</Text>
+                          </View>
+                        )
+                      })
+                    }
+                    {
+                      times(joinedNum).map((_, inx) => {
+                        return (
+                          <View className='tools-item' key={`un-${inx}`}>
+                            <Image src={"TODO:"} className='tools-item-img'></Image>
+                            <Text className='tools-item-txt'>等待拼团</Text>
+                          </View>
+                        )
+                      })
+                    }
                   </View>
                 </View>
 
-                <View className="assistance-text">活动说明</View>
-                <Image src={require('@assets/shop/banner1.jpg')}style="width:100%"></Image>
-                <Button className={true ? "assistance-btn" : "nostart-btn"}>{true ? "邀请好友拼团" : "未开始"}</Button>
-              </ScrollView>
+                <View className="assistance-text"><Text style="color:#dcdcdc">————————</Text><Text className="acitivty-desc">活动说明</Text><Text style="color:#dcdcdc">————————</Text></View>
+                <Image src={detail.descImg} style="width:100%;margin-bottom:20px"></Image>
 
+                {
+                  actState === ActBeforeStart &&
+                  (<Button className="nostart-btn">未开始</Button>)
+                }
+                {
+                  isStarter && actState === ActInProcess && groupState === GroupInProcess &&
+                  (<Button className="assistance-btn" onClick={this.groupBuyInvite}>邀请好友拼团</Button>)
+                }
+                {
+                  !isStarter && actState === ActInProcess &&
+                  (
+                    <Block>
+                      {
+                        groupState === GroupInProcess &&
+                        (<Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button>)
+                      }
+                      <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                    </Block>
+                  )
+                }
+              </ScrollView>
 
-              <View className="chat-entrance" onClick={this.handleMoreClick}>
-                <Text className="iconfont icon-chat"></Text>
-              </View>
-              <BackHomeBtn></BackHomeBtn>
+              <action-sheet hidden={!actionSheetVisible} bindchange={this.toggleActionVisible}>
+                <action-sheet-item open-type="share">
+                  <Button open-type="share" className='share__friend' onClick={this.toggleActionVisible}>分享给好友</Button>
+                </action-sheet-item>
+                <action-sheet-item>
+                  <Button className='creat__img' onClick={this.shareMoments}>发送朋友圈</Button>
+                </action-sheet-item>
+                <action-sheet-cancel onClick={this.toggleActionVisible}>取消</action-sheet-cancel>
+              </action-sheet>
             </View>
           )
         }
       </Block>
     )
   }
-}
+}

src/pages/activity/detail/assistance.js

@@ -1,14 +1,14 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import Notice from '@components/Notice'
-import BackHomeBtn from '@components/BackHomeBtn'
+// import BackHomeBtn from '@components/BackHomeBtn'
 import AchievePhone from '@components/achievePhone'
 import Poster from '@components/Poster'
 import dayjs from 'dayjs'
 // import WxParse from '@components/wxParse/wxParse'
-import getUserPhone from '@utils/getUserPhone'
+// import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
-import { getDownloadURL } from '@utils/tools'
+import { getDownloadURL, times, formateLeftTime } from '@utils/tools'
 import {
   getHelpDetail,
   createHelpActivity,
@@ -20,12 +20,11 @@ import {
   updatePoint
 } from '@services/common'
 import { connect } from '@tarojs/redux'
+
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success2.png'
 const failImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/help%20failure.png'
 const waitImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/waiting%20for%20help.png'
 
-const times = n => n > 0 ? '*'.repeat(n - 1).split('*') : []
-
 // 活动状态
 const ActBeforeStart = 0;
 const ActInProcess = 1;
@@ -135,54 +134,37 @@ export default class Detail extends Component {
     })
   }
 
-  // 计时器更新剩余时间
-  updateLeftTime(startDate, endDate) {
+  compActState = (startDate, endDate) => {
     const st = dayjs(startDate).valueOf()
     const ed = dayjs(endDate).valueOf()
+    const nw = dayjs().valueOf()
+
+    if (st > nw) {
+      // 活动未开始
+      return [ActBeforeStart, st - nw]
+    } else if (ed > nw) {
+      // 活动进行中
+      return [ActInProcess, ed - nw]
+    } else {
+      // 活动已结束
+      return [ActFinished, 0]
+    }
+  }
 
+  // 计时器更新剩余时间
+  updateLeftTime(startDate, endDate) {
     this.setState({
       ltTicker: setInterval(() => {
-        const nw = dayjs().valueOf()
+        const [actState, leftTime] = this.compActState(startDate, endDate)
+        this.setState({actState, leftTime})
 
-        if (st > nw) {
-          // 活动未开始
-          this.setState({
-            leftTime: st - nw,
-            actState: ActBeforeStart,
-          })
-        } else if (ed > nw) {
-          // 活动未结束
-          this.setState({
-            leftTime: ed - nw,
-            actState: ActInProcess,
-          })
-        } else {
-          // 活动已结束
+        if (actState === ActFinished) {
           this.clearTicker()
-          this.setState({
-            leftTime: 0,
-            actState: ActFinished,
-          })
         }
       }, 1000)
     })
   }
 
-  // 格式化剩余时间
-  formateLeftTime = () => {
-    const nd = 1000 * 24 * 60 * 60;
-    const nh = 1000 * 60 * 60;
-    const nm = 1000 * 60;
-    const ns = 1000;
-
-    const day = Math.floor(this.state.leftTime / nd);
-    const hour = Math.floor(this.state.leftTime % nd / nh);
-    const min = Math.floor(this.state.leftTime % nd % nh / nm);
-    const sec = Math.floor(this.state.leftTime % nd % nh % nm / ns);
-
-    return `${day}天${hour}小时${min}分${sec}秒`
-  }
-
   // 请求详情
   loadDetail() {
     const { id, initiateId } = this.state
@@ -193,6 +175,11 @@ export default class Detail extends Component {
       this.clearTicker()
 
       const initiateDetail = res.helpInitiateRecord || {}
+      let [actState, leftTime] = this.compActState(res.helpActivity.startDate, res.helpActivity.endDate)
+
+      if (res.helpActivity.status != 1) {
+        actState = ActFinished
+      }
 
       Taro.hideLoading()
       this.setState({
@@ -206,9 +193,14 @@ export default class Detail extends Component {
         helpList: res.helpRecordList || [],
         loaded: true,
         isStarter: !initiateDetail.personId || userInfo.person.personId === initiateDetail.personId,
+        actState,
+        leftTime,
       })
 
-      this.updateLeftTime(res.helpActivity.startDate, res.helpActivity.endDate)
+      if (actState != ActFinished) {
+        this.updateLeftTime(res.helpActivity.startDate, res.helpActivity.endDate)
+      }
+
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
       // savePoint({
@@ -250,11 +242,7 @@ export default class Detail extends Component {
 
   onShareAppMessage = () => {
     const { shares } = this.state
-
-    if (!shares || !shares.length) {
-      Taro.hideShareMenu()
-      return {}
-    }
+    const currentPage = this.currentPageAndParams().join('?')
 
     savePoint({
       event: 'share',
@@ -262,8 +250,15 @@ export default class Detail extends Component {
       propertyName: '助力详情分享',
       data: '{}'
     })
+    
+    if (!shares || !shares.length) {
+      return {
+        title: this.state.detail.title,
+        path: currentPage,//分享地址
+        imageUrl: this.state.detail.img
+      }
+    }
 
-    const currentPage = this.currentPageAndParams().join('?')
     return {
       title: shares[0].shareContentTitle,
       path: currentPage,//分享地址
@@ -355,6 +350,7 @@ export default class Detail extends Component {
     // 必须授权头像
     if (this.toggleGrantAvatar()) {
       const initiateDetail = this.state.initiateDetail
+      debugger
       if (!initiateDetail.helpRecordInitiateId) {
         // 如果是未发起的助力, 先以当前人身份发起
         this.startMine().then(() => {
@@ -382,32 +378,6 @@ export default class Detail extends Component {
     })    
   }
 
-  // // 开始生成海报
-  // togglePosterStatus = (flag) => {
-  //   if (flag) {
-  //     this.getPosterData().then(posterData => {
-  //       this.setState({
-  //         posterVisible: !!flag,
-  //         posterData
-  //       })
-  //     })
-  //     // App.zhuge.track('生成助力详情海报')
-  //   } else {
-  //     this.setState({
-  //       posterVisible: !!flag
-  //     })
-  //   }
-
-  //   savePoint({
-  //     event: 'poster',
-  //     eventType: 'help',
-  //     propertyName: '生成助力详情海报',
-  //     data: '{}',
-  //   }).then(res => {
-  //     console.log('生成助力详情海报')
-  //   })
-  // }
-
   render() {
     const {
       initiateId,
@@ -424,6 +394,7 @@ export default class Detail extends Component {
       posterTpls,
       posters,
       qrCode,
+      leftTime,
     } = this.state
 
     const { userInfo } = this.props
@@ -458,7 +429,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 ? this.formateLeftTime() : ''}</Text>
+                      <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : ''}</Text>
                     </View>
                   )
                 }
@@ -553,8 +524,6 @@ export default class Detail extends Component {
                 </action-sheet-item>
                 <action-sheet-cancel onClick={this.toggleActionVisible}>取消</action-sheet-cancel>
               </action-sheet>
-
-              <BackHomeBtn></BackHomeBtn>
             </View>
           )
         }

src/services/activity.js

@@ -12,7 +12,10 @@ import {
   API_HELP_CREATE,
   API_HELP_FRIEND,
   API_HELP_LIST,
-  API_GROUP_LIST
+  API_GROUP_LIST,
+  API_GROUP_DETAIL,
+  API_GROUP_JOIN,
+  API_GROUP_CREATE,
 } from '@constants/api'
 
 /**
@@ -85,3 +88,7 @@ export const getActNewList = payload => fetch({ url: API_ACTNEW_LIST, payload })
 export const getHelpDetail = (id, initiateId) => fetch({ url: `${API_HELP_DETAIL}/${id}${ initiateId ? '?initiateId=' + initiateId : ''}`, method:'GET' })
 export const createHelpActivity = payload => fetch({ url: API_HELP_CREATE, method:'POST', payload })
 export const giveFriendHelp = payload => fetch({ url: API_HELP_FRIEND, method:'POST', payload })
+
+export const getGroupDetail = (id, recordId) => fetch({ url: `${API_GROUP_DETAIL}/${id}${ recordId ? '?recordId=' + recordId : ''}`, method:'GET' })
+export const createGroupActivity = payload => fetch({ url: API_GROUP_CREATE, method:'POST', payload })
+export const joinGroupBuy = payload => fetch({ url: API_GROUP_JOIN, method:'POST', payload })

src/utils/tools.js

@@ -1,5 +1,27 @@
 import Taro from '@tarojs/taro';
 
+export function times(n) {
+  return n > 0 ? '*'.repeat(n - 1).split('*') : []
+}
+
+/**
+ * 格式化剩余时间为 xx天xx小时xx分xx秒
+ * @param {int} leftTime 时间毫秒数
+ */
+export function formateLeftTime(leftTime) {
+  const nd = 1000 * 24 * 60 * 60;
+  const nh = 1000 * 60 * 60;
+  const nm = 1000 * 60;
+  const ns = 1000;
+
+  const day = Math.floor(leftTime / nd);
+  const hour = Math.floor(leftTime % nd / nh);
+  const min = Math.floor(leftTime % nd % nh / nm);
+  const sec = Math.floor(leftTime % nd % nh % nm / ns);
+
+  return `${day}天${hour}小时${min}分${sec}秒`
+}
+
 export function getDownloadURL(url, type) {
   switch (type) {
     case 'avatar':