helpgrouplist

src/app.js

@@ -40,12 +40,13 @@ class App extends Component {
       }
     },
     pages: [
+      'pages/person/index',
       'pages/activity/activity',
       'pages/shop/index',
       'pages/project/index',
-     
+
       'pages/project/detail/index',
-      'pages/person/index',
+      
       'pages/activity/assemblePage',
       'pages/activity/assistancePage',
       'pages/person/spread/index',

src/components/Poster/index.js

@@ -0,0 +1,251 @@
+import Taro, { Component } from '@tarojs/taro';
+import { TaroCanvasDrawer } from '@components/taro-plugin-canvas';
+import dayjs from 'dayjs'
+import './index.scss'
+import {getCanvasConfig} from './util'
+/**
+ * 文档参考
+ * http://taro-ext.jd.com/plugin/view/5d23051670a0f46a87c9785b
+ */
+export default class Index extends Component {
+  static options = {
+    addGlobalClass: true
+  }
+  static defaultProps = {
+    data: {}
+  }
+  state = {
+    // 绘制的图片
+    shareImage: null,
+    canvasStatus: false,
+    config: null,
+    visible: false,
+    basicConfig: {
+      width: 640,
+      height: 1136,
+      backgroundColor: '#ffffff',
+      debug: false
+    }
+  }
+  componentWillMount() {
+    // this.initConfig()
+    getCanvasConfig()
+    Taro.showLoading({
+      title: '生成中...',
+      icon: 'none'
+    })
+  }
+  initConfig() {
+    const { data } = this.props
+    const { basicConfig } = this.state
+    const texts = [
+      {
+        x: 30,
+        y: 820,
+        text: data.buildingName,
+        fontSize: 36,
+        color: 'black',
+        baseLine: 'middle',
+        lineNum: 2,
+        lineHeight: 48,
+        // textAlign: 'center',
+        width: 560,
+        zIndex: 999
+      }, {
+        x: 30,
+        y: 890,
+        text: data.price,
+        fontSize: 36,
+        color: 'red',
+        baseLine: 'middle',
+        lineNum: 2,
+        lineHeight: 48,
+        // textAlign: 'center',
+        width: 560,
+        zIndex: 999
+      },
+      {
+        x: 30,
+        y: 1010,
+        text: '长按识别小程序码',
+        fontSize: 26,
+        color: '#999',
+        baseLine: 'middle',
+        lineHeight: 48,
+        width: 200,
+        zIndex: 11
+      },
+      {
+        x: 30,
+        y: 1065,
+        text: '进入',
+        fontSize: 26,
+        color: '#999',
+        baseLine: 'middle',
+        lineHeight: 48,
+        width: 50,
+        zIndex: 11
+      },
+      {
+        x: 100,
+        y: 1065,
+        text: '橙蕉',
+        fontSize: 28,
+        color: 'black',
+        baseLine: 'middle',
+        lineHeight: 48,
+        width: 120,
+        zIndex: 11
+      },
+      {
+        x: 240,
+        y: 1065,
+        text: '报名活动',
+        fontSize: 26,
+        color: '#999',
+        baseLine: 'middle',
+        lineHeight: 48,
+        width: 150,
+        zIndex: 11
+      },
+    ]
+    const images = [
+      {
+        url: data.poster,
+        width: 640,
+        height: 670,
+        y: 0,
+        x: 0
+      },
+      {
+        url: data.qrcode,
+        width: 160,
+        height: 160,
+        y: 950,
+        x: 450,
+        zIndex: 999
+      },
+      {
+        url: data.avatarurl || require('@assets/default-avatar.png'),
+        width: 130,
+        height: 130,
+        y: 630,
+        x: 20,
+        borderRadius: 130,
+        zIndex: 999
+      }
+    ]
+
+    const blocks = [
+      {
+        x: 0,
+        y: 936,
+        width: 640,
+        height: 200,
+        backgroundColor: 'rgba(248,248,248,1)',
+        zIndex: 1
+      }
+    ]
+    const config = Object.assign(basicConfig, { images, blocks, texts })
+    this.setState({
+      config,
+      canvasStatus: true
+    })
+  }
+
+  onCreateSuccess = (result) => {
+    const { tempFilePath, errMsg } = result;
+    Taro.hideLoading();
+    if (errMsg === 'canvasToTempFilePath:ok') {
+      this.setState({
+        shareImage: tempFilePath,
+        canvasStatus: false,
+        config: null,
+        visible: true
+      });
+    } else {
+      this.setState({
+        canvasStatus: false,
+        config: null
+      });
+      Taro.showToast({ icon: 'none', title: errMsg || '出现错误' });
+      console.log(errMsg);
+      this.hidePoster()
+    }
+  }
+
+  onPreview(e) {
+    e.stopPropagation()
+    e.preventDefault()
+    Taro.previewImage({
+      current: this.state.shareImage,
+      urls: [this.state.shareImage]
+    })
+  }
+
+  onCreateFail = (error) => {
+    console.log(error);
+  }
+
+  hidePoster(e) {
+    Taro.hideLoading();
+    this.props.toggle(false)
+  }
+
+  // 保存图片至本地
+  saveToAlbum = (e) => {
+    e.stopPropagation()
+    e.preventDefault()
+
+    Taro.authorize({ scope: "scope.writePhotosAlbum" }).then(res => {
+      console.log('auth:', res)
+      Taro.saveImageToPhotosAlbum({
+        filePath: this.state.shareImage,
+      }).then(res => {
+        Taro.showToast({
+          title: '保存图片成功',
+          icon: 'success',
+          duration: 2000,
+        });
+      })
+    }).catch(err => {
+      console.log('err:', err)
+      Taro.showToast({
+        title: '未开启相册权限',
+        icon: 'none'
+      })
+    })
+  }
+
+  render() {
+    return (
+      <Block>
+        {
+          this.state.canvasStatus && (
+            <TaroCanvasDrawer
+              config={this.state.config}
+              onCreateSuccess={this.onCreateSuccess}
+              onCreateFail={this.onCreateFail}
+            />
+          )
+        }
+        {
+          this.state.visible && (
+            <View className="poster">
+              <View className="con">
+                <View className="con-head">
+                  <Text>保存后分享图片</Text>
+                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.hidePoster}></Text>
+                </View>
+                <View className="con-body">
+                  <Image className="result-img" mode="aspectFit" lazy-load src={this.state.shareImage} onClick={this.onPreview}></Image>
+                </View>
+                <Button className="save-btn" onClick={this.saveToAlbum}>保存海报</Button>
+              </View>
+            </View>
+          )
+        }
+      </Block>
+    )
+  }
+}

