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

src/components/Poster/util.js

@@ -0,0 +1,35 @@
+
+export function getCanvasConfig(config, params) {
+  if (!config || !params) {
+    throw new Error('转换海报配置出错: config 或 params 不能为空')
+  }
+
+  const { basic, items } = typeof config === 'string' ? JSON.parse(config) : config
+
+  const itemConf = items.reduce((conf, item) => {
+    const { type, remark, value, variable, ...others } = item
+    const settingOfType = conf[type] || []
+    
+    let mainVal = {}
+    switch (type) {
+      case 'text':
+        mainVal = { text: variable ? params[variable] : value }
+        break;
+      case 'image':
+        mainVal = { url: variable ? params[variable] : value }
+        break;
+      default:
+        break;
+    }
+
+    settingOfType.push({
+      ...mainVal,
+      ...others,
+    })
+  }, {})
+
+  return {
+    ...basic,
+    ...itemConf,
+  }
+}

src/constants/api.js

@@ -139,4 +139,8 @@ export const API_EDIT_AGENT = resolvePath('editPerson')
 export const API_ACTNEW_LIST = resolvePath('activity/list')
 
 // 助力
-export const API_HELP_DETAIL = resolvePath('helpActivity')
+export const API_HELP_DETAIL = resolvePath('helpActivity')
+export const API_HELP_CREATE = resolvePath('helpInitiateRecord')
+export const API_HELP_FRIEND = resolvePath('helpRecord')
+
+//

src/pages/activity/detail/assistance.js

@@ -9,12 +9,9 @@ import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import { getDownloadURL } from '@utils/tools'
 import {
-  // addActivityShareNum,
-  signupActivity,
-  favorActivity,
-  cancelFavorActivity,
-  queryActivityDetail,
   getHelpDetail,
+  createHelpActivity,
+  giveFriendHelp,
 } from '@services/activity'
 import {
   getMiniQrcode,
@@ -25,9 +22,15 @@ import { connect } from '@tarojs/redux'
 
 const times = n => n > 0 ? '*'.repeat(n-1).split('*') : []
 
-const BeforeStart = 0;
-const InProcess = 1;
-const Finished = 2;
+// 活动状态
+const ActBeforeStart = 0;
+const ActInProcess = 1;
+const ActFinished = 2;
+
+// 发起的助力状态
+const HelpInProcess = 1;
+const HelpSuccess = 0;
+const HelpFailure = 2;
 
 const defaultAvatar = require('@assets/agent/banner.png')
 
@@ -48,38 +51,44 @@ export default class Detail extends Component {
     posters: [],  // 海报设置
     leftTime: 0,  // 剩余时间
     ltTicker: undefined,  // 剩余时间计时器
-    actState: BeforeStart,  // 活动状态
-    isStarter: false, // 是否发起人
+    actState: ActBeforeStart,  // 活动本身状态
+    helpState: HelpInProcess, // 发起助力活动的状态
+    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
-      const initiateId = this.$router.params.initiateId || router.query.initiateId
-
-      this.setState({ id, initiateId }, () => {
-        this.loadDetail()
-      })
-
-      const { userInfo: { person: { phone, avatarurl } } } = this.props
-      if (!phone) {
-        // todo 授权电话
-      }
-
-      if (!avatarurl) {
-        // todo 授权头像
+      // 必须先授权电话
+      if (this.toggleGrantPhone()) {
+        this.initPageData()
       }
     })
   }
 
   componentWillUnmount() {
-    const { recordId } = this.state
-    recordId && updatePoint(recordId)
+    // const { recordId } = this.state
+    // recordId && updatePoint(recordId)
 
     this.clearTicker()
   }
 
