feats

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.172:8080"',
-    WSS_HOST: '"wss://192.168.0.172:8080"',
+    HOST: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/components/Visible.js

@@ -0,0 +1,19 @@
+import { connect } from '@tarojs/redux'
+import { Block } from '@tarojs/components'
+
+function checkDefault(props) {
+  return true
+}
+
+function Visible(props) {
+  const checkFn = props.check || checkDefault
+  const canShow = checkFn(props)
+
+  if (canShow) {
+    return <Block>{props.children}</Block>
+  }
+
+  return null
+}
+
+export default connect(s => s.user)(Visible)

src/components/authorize/index.scss

@@ -1,3 +1,5 @@
+@import "@styles/theme.scss";
+
 .auth-page{
   position: relative;
   width: 100%;
@@ -24,13 +26,13 @@
     width: 80%;
     left: 10%;
     height:90px;
-    background: #FF4740;
     border-radius: 10px;
     top:40%;
-    color: #fff;
     font-size:32px;
     font-weight: 500;
     line-height: 90px;
+    color: white;
+    background-color: $primary-color;
   }
   .adver-btn{
     position: absolute;

src/constants/api.js

@@ -92,7 +92,6 @@ export const API_BURIED_POINT = resolvePath('taPersonVisitRecord')
 // activity
 export const API_ACTIVITY_LIST = resolvePath('buildingDynamiceList')
 
-
 // save activity
 export const API_ACTIVITY_SAVE = resolvePath('save/buildingDynamiceList')
 
@@ -135,3 +134,9 @@ export const API_AGENT_CHANNEL = resolvePath('customer/recommend/becomeChannel')
 export const API_AGENT_CURRENT = resolvePath('user/current')
 
 export const API_EDIT_AGENT = resolvePath('editPerson')
+
+// 活动列表-新
+export const API_ACTNEW_LIST = resolvePath('activity/list')
+
+// 助力
+export const API_HELP_DETAIL = resolvePath('helpActivity')

src/pages/activity/detail/assemble.js

@@ -7,6 +7,7 @@ import dayjs from 'dayjs'
 import WxParse from '@components/wxParse/wxParse'
 import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
+import { getDownloadURL } from '@utils/tools'
 import {
   addActivityShareNum,
   signupActivity,
@@ -190,7 +191,7 @@ export default class Detail extends Component {
         "page": 'pages/activity/detail/index',
       }
       debugger
-      const _avatarurl = avatarurl.replace('https://wx.qlogo.cn/', 'https://d.pawoma.cn/qlogo/');
+      const _avatarurl = getDownloadURL(avatarurl, 'avatar');
       getMiniQrcode(payload).then(qrcode => {
         let data = {
           qrcode,//小程序二维码

src/pages/activity/detail/assistance.js

@@ -4,15 +4,17 @@ import Notice from '@components/Notice'
 import BackHomeBtn from '@components/BackHomeBtn'
 import Poster from './poster'
 import dayjs from 'dayjs'
-import WxParse from '@components/wxParse/wxParse'
+// import WxParse from '@components/wxParse/wxParse'
 import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
+import { getDownloadURL } from '@utils/tools'
 import {
-  addActivityShareNum,
+  // addActivityShareNum,
   signupActivity,
   favorActivity,
   cancelFavorActivity,
-  queryActivityDetail
+  queryActivityDetail,
+  getHelpDetail,
 } from '@services/activity'
 import {
   getMiniQrcode,
@@ -21,6 +23,14 @@ import {
 } from '@services/common'
 import { connect } from '@tarojs/redux'
 
+const times = n => n > 0 ? '*'.repeat(n-1).split('*') : []
+
+const BeforeStart = 0;
+const InProcess = 1;
+const Finished = 2;
+
+const defaultAvatar = require('@assets/agent/banner.png')
+
 @connect(state => state.user)
 export default class Detail extends Component {
   config = {
@@ -28,138 +38,183 @@ export default class Detail extends Component {
   }
 
   state = {
-    id: null,
+    id: null, // 活动ID
+    initiateId: undefined,  // 发起活动
     loaded: false,
-    detail: {},
-    recordId: null,
-    isSaved: false,
-    isSign: false,
-    posterShow: false,
-    posterData: {},
-    posterVisible: false,
-    selector: ['1', '2', '3'],
-    selectorChecked: '1',
-    canChoose: 'none',
-    inputName: ''
+    detail: {}, // 活动详情
+    initiateDetail: {}, // 发起详情
+    helpList: [], // 助力人员列表
+    shares: [], // 分享设置
+    posters: [],  // 海报设置
+    leftTime: 0,  // 剩余时间
+    ltTicker: undefined,  // 剩余时间计时器
+    actState: BeforeStart,  // 活动状态
+    isStarter: false, // 是否发起人
   }
 
   componentWillMount() {
     ready.queue(() => {
       const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id || '2fe920719b8b0db50011441462e647ad'
-      this.setState({ id }, () => {
+      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 授权头像
+      }
     })
   }
+
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
+
+    this.clearTicker()
+  }
+
+  clearTicker() {
+    if (this.state.ltTicker) {
+      clearInterval(this.state.ltTicker)
+      this.setState({ ltTicker: undefined })
+    }
+  }
+
+  updateLeftTime(startDate, endDate) {
+    const st = dayjs(startDate).valueOf()
+    const ed = dayjs(endDate).valueOf()
+
+    this.setState({
+      ltTicker: setInterval(() => {
+        const nw = dayjs().valueOf()
+
+        if (st > nw) {
+          // 活动未开始
+          this.setState({
+            leftTime: st - nw,
+            actState: BeforeStart,
+          })
+        } else if (ed > nw) {
+          // 活动未结束
+          this.setState({
+            leftTime: ed - nw,
+            actState: InProcess,
+          })
+        } else {
+          // 活动已结束
+          this.clearTicker()
+          this.setState({
+            leftTime: 0,
+            actState: Finished,
+          })
+        }
+      }, 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 } = this.state
     Taro.showLoading()
-    queryActivityDetail(id).then(res => {
+    getHelpDetail(id).then(res => {
+      this.clearTicker()
+
       Taro.hideLoading()
       const { isSaved, isSign } = res
+
+      // 活动状态分两种
+      // 一种是活动本身是否在进行中
+      // 一种是, 某个人发起的助力，是否在进行中
+      // 发起的助力活动状态, 1 代表进行中, 0 代表成功, 2 代表失败
+
       this.setState({
-        detail: res,
-        isSaved,
-        isSign,
-        loaded: true
+        detail: res.helpActivity,
+        initiateDetail: res.helpInitiateRecord || {},
+        shares: res.shareContentList || [],
+        posters: res.postList || [],
+        helpList: res.helpRecordList || [],
+        loaded: true,
       }, () => {
-        const { detail } = this.state
-        if (detail.posters[0].posterImg) {
-          this.setState({
-            posterShow: true
-          })
-        }
+        // const { detail } = this.state
+        // if (detail.posters[0].posterImg) {
+        //   this.setState({
+        //     posterShow: true
+        //   })
+        // }
+        this.updateLeftTime(res.helpActivity.startDate, res.helpActivity.endDate)
       })
-      WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
+      // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
       savePoint({
         event: 'detail',
-        eventType: 'activity',
-        propertyName: '活动详情',
+        eventType: 'help',
+        propertyName: '助力详情',
         buildingId: res.buildingId,
-        targetId: res.dynamicId,
+        targetId: res.helpActivityId,
         data: '{}'
       }).then(res1 => {
         this.setState({
           recordId: res1.recordId
         })
-        console.log('活动详情')
       })
     })
   }
+
   onShareAppMessage = () => {
-    const { detail: { shareContents, title, dynamicId, url } } = this.state
+    const { detail } = this.state
     const { userInfo: { person: { personId } } } = this.props
 
-    addActivityShareNum(dynamicId)
+    // addActivityShareNum(detail.helpActivityId)
 
     savePoint({
       event: 'share',
-      eventType: 'activity',
-      propertyName: '活动详情分享',
+      eventType: 'help',
+      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
+      path: `pages/activity/detail/assistance?id=${detail.helpActivityId}&from=help_share&recommender=${personId}`,//分享地址
+      // imageUrl: shareContents[0].shareContentImg
     }
   }
 
-  handleSignup() {
-    const { detail: { buildingId, dynamicId }, isSign } = this.state
-    const { userInfo: { person: { phone, name, nickname } } } = this.props
+  handleHelp() {
+    if (this.state.loaded) return
 
-    if (isSign) {
-      Taro.showToast({
-        icon: 'none',
-        title: '你已报名成功'
-      })
-      return
-    }
+    Taro.showLoading()
+    this.setState({ loaded: true }, () => {
+      Taro.hideLoading()
+      this.setState({ loaded: false })
 
-    this.setState({
-      canChoose: 'block'
+      // 助力好友
+      // todo
     })
   }
 
   handleFavor() {
-    const { detail: { dynamicId }, isSaved } = this.state
-    if (isSaved) {
-      cancelFavorActivity(dynamicId).then(res => {
-        Taro.showToast({
-          title: '已取消收藏'
-        })
-        this.setState({
-          isSaved: false
-        })
-      })
-    } else {
-      favorActivity(dynamicId).then(res => {
-        Taro.showToast({
-          title: '收藏成功'
-        })
-        this.setState({
-          isSaved: true
-        })
-      })
-    }
-    savePoint({
-      event: 'save',
-      eventType: 'activity',
-      propertyName: '活动详情收藏',
-      data: '{}'
-    }).then(res => {
-      console.log('活动详情收藏')
-    })
   }
 
   handleGetPhone(e) {
@@ -174,6 +229,7 @@ export default class Detail extends Component {
       }
     })
   }
+
   getPosterData = () => {
     return new Promise(resolve => {
       const { posterData } = this.state
@@ -190,7 +246,7 @@ export default class Detail extends Component {
         "page": 'pages/activity/detail/index',
       }
       debugger
-      const _avatarurl = avatarurl.replace('https://wx.qlogo.cn/', 'https://d.pawoma.cn/qlogo/');
+      const _avatarurl = getDownloadURL(avatarurl, 'avatar');
       getMiniQrcode(payload).then(qrcode => {
         let data = {
           qrcode,//小程序二维码
@@ -204,6 +260,7 @@ export default class Detail extends Component {
       })
     })
   }
+
   // 开始生成海报
   togglePosterStatus = (flag) => {
     if (flag) {
@@ -213,7 +270,7 @@ export default class Detail extends Component {
           posterData
         })
       })
-      // App.zhuge.track('生成活动详情海报')
+      // App.zhuge.track('生成助力详情海报')
     } else {
       this.setState({
         posterVisible: !!flag
@@ -221,11 +278,11 @@ export default class Detail extends Component {
     }
     savePoint({
       event: 'poster',
-      eventType: 'activity',
-      propertyName: '生成活动详情海报',
+      eventType: 'help',
+      propertyName: '生成助力详情海报',
       data: '{}'
     }).then(res => {
-      console.log('生成活动详情海报')
+      console.log('生成助力详情海报')
     })
   }
 
@@ -250,7 +307,6 @@ export default class Detail extends Component {
   }
 
   comfire = e => {
-
     const { detail: { buildingId, dynamicId }, isSign, selectorChecked, inputName } = this.state
     const { userInfo: { person: { phone, name, nickname, tel } } } = this.props
 
@@ -282,11 +338,11 @@ export default class Detail extends Component {
 
     savePoint({
       event: 'enlist',
-      eventType: 'activity',
-      propertyName: '活动详情报名',
+      eventType: 'help',
+      propertyName: '助力详情报名',
       data: '{}'
     }).then(res => {
-      console.log('活动详情报名 ')
+      console.log('助力详情报名 ')
     })
   }
 
@@ -297,8 +353,12 @@ export default class Detail extends Component {
   }
 
   render() {
-    const { detail, loaded, isSaved, isSign, posterVisible, posterData, posterShow } = this.state
-    const { userInfo: { person: { phone } } } = this.props
+    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;
+
     return (
       <Block>
         {/* 生成海报 */}
@@ -309,10 +369,10 @@ export default class Detail extends Component {
             <View>
               <Notice></Notice>
               <View className="detail-banner">
-                <Image mode="widthFix" src={detail.imgUrl} className="detail-banner__img"></Image>
+                <Image mode="widthFix" src={detail.img} 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>
+                  <Text className="row-label">{actState === BeforeStart ? '距活动开始:' : (actState === InProcess ? '活动剩余时间:' : '活动已结束')} </Text>
+                  <Text className="row-content">{actState != Finished ? this.formateLeftTime() : ''}</Text>
                 </View>
               </View>
               <ScrollView
@@ -320,116 +380,61 @@ export default class Detail extends Component {
                 className="detail-wrap">
                 <View className="detail">
                   <View class="detail-title">{detail.title}</View>
-                  <Image src={require('@assets/agent/banner.png')} className="my__img"></Image>
-                  <View className="assistance-text">邀请N位好友即可赢取大奖</View>
-                  <View className="assistance-text">0/N</View>
+                  <Image src={avatar} className="my__img"></Image>
+                  <View className="assistance-text">邀请{detail.personNum}位好友即可赢取大奖</View>
+                  <View className="assistance-text">{`${detail.enlistNum || 0}/${detail.personNum}`}</View>
                   <View className='tools-main'>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
-                    <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>等待助力</Text>
-                    </View>
+                    {
+                      times(helpList.length).map((it, inx) => {
+                        return (
+                          <View className='tools-item' key={`help-${inx}`}>
+                            <Image src={it.avatarurl} className='tools-item-img'></Image>
+                            <Text className='tools-item-txt'>{it.name}</Text>
+                          </View>
+                        )
+                      })
+                    }
+                    {
+                      times(detail.personNum - helpList.length).map((_, inx) => {
+                        return (
+                          <View className='tools-item' key={`un-${inx}`}>
+                            <Image src={defaultAvatar} className='tools-item-img'></Image>
+                            <Text className='tools-item-txt'>等待助力</Text>
+                          </View>
+                        )
+                      })
+                    }
                   </View>
                 </View>
-                <Button className={true ? "assistance-btn" : "nostart-btn"}>{true ? "邀请好友助力" : "未开始"}</Button>
+                <View>
+                  {
+                    actState === BeforeStart &&
+                    (<Button className="nostart-btn">未开始</Button>)
+                  }
+                  {
+                    actState === InProcess && !isStarter &&
+                    (
+                      <Block>
+                        ()
+                        <Button className="assistance-btn" onClick={this.handleHelp}>立即助力好友</Button>
+                        <Button className="assistance-btn">发起我的助力</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={require('@assets/agent/banner.png')}style="width:100%"></Image>
+                <Image src={detail.activityInstructions}style="width:100%"></Image>
               </ScrollView>
-
             
               <View className="chat-entrance" onClick={this.handleMoreClick}>
                 <Text className="iconfont icon-chat"></Text>
               </View>
               <BackHomeBtn></BackHomeBtn>
-
-              {/* <View className="bot-nav flex">
-                {
-                  posterShow && (
-                    <Button className='btn poster-btn' onClick={() => { this.togglePosterStatus(true) }}>
-                      <Image mode="widthFix" src={require('@assets/tupian_3@3x.png')} className="btn-icon"></Image>
-                      <Text className="txt">海报</Text>
-                    </Button>
-                  )
-                }
-                <Button className="btn share-btn" open-type="share">
-                  <Image mode="widthFix" src={require('@assets/fasong@3x.png')} className="btn-icon"></Image>
-                  <Text className="txt">分享</Text>
-                </Button>
-
-                <Button className="btn" onClick={this.handleFavor}>
-                  <Text className={`iconfont ${isSaved ? 'icon-shoucang selected' : 'icon-shoucang1'}`}></Text>
-                  <Text className="txt">收藏</Text>
-                </Button>
-                {
-                  detail.enlisted >= detail.enlistNum ? (<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>
-                    ))
-                }
-                {/* {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>
-                  )} 
-              </View> */}
-
-              {/* <View className='page-body' style={{ display: this.state.canChoose }}>
-                <View className="mask" onClick={this.hideModal}></View>
-                <View className='page-section'>
-                  <Text className="page-section__title">报名信息</Text>
-                  <View className='page-content'>
-                    <Input className='inputName' onInput={this.onInputText.bind(this)} type='text' placeholder='请输入姓名' />
-                    <Picker mode='selector' range={this.state.selector} onChange={this.onChange}>
-                      <View className='picker'>
-                        <Text>参加人数</Text>
-                        <Text className='content'>{this.state.selectorChecked}</Text>
-                        <Text>人</Text>
-                      </View>
-                    </Picker>
-                    <View onClick={this.comfire} className='comfire'>确认</View>
-                  </View>
-                </View>
-              </View> */}
             </View>
           )
         }
       </Block>
     )
   }
-}
+}

src/pages/activity/detail/index.js

@@ -7,6 +7,7 @@ import dayjs from 'dayjs'
 import WxParse from '@components/wxParse/wxParse'
 import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
+import { getDownloadURL } from '@utils/tools'
 import {
   addActivityShareNum,
   signupActivity,
@@ -190,7 +191,7 @@ export default class Detail extends Component {
         "page": 'pages/activity/detail/index',
       }
       debugger
-      const _avatarurl = avatarurl.replace('https://wx.qlogo.cn/', 'https://d.pawoma.cn/qlogo/');
+      const _avatarurl = getDownloadURL(avatarurl, 'avatar');
       getMiniQrcode(payload).then(qrcode => {
         let data = {
           qrcode,//小程序二维码

src/pages/activity/index.js

@@ -1,7 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import ListView from '@components/ListView'
 import './index.scss'
-import { queryActivityList } from '@services/activity'
+import { queryActivityList, getActNewList } from '@services/activity'
 import ActivityItem from './item'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
@@ -44,7 +44,6 @@ export default class Index extends Component {
   loadList(pageNumber) {
     const { curCity: { id: cityId } } = this.props
     const payload = { pageSize: 10, pageNumber }
-    console.log(payload)
     
     const { params: { buildingId, from } } = this.$router
     if (cityId) {
@@ -58,26 +57,28 @@ export default class Index extends Component {
     if (buildingId) {
       payload.buildingId = buildingId
     }
-    return queryActivityList(payload)
+    // return queryActivityList(payload)
+    return getActNewList(payload)
   }
 
   handleItemClick(item) {
-    console.log(item,"data")
-    if(item.title==111){
-      Taro.navigateTo({
-        url: '/pages/activity/detail/assistance?id=' + item.dynamicId
-      })
-    }else if(item.title=='通融通融'){
-      Taro.navigateTo({
-        url: '/pages/activity/detail/assemble?id=' + item.dynamicId
-      })
-    }
-    else{
-      Taro.navigateTo({
-        url: '/pages/activity/detail/index?id=' + item.dynamicId
-      })
+    switch (item.type) {
+      case 'help':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assistance?id=' + item.id
+        })
+        return
+      case 'group':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assemble?id=' + item.id
+        })
+        return
+      default:
+        Taro.navigateTo({
+          url: '/pages/activity/detail/index?id=' + item.id
+        })
+        return
     }
-  
   }
 
   onPullDownRefresh = async (rest) => {

src/pages/activity/item/index.js

@@ -15,7 +15,7 @@ export default class Item extends Component {
     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <Image className="pic" mode="aspectFill" src={data.imgUrl}></Image>
+        <Image className="pic" mode="aspectFill" src={data.mainImg}></Image>
         <View className="box">
 
           <View className="title">{data.title}</View>

src/pages/auth/index.js

@@ -71,7 +71,7 @@ export default class Index extends Component {
           <View>申请获取以下权限</View>
           <Text>获得你的公开信息(昵称，头像等)</Text>
         </View>
-        <Button className='bottom' type='primary' open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>授权登录</Button>
+        <Button className='bottom' open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>授权登录</Button>
       </View>
     )
   }

src/pages/auth/index.scss

@@ -32,6 +32,8 @@
   border-radius: 80px;
   margin: 70px 225px;
   font-size: 30px;
+  color: white;
+  background-color: $primary-color;
 }
 
 .line {

src/pages/news/detail/index.js

@@ -7,6 +7,7 @@ import WxParse from '@components/wxParse/wxParse'
 import BackHomeBtn from '@components/BackHomeBtn'
 import Notice from '@components/Notice'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
+import { getDownloadURL } from '@utils/tools'
 import {
   addNewsUv,
   favorNews,
@@ -160,7 +161,7 @@ export default class NewsDetail extends Component {
         "scene": `id=${newsId}&from=news_share&recommender=${personId}`,
         "page": 'pages/news/detail/index',
       }
-      const _avatarurl = avatarurl.replace('https://wx.qlogo.cn/', 'https://d.pawoma.cn/qlogo/');
+      const _avatarurl = getDownloadURL(avatarurl, 'avatar');
       getMiniQrcode(payload).then(qrcode => {
         let data = {
           qrcode,//小程序二维码

src/pages/person/authorize/index.scss

@@ -1,3 +1,5 @@
+@import "@styles/theme.scss";
+
 .auth-page{
   position: relative;
   width: 100%;
@@ -24,13 +26,13 @@
     width: 80%;
     left: 10%;
     height:90px;
-    background: #FF4740;
     border-radius: 10px;
     top:40%;
-    color: #fff;
     font-size:32px;
     font-weight: 500;
     line-height: 90px;
+    color: white;
+    background-color: $primary-color;
   }
   .adver-btn{
     position: absolute;

src/pages/project/detail/index.js

@@ -19,7 +19,7 @@ import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn' // 按需加载
 import ready from '@utils/ready'
 import Notice from '@components/Notice'
-
+import { getDownloadURL } from '@utils/tools'
 import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@actions/project'
 import getUserPhone from '@utils/getUserPhone'
@@ -277,7 +277,7 @@ export default class Index extends Component {
         "scene": `id=${buildingId}&from=building_share&recommender=${personId}`,
         "page": 'pages/project/detail/index',
       }
-      const _avatarurl = avatarurl.replace('https://wx.qlogo.cn/', 'https://d.pawoma.cn/qlogo/');
+      const _avatarurl = getDownloadURL(avatarurl, 'avatar');
 
       getMiniQrcode(payload).then(qrcode => {
         let data = {

src/services/activity.js

@@ -6,7 +6,9 @@ import {
   API_ACTIVITY_FAVOR,
   API_ACTIVITY_SAVE,
   API_ACTIVITY_UV,
-  API_ACTIVITY_SHARE
+  API_ACTIVITY_SHARE,
+  API_ACTNEW_LIST,
+  API_HELP_DETAIL,
 } from '@constants/api'
 
 /**
@@ -58,4 +60,12 @@ export const favorActivity = id => fetch({ url: `${API_ACTIVITY_FAVOR}/${id}`, m
  * 取消活动收藏
  * @param {*} payload 
  */
-export const cancelFavorActivity = id => fetch({ url: `${API_ACTIVITY_FAVOR}/${id}`, method:'DELETE' })
+export const cancelFavorActivity = id => fetch({ url: `${API_ACTIVITY_FAVOR}/${id}`, method:'DELETE' })
+
+/**
+ * 获取活动列表
+ * @param {*} payload 
+ */
+export const getActNewList = payload => fetch({ url: API_ACTNEW_LIST, payload })
+
+export const getHelpDetail = id => fetch({ url: `${API_HELP_DETAIL}/${id}`, method:'GET' })

src/utils/tools.js

@@ -1,5 +1,16 @@
 import Taro from '@tarojs/taro';
 
+export function getDownloadURL(url, type) {
+  switch (type) {
+    case 'avatar':
+      return url.replace('https://wx.qlogo.cn/', 'https://lt.pawoma.cn/qlogo/');
+    case 'alioss':
+      return url.replace('https://estateagents.oss-cn-shanghai.aliyuncs.com/', 'https://lt.pawoma.cn/alioss/');
+    default:
+      return url;
+  }
+}
+
 /**
  * @description 获取当前页url
  */
@@ -48,8 +59,8 @@ export const makeProjectPoster = (res) => {
 
     const { poster, qrcode, nickname, avatarurl, canvasName } = res
     const ctx = Taro.createCanvasContext(canvasName);
-    const _avatarurl = avatarurl.replace('https://wx.qlogo.cn/', 'https://d.pawoma.cn/qlogo/');
-    const _poster = poster.replace('https://estateagents.oss-cn-shanghai.aliyuncs.com/', 'https://d.pawoma.cn/alioss/');
+    const _avatarurl = getDownloadURL(avatarurl, 'avatar');
+    const _poster = getDownloadURL(poster, 'alioss');
 
     Promise.all([
       Taro.downloadFile({ url: _poster }),
@@ -159,8 +170,8 @@ export const makeCardPoster = (data) => {
   return new Promise(resolve => {
     const { bgImg, qrcodeImg, name, nickname, avatarurl, company, post, canvasName } = data
     const ctx = Taro.createCanvasContext(canvasName);
-    const _qrcodeImg = qrcodeImg.replace('https://estateagents.oss-cn-shanghai.aliyuncs.com/', 'https://d.pawoma.cn/alioss/');
-    const _avatarurl = avatarurl.replace('https://wx.qlogo.cn/', 'https://d.pawoma.cn/qlogo/');
+    const _qrcodeImg = getDownloadURL(qrcodeImg, 'alioss');
+    const _avatarurl = getDownloadURL(avatarurl, 'avatar');
 
     Promise.all([
       Taro.downloadFile({ url: _avatarurl }),
@@ -275,7 +286,7 @@ export const makeCardShareImg = (data) => {
 
     const { bgImg, post, name, phoneImg, phone, picture, addrImg, company, canvasName } = data
     const ctx = Taro.createCanvasContext(canvasName);
-    const _picture = picture.replace('https://estateagents.oss-cn-shanghai.aliyuncs.com/', 'https://d.pawoma.cn/alioss/');
+    const _picture = getDownloadURL(picture, 'alioss');
     Promise.all([
       Taro.downloadFile({ url: _picture })
     ]).then(list => {