src/components/Poster/index.scss

@@ -0,0 +1,62 @@
+.poster {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 999;
+  justify-content: space-around;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  top: 0;
+
+  .con {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    padding: 0 60px;
+    background: white;
+    margin: 0 auto;
+    box-shadow: 0 0 20px rgba(0, 0, 0, 0.2);
+    border-top-left-radius: 20px;
+    border-top-right-radius: 20px;
+
+    &-head {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 20px 0;
+      font-size: 32px;
+      font-weight: bold;
+
+      .iconfont {
+        font-size: 40px;
+        color: #545454;
+        font-weight: normal;
+      }
+    }
+
+    &-body {
+      width: 100%;
+      // background: #EAEAEA;
+      border-radius: 10px;
+      padding: 40px 0;
+
+      .result-img {
+        height: 60vh;
+        display: block;
+        margin: 0 auto;
+      }
+    }
+  }
+
+  .save-btn {
+    margin: 0 auto;
+    color: white;
+    border: none;
+    font-size: 36px;
+    background: linear-gradient(90deg, rgba(255, 199, 12, 1) 0%, rgba(255, 65, 65, 1) 100%);
+    border-radius: 12px;
+    margin: 20px 0;
+  }
+}

src/components/auth/index.js

@@ -1,78 +0,0 @@
-import Taro, { Component } from '@tarojs/taro'
-import { connect } from '@tarojs/redux'
-import * as actions from '@actions/user'
-import './index.scss'
-
-@connect(state => state.user, { ...actions })
-export default class Index extends Component {
-  config = {
-    navigationBarTitleText: '登录'
-  }
-  state = {}
-
-  getUserInfo() {
-    const { dispatchUpdateUserInfo } = this.props
-    const sessionKey = Taro.getStorageSync('sessionKey')
-    // 获取用户信息
-    Taro.getUserInfo({
-      success: res => {
-        const payload = Object.assign(res, { sessionKey })
-        // const { userInfo: { nickName, gender, country, city, province } } = payload
-        // App.zhuge.identify(nickName, {
-        //   '昵称': nickName,
-        //   '性别': gender == 1 ? '男' : '女',
-        //   '国家': country,
-        //   '省份': province,
-        //   '城市': city
-        // })
-
-        // 用户信息保存至服务器
-        dispatchUpdateUserInfo(payload).then(res => {
-          this.toPage(true)
-        })
-      },
-      fail: () => {
-        this.toPage(false)
-      }
-    })
-  }
-
-  toPage(succed) {
-    const router = Taro.getStorageSync('router')
-    const { query, path } = router
-
-    if (!succed && path === 'pages/signin/index') {
-      return
-    }
-    if (path === 'pages/project/index' || path === 'pages/shop/index' || path === 'pages/person/index') {
-      Taro.switchTab({
-        url: '/' + path
-      })
-      return
-    }
-    Taro.reLaunch({
-      url: `/${path}?${query.params}`
-    })
-  }
-
-  render() {
-    return (
-      <View>
-        <View className="userinfo">
-          <View className="userinfo-avatar">
-            <open-data type="userAvatarUrl"></open-data>
-          </View>
-          <View className="userinfo-name">
-            <open-data type="userNickName"></open-data>
-          </View>
-        </View>
-        <View className='line'></View>
-        <View className='content'>
-          <View>申请获取以下权限</View>
-          <Text>获得你的公开信息(昵称，头像等)</Text>
-        </View>
-        <Button className='bottom' open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>授权登录</Button>
-      </View>
-    )
-  }
-}