+  initPageData() {
+    if (!this.state.detail.helpActivityId) {
+      const router = Taro.getStorageSync('router')
+      const id = this.$router.params.id || router.query.id
+      const initiateId = this.$router.params.initiateId || router.query.initiateId
+  
+      this.setState({ id, initiateId }, () => {
+        this.loadDetail()
+      })
+    }
+  }
+
   clearTicker() {
     if (this.state.ltTicker) {
       clearInterval(this.state.ltTicker)
@@ -87,6 +96,40 @@ export default class Detail extends Component {
     }
   }
 
+  // 调起授权电话
+  toggleGrantPhone() {
+    const { userInfo: { person: { phone } } } = this.props
+    if (!phone) {
+      this.setState({ grantPhoneVisible: true })
+      return false
+    }
+
+    return true
+  }
+
+  // 调起授权头像
+  toggleGrantAvatar() {
+    const { userInfo: { person: { avatarurl } } } = this.props
+    if (!avatarurl) {
+      this.setState({ grantAvatarVisible: true })
+      return false
+    }
+
+    return true
+  }
+
+  toggleActionVisible() {
+    this.setState({
+      actionSheetVisible: !this.state.actionSheetVisible
+    })
+  }
+
+  togglePosterVisible() {
+    this.setState({
+      posterVisible: !this.state.posterVisible
+    })
+  }
+
   updateLeftTime(startDate, endDate) {
     const st = dayjs(startDate).valueOf()
     const ed = dayjs(endDate).valueOf()
@@ -99,20 +142,20 @@ export default class Detail extends Component {
           // 活动未开始
           this.setState({
             leftTime: st - nw,
-            actState: BeforeStart,
+            actState: ActBeforeStart,
           })
         } else if (ed > nw) {
           // 活动未结束
           this.setState({
             leftTime: ed - nw,
-            actState: InProcess,
+            actState: ActInProcess,
           })
         } else {
           // 活动已结束
           this.clearTicker()
           this.setState({
             leftTime: 0,
-            actState: Finished,
+            actState: ActFinished,
           })
         }
       }, 1000)