src/components/auth/index.scss

@@ -1,78 +0,0 @@
-@import "@styles/theme.scss";
-
-.header {
-  margin: 90px 0 90px 50px;
-  border-bottom: 1px solid #ccc;
-  text-align: center;
-  width: 650px;
-  height: 300px;
-  line-height: 450px;
-
-}
-
-.content {
-  // margin-left: 50px;
-  margin: 70px 0 90px 0;
-  text-align: center;
-
-  view {
-    font-size: 35px;
-    color: $text-color;
-  }
-
-  text {
-    display: block;
-    color: #9d9d9d;
-    margin-top: 30px;
-  }
-}
-
-.bottom {
-  width: 300px;
-  border-radius: 80px;
-  margin: 70px 225px;
-  font-size: 30px;
-  color: white;
-  background-color: $primary-color;
-}
-
-.line {
-  width: 250px;
-  margin: 40px 0 0 250px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-.userinfo {
-  position: relative;
-  width: 750px;
-  // height: 400px;
-  color: #fff;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .userinfo-avatar {
-    overflow: hidden;
-    display: block;
-    width: 230px;
-    height: 230px;
-    margin: 20px;
-    margin-top: 50px;
-    border-radius: 50%;
-    border: 4px solid #fff;
-    box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.2);
-  }
-
-  .userinfo-name {
-    color: #000;
-    text-align: center;
-    font-size: 35px;
-  }
-
-  .userinfo text {
-    font-size: 14px;
-    background-color: #c0c0c0;
-    border-radius: 40%;
-  }
-
-}

src/constants/api.js

@@ -91,6 +91,10 @@ export const API_BURIED_POINT = resolvePath('taPersonVisitRecord')
 
 // activity
 export const API_ACTIVITY_LIST = resolvePath('buildingDynamiceList')
+//拼团
+export const API_GROUP_LIST = resolvePath('taShareRecord')
+//助力
+export const API_HELP_LIST = resolvePath('helpInitiateRecord')
 
 // save activity
 export const API_ACTIVITY_SAVE = resolvePath('save/buildingDynamiceList')

src/pages/activity/assembleItem/index.js

@@ -1,6 +1,8 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import dayjs from 'dayjs'
+const helpSuccess = require('@assets/helpgroup/help/success1.png')
+const helpFail = require('@assets/helpgroup/fail.png')
 
 export default class Item extends Component {
   static defaultProps = {
@@ -11,17 +13,85 @@ export default class Item extends Component {
 
     this.props.onClick(data)
   }
+  state = {
+
+    leftTime: 0,  // 剩余时间
+  }
+  componentWillMount(){
+    this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
+  }
+  // 活动状态
+  const ActBeforeStart = 0;
+  const ActInProcess = 1;
+  const ActFinished = 2;
+
+  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: ActBeforeStart,
+          })
+        } else if (ed > nw) {
+          // 活动未结束
+          this.setState({
+            leftTime: ed - nw,
+            actState: ActInProcess,
+          })
+        } else {
+          // 活动已结束
+          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}秒`
+  }
   render() {
     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <View className="date">{`${dayjs(data.startDate).format('YYYY-MM-DD hh:mm:ss')}`}</View>
-        <Image className="pic" src={require('@assets/agent/banner.png')} ></Image>
-        <View className="title">{data.title}</View>
-        <View className="time">距活动结束：{`${dayjs(data.endDate).format('YYYY-MM-DD hh:mm:ss')}`}</View>
-        <View className="hexiaoma">核销码：123456</View>
-        <View className="start-date">{`${dayjs(data.startDate).format('YYYY-MM-DD hh:mm:ss')}`}</View>
-        <View className={data.isSign ? "alreay-btn" : "btn"}>{data.isSign ? "已参与" : "立即参与"}</View>
+        <Image className="pic" src={data.img} ></Image>
+        <View className="title">{data.title} {data.status}</View>
+        {!data.verification&&
+        <View className="time">{this.state.actState === ActInProcess ? '距活动结束:' : '活动已结束'}<Text className="count-time">{this.state.actState != ActFinished ? this.formateLeftTime() : ''}</Text></View>
+        }
+        {data.verification&&
+        <View className="hexiaoma">核销码：{data.verification}</View>
+        }
+        <View className="start-date">{`${dayjs(data.createDate).format('YYYY-MM-DD hh:mm:ss')}`}</View>
+        {data.status==0&&
+        <Image className="status-icon" src={helpSuccess} ></Image>
+        }
+        {data.status==1&&
+        <View className="btn">进行中</View>
+        }
+        {data.status==2&&
+        <Image className="status-icon" src={helpFail} ></Image>
+        }
+        
       </View>
 
     );

src/pages/activity/assembleItem/index.scss

@@ -8,12 +8,11 @@
 }
 
 .item {
-  border-radius: 10px;
-  box-shadow: 0 2px 10px #EAEAEA;
   overflow: hidden;
   margin-bottom: 40px;
-  padding: 20px;
+  padding: 20px 10px;
   position: relative;
+  border-bottom:1px solid #eee;
   .date{
     font-size: 24px;
     margin-bottom: 12px;
@@ -21,7 +20,15 @@
 
   .pic {
     width: 220px;
-    height:140px;
+    height:160px;
+    border-radius: 12px;
+  }
+  .status-icon{
+    width: 120px;
+    height: 120px;
+    position: absolute;
+    right:0;
+    top:42px;
   }
 
   .title {
@@ -29,51 +36,39 @@
     width: 320px;
     @include text-ellipsis;
     position: absolute;
-    top:60px;
-    left:254px;
+    top:20px;
+    left:264px;
   }
 
   .time {
-    margin-top: 15px;
     font-size: 26px;
-    color: #8E8E8E;
+    color: #666;
     position: absolute;
-    top:110px;
-    left:254px;
+    top:90px;
+    left:264px;
   }
   .hexiaoma{
     color: $primary-color;
     font-size: 28px;
     position: absolute;
-    top:110px;
-    left:254px;
+    top:90px;
+    left:264px;
+  }
+  .count-time{
+    color:$primary-color;
   }
   .start-date{
     color: #999;
     font-size: 26px;
     position: absolute;
-    bottom:20px;
-    left:254px;
+    bottom:30px;
+    left:264px;
   }
   }
 
   .btn {
-    border-radius:30px;
-    text-align: center;
-    color: red;
-    display: block;
-    padding: 10px 0;
-    position: absolute;
-    right:30px;
-    bottom:20px;
-  }
-	.alreay-btn {
-	  border-radius:30px;
-	  text-align: center;
-	  color: red;
-	  display: block;
-	  padding: 10px 0;
+    color: #E35E44;
     position: absolute;
-    right:30px;
-    bottom:20px;
+    right:10px;
+    bottom:30px;
   }

src/pages/activity/assemblePage.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 { queryGroupList } from '@services/activity'
 import AssembleItem from './assembleItem'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
@@ -58,7 +58,7 @@ export default class Index extends Component {
     if (buildingId) {
       payload.buildingId = buildingId
     }
-    return queryActivityList(payload)
+    return queryGroupList(payload)
   }
 
   handleItemClick(item) {
@@ -102,7 +102,7 @@ export default class Index extends Component {
         className="wrap"
         needInit
         isEmpty={isEmpty}
-        emptyText="暂无活动~"
+        emptyText="暂无拼团活动~"
         hasMore={hasMore}
         onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
         onScrollToLower={fn => this.onScrollToLower(fn)}

src/pages/activity/assistanceItem/index.js

@@ -0,0 +1,99 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import dayjs from 'dayjs'
+const helpSuccess = require('@assets/helpgroup/help/success1.png')
+const helpFail = require('@assets/helpgroup/fail.png')
+
+export default class Item extends Component {
+  static defaultProps = {
+    data: {},
+    style: {}
+  }
+  handleClick(data) {
+
+    this.props.onClick(data)
+  }
+  state = {
+
+    leftTime: 0,  // 剩余时间
+  }
+  componentWillMount(){
+    this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
+  }
+  // 活动状态
+  const ActBeforeStart = 0;
+  const ActInProcess = 1;
+  const ActFinished = 2;
+
+  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: ActBeforeStart,
+          })
+        } else if (ed > nw) {
+          // 活动未结束
+          this.setState({
+            leftTime: ed - nw,
+            actState: ActInProcess,
+          })
+        } else {
+          // 活动已结束
+          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}秒`
+  }
+  render() {
+    const { data, style } = this.props
+    return (
+      <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
+        <Image className="pic" src={data.img} ></Image>
+        <View className="title">{data.title} {data.status}</View>
+        {!data.verification&&
+        <View className="time">{this.state.actState === ActInProcess ? '距活动结束:' : '活动已结束'}<Text className="count-time">{this.state.actState != ActFinished ? this.formateLeftTime() : ''}</Text></View>
+        }
+        {data.verification&&
+        <View className="hexiaoma">核销码：{data.verification}</View>
+        }
+        <View className="start-date">{`${dayjs(data.createDate).format('YYYY-MM-DD hh:mm:ss')}`}</View>
+        {data.status==0&&
+        <Image className="status-icon" src={helpSuccess} ></Image>
+        }
+        {data.status==1&&
+        <View className="btn">进行中</View>
+        }
+        {data.status==2&&
+        <Image className="status-icon" src={helpFail} ></Image>
+        }
+        
+      </View>
+
+    );
+  }
+}