@@ -135,99 +178,166 @@ export default class Detail extends Component {
 
   loadDetail() {
     const { id } = this.state
+    const { userInfo } = this.props
+
     Taro.showLoading()
     getHelpDetail(id).then(res => {
       this.clearTicker()
 
-      Taro.hideLoading()
-      const { isSaved, isSign } = res
-
-      // 活动状态分两种
-      // 一种是活动本身是否在进行中
-      // 一种是, 某个人发起的助力，是否在进行中
-      // 发起的助力活动状态, 1 代表进行中, 0 代表成功, 2 代表失败
+      const initiateDetail = res.helpInitiateRecord || {}
 
+      Taro.hideLoading()
       this.setState({
         detail: res.helpActivity,
-        initiateDetail: res.helpInitiateRecord || {},
+        initiateDetail,
+        helpState: initiateDetail.status === undefined ? HelpInProcess : initiateDetail.status,
         shares: res.shareContentList || [],
         posters: res.postList || [],
         helpList: res.helpRecordList || [],
         loaded: true,
-      }, () => {
-        // const { detail } = this.state
-        // if (detail.posters[0].posterImg) {
-        //   this.setState({
-        //     posterShow: true
-        //   })
-        // }
-        this.updateLeftTime(res.helpActivity.startDate, res.helpActivity.endDate)
+        isStarter: !initiateDetail.person_id || userInfo.person.personId === initiateDetail.personId,
       })
+      
+      this.updateLeftTime(res.helpActivity.startDate, res.helpActivity.endDate)
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
-      savePoint({
-        event: 'detail',
-        eventType: 'help',
-        propertyName: '助力详情',
-        buildingId: res.buildingId,
-        targetId: res.helpActivityId,
-        data: '{}'
-      }).then(res1 => {
-        this.setState({
-          recordId: res1.recordId
-        })
-      })
+      // savePoint({
+      //   event: 'detail',
+      //   eventType: 'help',
+      //   propertyName: '助力详情',
+      //   buildingId: res.buildingId,
+      //   targetId: res.helpActivityId,
+      //   data: '{}'
+      // }).then(res1 => {
+      //   this.setState({
+      //     recordId: res1.recordId
+      //   })
+      // })
     })
   }
 
-  onShareAppMessage = () => {
-    const { detail } = this.state
+  currentPageAndParams() {
+    const { detail, initiateDetail } = this.state
     const { userInfo: { person: { personId } } } = this.props
 
-    // addActivityShareNum(detail.helpActivityId)
+    let queryParams = [
+      `id=${detail.helpActivityId}`,
+      `from=help_share`,
+      `recommender=${personId}`
+    ]
+    if (initiateDetail.helpRecordInitiateId) {
+      queryParams.push(`initiateId=${helpRecordInitiateId}`)
+    }
+
+    return [
+      'pages/activity/detail/assistance',
+      queryParams.join('&'),
+    ]
+  }
+
+  onShareAppMessage = () => {
+    const { shares } = this.state
+
+    if (!shares || !shares.length) {
+      Taro.hideShareMenu()
+      return {}
+    }
 
     savePoint({
       event: 'share',
       eventType: 'help',
       propertyName: '助力详情分享',
       data: '{}'
-    }).then(res => {
-
     })
+
+    const currentPage = this.currentPageAndParams().join('?')
     return {
-      title: shareContents[0].shareContentTitle,
-      path: `pages/activity/detail/assistance?id=${detail.helpActivityId}&from=help_share&recommender=${personId}`,//分享地址
-      // imageUrl: shareContents[0].shareContentImg
+      title: shares[0].shareContentTitle,
+      path: currentPage,//分享地址
+      imageUrl: shares[0].shareContentImg
     }
   }
 
+  // 助力好友
   handleHelp() {
-    if (this.state.loaded) return
+    if (this.state.submitting) return
 
     Taro.showLoading()
-    this.setState({ loaded: true }, () => {
-      Taro.hideLoading()
-      this.setState({ loaded: false })
-
-      // 助力好友
-      // todo
+    this.setState({ submitting: true }, () => {
+      const {detail, initiateDetail} = this.state
+      const person = this.props.userInfo.person
+
+      giveFriendHelp({
+        buildingId: detail.buildingId,
+        helpActivityId: detail.helpActivityId,
+        personId: person.personId,
+        name: person.name || person.nickname,
+        phone: person.tel || person.phone,
+        avatarurl: person.avatarurl,
+        helpRecordInitiateId: initiateDetail.helpRecordInitiateId,
+      }).then(() => {
+        Taro.hideLoading()
+        this.setState({ submitting: false })
+      }).catch(err => {
+        console.log('err:', err)
+        Taro.hideLoading()
+        this.setState({ submitting: false })
+        Taro.showToast({
+          title: '助力失败',
+          icon: 'none'
+        })
+      })
     })
   }
 
-  handleFavor() {
+  // 发起我的助力
+  startMine() {
+    // 必须授权头像
+    if (this.toggleGrantAvatar()) {
+      const detail = this.state.detail
+      const person = this.props.userInfo.person
+
+      return new Promise((resolve, reject) => {
+        createHelpActivity({
+          buildingId: detail.buildingId,
+          helpActivityId: detail.helpActivityId,
+          personId: person.personId,
+          name: person.name || person.nickname,
+          phone: person.tel || person.phone,
+          avatarurl: person.avatarurl,
+        }).then(res => {
+          this.setState({ initiateDetail: res }, resolve)
+        }).catch(err => {
+          console.log('err:', err)
+          Taro.showToast({
+            title: '发起助力失败',
+            icon: 'none'
+          })
+          reject()
+        })
+      })
+    }
+
+    return Promise.reject()
   }
 
-  handleGetPhone(e) {
-    getUserPhone(e, (phoneNumber) => {
-      if (phoneNumber) {
-        this.handleSignup()
-      } else {
-        Taro.showToast({
-          title: '报名失败',
-          icon: 'none'
+  // 请求好友助力
+  askForHelp() {
+    // 必须授权头像
+    if (this.toggleGrantAvatar()) {
+      const initiateDetail = this.state.initiateDetail
+      if (!initiateDetail.helpRecordInitiateId) {
+        // 如果是未发起的助力, 先以当前人身份发起
+        this.startMine().then(() => {
+          this.toggleActionVisible()
         })
+      } else {
+        this.toggleActionVisible()
       }
-    })
+    }
+  }
+
+  handleFavor() {
   }
 
   getPosterData = () => {
@@ -239,13 +349,11 @@ export default class Detail extends Component {
       }
 
       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',
-      }
-      debugger
+      const { avatarurl, nickname } = person
+      const { detail: { posters, createDate } } = this.state
+      const [page, scene] = this.currentPageAndParams()
+      const payload = { page, scene }
+
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
       getMiniQrcode(payload).then(qrcode => {
         let data = {
@@ -286,66 +394,6 @@ export default class Detail extends Component {
     })
   }
 
-  handleMoreClick() {
-    // App.zhuge.track('查看置业顾问列表')
-    console.log()
-    Taro.navigateTo({
-      url: `/pages/card/list/index?buildingId=${this.$router.params.buildingId}`
-    })
-  }
-
-  onChange = e => {
-    this.setState({
-      selectorChecked: this.state.selector[e.detail.value]
-    })
-  }
-
-  onInputText = e => {
-    this.setState({
-      inputName: e.detail.value
-    })
-  }
-
-  comfire = e => {
-    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
-    }
-
-    const payload = {
-      buildingId,
-      dynamicId,
-      name: inputName,
-      phone: phone ? phone : tel,
-      attendNum: selectorChecked
-    }
-
-    signupActivity(payload).then(res => {
-      Taro.showToast({
-        title: '报名成功'
-      })
-      this.setState({
-        isSign: true,
-        canChoose: 'none'
-      })
-    })
-
-    savePoint({
-      event: 'enlist',
-      eventType: 'help',
-      propertyName: '助力详情报名',
-      data: '{}'
-    }).then(res => {
-      console.log('助力详情报名 ')
-    })
-  }
-
   hideModal() {
     this.setState({
       canChoose: 'none'
@@ -353,11 +401,22 @@ export default class Detail extends Component {
   }
 
   render() {
-    const { detail, loaded, actState, posterVisible, posterData, isStarter, helpList } = this.state
-    const { userInfo: { person: { phone, avatarurl } } } = this.props
-
-    const avatar = this.state.initiateId ? this.state.initiateDetail.avatarurl : avatarurl
-    const initiateInProcess = initiateDetail.status === 1;
+    const {
+      detail,
+      loaded,
+      actState,
+      posterVisible,
+      posterData,
+      isStarter,
+      helpList,
+      helpState,
+      actionSheetVisible,
+      grantAvatarVisible,
+      grantPhoneVisible,
+    } = this.state
+
+    const { userInfo } = this.props
+    const avatar = this.state.initiateId ? this.state.initiateDetail.avatarurl : userInfo.person.avatarurl
 
     return (
       <Block>
@@ -370,16 +429,33 @@ export default class Detail extends Component {
               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.img} className="detail-banner__img"></Image>
-                <View className="rest-time">
-                  <Text className="row-label">{actState === BeforeStart ? '距活动开始:' : (actState === InProcess ? '活动剩余时间:' : '活动已结束')} </Text>
-                  <Text className="row-content">{actState != Finished ? this.formateLeftTime() : ''}</Text>
-                </View>
+                {
+                  helpState === HelpInProcess && actState != ActFinished &&
+                  (
+                    <View className="rest-time">
+                      <Text className="row-label">{actState === ActBeforeStart ? '距活动开始:' : (actState === ActInProcess ? '活动剩余时间:' : '活动已结束')} </Text>
+                      <Text className="row-content">{actState != ActFinished ? this.formateLeftTime() : ''}</Text>
+                    </View>
+                  )
+                }
               </View>
               <ScrollView
                 scrollY
                 className="detail-wrap">
                 <View className="detail">
                   <View class="detail-title">{detail.title}</View>
+                  {
+                    helpState === HelpSuccess &&
+                    (
+                      <Text>TODO: 助力成功</Text>
+                    )
+                  }
+                  {
+                    helpState === HelpFailure &&
+                    (
+                      <Text>TODO: 助力失败</Text>
+                    )
+                  }
                   <Image src={avatar} className="my__img"></Image>
                   <View className="assistance-text">邀请{detail.personNum}位好友即可赢取大奖</View>
                   <View className="assistance-text">{`${detail.enlistNum || 0}/${detail.personNum}`}</View>
@@ -408,29 +484,51 @@ export default class Detail extends Component {
                 </View>
                 <View>
                   {
-                    actState === BeforeStart &&
+                    actState === ActBeforeStart &&
                     (<Button className="nostart-btn">未开始</Button>)
                   }
                   {
-                    actState === InProcess && !isStarter &&
+                    isStarter && actState === ActInProcess && helpState === HelpInProcess &&
+                    (<Button className="assistance-btn" onClick={this.askForHelp}>邀请好友助力</Button>)
+                  }
+                  {
+                    !isStarter && actState === ActInProcess &&
                     (
                       <Block>
-                        ()
-                        <Button className="assistance-btn" onClick={this.handleHelp}>立即助力好友</Button>
-                        <Button className="assistance-btn">发起我的助力</Button>
+                        {
+                          helpState === HelpInProcess &&
+                          (<Button className="assistance-btn" onClick={this.handleHelp}>立即助力好友</Button>)
+                        }
+                        <Button className="assistance-btn" onClick={this.startMine}>发起我的助力</Button>
                       </Block>
                     )
                   }
-                  <Button disabled={actState != InProcess} className={true ? "assistance-btn" : "nostart-btn"}>{actState === BeforeStart ? '未开始:' : (actState === InProcess ? '邀请好友助力:' : '活动已结束')}</Button>
                 </View>
                 <View className="assistance-text">活动说明</View>
                 <Image src={detail.activityInstructions}style="width:100%"></Image>
               </ScrollView>
+
+              {
+                grantPhoneVisible &&
+                <View onSuccess={this.initPageData}>TODO: 授权电话</View>
+              }
+
+              {
+                grantAvatarVisible &&
+                <View onSuccess={() => {}}>TODO: 授权头像</View>
+              }
+
+              <action-sheet hidden={!actionSheetVisible} bindchange={this.toggleActionVisible}>
+                <action-sheet-item open-type="share">
+                  <Button open-type="share" className='share__friend'>分享给好友</Button>
+                </action-sheet-item>
+                <action-sheet-item>
+                  <Button className='creat__img' onClick={this.togglePosterVisible}>发送朋友圈</Button>
+                </action-sheet-item>
+                <action-sheet-cancel>取消</action-sheet-cancel>
+              </action-sheet>
             
-              <View className="chat-entrance" onClick={this.handleMoreClick}>
-                <Text className="iconfont icon-chat"></Text>
-              </View>
-              <BackHomeBtn></BackHomeBtn>
+              <BackHomeBtn></BackHomeBtn>              
             </View>
           )
         }

src/pages/activity/detail/index.scss

@@ -11,6 +11,10 @@
   align-items: center;
 }
 
+.share__friend,
+.creat__img {
+  background: none;
+}
 
 .detail-banner {
   position: relative;

src/pages/shop/index.js

@@ -221,7 +221,7 @@ export default class Shop extends Component {
           }}>
           <View className="user_box">
             <View className="user_con">
-            <Image className="bg" src={require('@assets/shop/background.png')} ></Image>
+            <Image className="bg" src={require('@assets/shop/background.jpg')} ></Image>
               <Image className="user__left__headimg" src={person.avatarurl} />
               <View className='user__left__name'>{person.nickname}</View>
               <View className="qiandao__btn" onClick={this.doSign}>签到</View>

src/services/activity.js

@@ -9,6 +9,8 @@ import {
   API_ACTIVITY_SHARE,
   API_ACTNEW_LIST,
   API_HELP_DETAIL,
+  API_HELP_CREATE,
+  API_HELP_FRIEND,
 } from '@constants/api'
 
 /**
@@ -69,3 +71,5 @@ export const cancelFavorActivity = id => fetch({ url: `${API_ACTIVITY_FAVOR}/${i
 export const getActNewList = payload => fetch({ url: API_ACTNEW_LIST, payload })
 
 export const getHelpDetail = id => fetch({ url: `${API_HELP_DETAIL}/${id}`, 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 })