src/pages/activity/assistanceItem/index.scss

@@ -0,0 +1,74 @@
+@import "@styles/theme.scss";
+@import "@styles/mixins.scss";
+
+.flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.item {
+  overflow: hidden;
+  margin-bottom: 40px;
+  padding: 20px 10px;
+  position: relative;
+  border-bottom:1px solid #eee;
+  .date{
+    font-size: 24px;
+    margin-bottom: 12px;
+  }
+
+  .pic {
+    width: 220px;
+    height:160px;
+    border-radius: 12px;
+  }
+  .status-icon{
+    width: 120px;
+    height: 120px;
+    position: absolute;
+    right:0;
+    top:42px;
+  }
+
+  .title {
+    font-size: 30px;
+    width: 320px;
+    @include text-ellipsis;
+    position: absolute;
+    top:20px;
+    left:264px;
+  }
+
+  .time {
+    font-size: 26px;
+    color: #666;
+    position: absolute;
+    top:90px;
+    left:264px;
+  }
+  .hexiaoma{
+    color: $primary-color;
+    font-size: 28px;
+    position: absolute;
+    top:90px;
+    left:264px;
+  }
+  .count-time{
+    color:$primary-color;
+  }
+  .start-date{
+    color: #999;
+    font-size: 26px;
+    position: absolute;
+    bottom:30px;
+    left:264px;
+  }
+  }
+
+  .btn {
+    color: #E35E44;
+    position: absolute;
+    right:10px;
+    bottom:30px;
+  }

src/pages/activity/assistancePage.js

@@ -1,8 +1,8 @@
 import Taro, { Component } from '@tarojs/taro';
 import ListView from '@components/ListView'
 import './index.scss'
-import { queryActivityList } from '@services/activity'
-import AssembleItem from './assembleItem'
+import { queryHelpList } from '@services/activity'
+import AssistanceItem from './assistanceItem'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 
@@ -58,7 +58,7 @@ export default class Index extends Component {
     if (buildingId) {
       payload.buildingId = buildingId
     }
-    return queryActivityList(payload)
+    return queryHelpList(payload)
   }
 
   handleItemClick(item) {
@@ -102,7 +102,7 @@ export default class Index extends Component {
         className="wrap"
         needInit
         isEmpty={isEmpty}
-        emptyText="暂无活动~"
+        emptyText="暂无助力活动~"
         hasMore={hasMore}
         onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
         onScrollToLower={fn => this.onScrollToLower(fn)}
@@ -110,11 +110,11 @@ export default class Index extends Component {
         <View className="list">
           {
             list.map(item => (
-              <AssembleItem
+              <AssistanceItem
                 data={item}
                 key={item.dynamicId}
                 onClick={this.handleItemClick}>
-              </AssembleItem>
+              </AssistanceItem>
             ))
           }
         </View>

src/pages/activity/detail/assemble.js

@@ -327,54 +327,54 @@ export default class Detail extends Component {
                     <Text >5人团</Text>
                   </View>
 
-                  <Image src={require('@assets/agent/banner.png')} className="my__img"></Image>
+                  <Image src={require('@assets/shop/banner1.jpg')} className="my__img"></Image>
 
                   <View className='tools-main'>
                     <View className='tools-item'>
-                      <Image src={require('@assets/agent/banner.png')} className='tools-item-img'></Image>
+                      <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/agent/banner.png')} className='tools-item-img'></Image>
+                      <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/agent/banner.png')} className='tools-item-img'></Image>
+                      <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/agent/banner.png')} className='tools-item-img'></Image>
+                      <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/agent/banner.png')} className='tools-item-img'></Image>
+                      <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/agent/banner.png')} className='tools-item-img'></Image>
+                      <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/agent/banner.png')} className='tools-item-img'></Image>
+                      <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/agent/banner.png')} className='tools-item-img'></Image>
+                      <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/agent/banner.png')} className='tools-item-img'></Image>
+                      <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/agent/banner.png')} className='tools-item-img'></Image>
+                      <Image src={require('@assets/shop/banner1.jpg')} className='tools-item-img'></Image>
                       <Text className='tools-item-txt'>等待拼团</Text>
                     </View>
                   </View>
                 </View>
 
                 <View className="assistance-text">活动说明</View>
-                <Image src={require('@assets/agent/banner.png')}style="width:100%"></Image>
+                <Image src={require('@assets/shop/banner1.jpg')}style="width:100%"></Image>
                 <Button className={true ? "assistance-btn" : "nostart-btn"}>{true ? "邀请好友拼团" : "未开始"}</Button>
               </ScrollView>
 

src/pages/activity/detail/assistance.js

@@ -32,7 +32,7 @@ const HelpInProcess = 1;
 const HelpSuccess = 0;
 const HelpFailure = 2;
 
-const defaultAvatar = require('@assets/agent/banner.png')
+const defaultAvatar = require('@assets/shop/banner1.jpg')
 
 @connect(state => state.user)
 export default class Detail extends Component {

src/pages/agent/become/index.js

@@ -114,7 +114,7 @@ export default class Index extends Component {
     const { userInfo: { person: { phone } } } = this.props
     return (
       <View className='page'>
-        <Image src={require('@assets/agent/banner.png')} className='banner' mode='widthFix'></Image>
+        <Image src={require('@assets/shop/banner1.jpg')} className='banner' mode='widthFix'></Image>
         <View className='become_agent'>
           <View className='agent_type'>
             <Text className='agent_title'>经纪人类型</Text>

src/pages/project/banner/index.js

@@ -19,30 +19,38 @@ export default class SwiperBanner extends Component {
   render() {
     const { list, style, indicatorDots, current } = this.props
     return (
-      <View className='home-banner' style={style}>
-        <Swiper
-          className='home-banner__swiper'
-          circular
-          autoplay
-          indicatorDots={indicatorDots}
-          indicatorActiveColor='rgb(178, 42, 49)'
-        >
-          {list.map((item, index) => (
-            <SwiperItem
-              key={index}
-              onClick={this.onBannerClick.bind(this, item)}
-              className='home-banner__swiper-item'
-            >
-              <Image
-                mode="widthFix"
-                style={style}
-                className='home-banner__swiper-item-img'
-                src={item.image || item.url}
-              />
-            </SwiperItem>
-          ))}
-        </Swiper>
-      </View>
+      <swiper indicator-dots="false"
+      >
+        {/* <block wx: for="{{ background }}" wx:key="*this"> */}
+        <swiper-item>
+          <view class="swiper-item {{item}}"></view>
+        </swiper-item>
+        {/* </block> */}
+      </swiper >
+      //   <View className='home-banner' style={style}>
+      //     <Swiper
+      //       className='home-banner__swiper'
+      //       circular
+      //       autoplay
+      //       indicatorDots={indicatorDots}
+      //       indicatorActiveColor='rgb(178, 42, 49)'
+      //     >
+      //       {list.map((item, index) => (
+      //         <SwiperItem
+      //           key={index}
+      //           onClick={this.onBannerClick.bind(this, item)}
+      //           className='home-banner__swiper-item'
+      //         >
+      //           <Image
+      //             mode="widthFix"
+      //             style={style}
+      //             className='home-banner__swiper-item-img'
+      //             src={item.image || item.url}
+      //           />
+      //         </SwiperItem>
+      //       ))}
+      //     </Swiper>
+      //   </View>
     )
   }
 }

src/pages/project/detail/index.js

@@ -731,7 +731,7 @@ export default class Index extends Component {
           newsList.length > 0 && (
             <View className="activity">
               <View className="title">助力活动</View>
-              <Image src={require('@assets/agent/banner.png')} className="activity-img"></Image>
+              <Image src={require('@assets/shop/banner1.jpg')} className="activity-img"></Image>
             </View>
           )
         }
@@ -746,7 +746,7 @@ export default class Index extends Component {
           newsList.length > 0 && (
             <View className="activity">
               <View className="title">拼团活动</View>
-              <Image src={require('@assets/agent/banner.png')} className="activity-img"></Image>
+              <Image src={require('@assets/shop/banner1.jpg')} className="activity-img"></Image>
             </View>
           )
         }

src/services/activity.js

@@ -11,6 +11,8 @@ import {
   API_HELP_DETAIL,
   API_HELP_CREATE,
   API_HELP_FRIEND,
+  API_HELP_LIST,
+  API_GROUP_LIST
 } from '@constants/api'
 
 /**
@@ -31,6 +33,16 @@ export const addActivityShareNum = id => fetch({ url: `${API_ACTIVITY_SHARE}/${i
  * @param {*} payload
  */
 export const queryActivityList = payload => fetch({ url: API_ACTIVITY_LIST, payload })
+/**
+ * 获取拼团列表
+ * @param {*} payload
+ */
+export const queryGroupList = payload => fetch({ url: API_GROUP_LIST, payload })
+/**
+ * 获取助力列表
+ * @param {*} payload
+ */
+export const queryHelpList = payload => fetch({ url: API_HELP_LIST, payload })
 
 /**
  * 已收藏活动列表