feats

config/dev.js

     NODE_ENV: '"development"'
   },
   defineConstants: {
-		// HOST: '"http://47.101.36.130:8085"',//测试
+    // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',

src/actions/shop.js

 import { createAction } from '@utils/redux'
 
 
-/**
- * 商品列表
- * @param {*} payload
- */
-export const dispatchGoodsList = payload => createAction({
-  url: API_GOODS_LIST,
-  type: GOODS_LIST,
-  payload
-})
+
 
 
 
 export const dispatchGoodsExchange = id => createAction({
   url: `${API_GOODS_EXCHANGE}/${id}`,
   type: GOODS_EXCHANGE,
-  method:'POST'
+  method: 'POST'
 })
 
 
  * @param {*} payload
  */
 export const dispatchPointsRule = payload => createAction({
-  url:  API_POINTS_RULE,
+  url: API_POINTS_RULE,
   type: POINTS_RULE,
   payload
 })
  * @param {*} payload
  */
 export const dispatchPointsAddress = payload => createAction({
-  url:  `${API_POINTS_ADRESS}`,
-  type:POINTS_ADRESS,
+  url: `${API_POINTS_ADRESS}`,
+  type: POINTS_ADRESS,
   payload,
-  method:'PUT'
+  method: 'PUT'
 })

src/app.js

       }
     },
     pages: [
-      'pages/person/index',
       'pages/activity/activity',
-      'pages/person/profile/index',
-      'pages/project/index',
       'pages/shop/index',
+      'pages/project/index',
+      'pages/person/index',
+
+      'pages/person/profile/index',
       'pages/project/detail/index',
       'pages/activity/assemblePage',
       'pages/activity/assistancePage',
       'pages/person/authorize/index',
       'pages/project/map/index',
       'pages/agent/index',
-
       'pages/shop/integralDetail/index',
       'pages/auth/index',
       'pages/card/list/index',
       'pages/checkin/index',
       'pages/checkin/checkinsuccess/index',
       // 'pages/checkin/unregistered/index',
-  
+
     ],
     window: {
       backgroundTextStyle: 'light',
     tabBar: {
       color: '#666',
       selectedColor: '#BB9C79',
+
       list: [
         {
           pagePath: "pages/project/index",

src/constants/api.js

 export const API_ITEMS_LIST = resolvePath('building/list')
 export const API_ITEMS_DETAIL = resolvePath('buildingSelectId')
 export const API_ITEMS_TYPE = resolvePath('tdBuildingType')
+export const API_ACTIVITY_GROUP = resolvePath('helpActivityAndGroup')
 
 
 // shop
 export const API_GOODS_LIST = resolvePath('goods')
+export const API_GOODS_BUILDING = resolvePath('goodsToBuilding')
 export const API_GOODS_EXCHANGE = resolvePath('goods/exchange')
 export const API_GOODS_EXCHANGE_RECORDS = resolvePath('taPointsExchange')
 export const API_POINTS_RECORDS = resolvePath('taPointsRecords')

src/pages/activity/assistanceItem/index.js

 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import dayjs from 'dayjs'
-const helpSuccess = '@https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success1.png'
+const helpSuccess = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success1.png'
 const helpFail = require('@assets/helpgroup/fail.png')
 
 export default class Item extends Component {

src/pages/activity/detail/assemble.js

 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'
 
 @connect(state => state.user)
 export default class Detail extends Component {
+
   config = {
     navigationBarTitleText: '拼团详情'
   }
 
+
   state = {
     id: null, // 活动ID
     recordId: undefined,  // 发起拼团ID
     if (!this.state.detail.groupActivityId) {
       let id = this.$router.params.id
       let recordId = this.$router.params.recordId
-     
+
       if (!id) {
         const router = Taro.getStorageSync('router')
         id = router.query.id
         this.updateLeftTime(res.taShareActivity.startTime, res.taShareActivity.endTime)
       }
 
-      Taro.setNavigationBarTitle({ title: res.taShareActivity.activityName })
+      // Taro.setNavigationBarTitle({ title: res.taShareActivity.activityName })
 
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
           grantPhoneVisible &&
           <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
         }
-
+        <BackHomeBtn></BackHomeBtn>
         {
           loaded && (
             <View className="ass-page">
 
                 {
                   actState === ActBeforeStart &&
-                  (<Button className="nostart-btn" style="margin:36px auto">未开始</Button>)
+                  (<Button className="nostart-btn" style="margin:30px auto">未开始</Button>)
                 }
                 {
                   isStarter && actState === ActInProcess && groupState === GroupInProcess &&
-                  (<Button className="assistance-btn" style="margin:36px auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button>)
+                  (<Button className="assistance-btn" style="margin:30px auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button>)
                 }
                 {
                   !isStarter && actState === ActInProcess &&
                   (
-                    <Block>
+                    <View className="btn-box">
                       {
                         groupState === GroupInProcess &&
-                        (<Button className="assistance-btn" style="margin:36px auto" onClick={this.joinGroup}>立即参团</Button>)
+                        (<Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button>)
                       }
                       <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
-                    </Block>
+                    </View>
                   )
                 }
               </ScrollView>

src/pages/activity/detail/assistance.js

 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'
         this.updateLeftTime(res.helpActivity.startDate, res.helpActivity.endDate)
       }
 
-      Taro.setNavigationBarTitle({ title: res.helpActivity.title })
+      // Taro.setNavigationBarTitle({ title: res.helpActivity.title })
 
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
           grantPhoneVisible &&
           <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
         }
-
+        <BackHomeBtn></BackHomeBtn>
         {
           loaded && (
             <View className="ass-page">

src/pages/activity/detail/index.js

     selector: ['1', '2', '3'],
     selectorChecked: '1',
     canChoose: 'none',
-    inputName:''
+    inputName: ''
   }
 
   componentWillMount() {
     })
   }
   onShareAppMessage = () => {
-    const { detail: { shareContents,title, dynamicId, url } } = this.state
+    const { detail: { shareContents, title, dynamicId, url } } = this.state
     const { userInfo: { person: { personId } } } = this.props
 
     addActivityShareNum(dynamicId)
       selectorChecked: this.state.selector[e.detail.value]
     })
   }
-  
-  onInputText=e=>{
-  	this.setState({
+
+  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 { 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,
+      phone: phone ? phone : tel,
       attendNum: selectorChecked
     }
 
                 scrollY
                 className="detail-wrap">
                 <View className="detail">
-                  <View className="detail-sign__num">{detail.enlisted || 0}人已报名</View>
+                  {(detail.enlisted == 0 || !detail.enlisted) &&
+                    <View className="detail-sign__num">不需要报名</View>
+                  }
+                  {detail.enlisted > 0 &&
+                    <View className="detail-sign__num">{detail.enlisted || 0}人已报名</View>
+                  }
                   <View class="detail-title">{detail.title}</View>
                   <View className="detail-top">
                     <View className="detail-top__row">
                     </View>
                     <View className="detail-top__row">
                       <Text className="row-label">报名截止：</Text>
-                      <Text className="row-content">{dayjs(detail.enlistEnd).format('YYYY-MM-DD HH:mm:ss')}</Text>
+                      {detail.enlistEnd &&
+                        <Text className="row-content">{dayjs(detail.enlistEnd).format('YYYY-MM-DD HH:mm:ss')}</Text>
+                      }
+
                     </View>
                   </View>
                   <View className="detail-con">
                   <Text className="txt">收藏</Text>
                 </Button>
                 {
-                  parseInt(detail.isEnlist) !=0 && (parseInt(detail.isEnlist) == 2 ? (<Button disabled='true' className='submit-btn hasSigned'>报名人数已满</Button>) : (( phone ? (
+                  parseInt(detail.isEnlist) != 0 && (parseInt(detail.isEnlist) == 2 ? (<Button disabled='true' className='submit-btn hasSigned'>报名人数已满</Button>) : ((phone ? (
                     <Button disabled={isSign} className={`submit-btn ${isSign ? 'hasSigned' : ''}`} onClick={this.handleSignup}>{isSign ? '已报名' : '立即报名'}</Button>
                   ) : (
-                  <Button disabled={isSign} className='submit-btn' open-type="getPhoneNumber" onGetphonenumber={this.handleGetPhone}>{isSign ? '已报名' : '立即报名'}</Button>
-                  ))))
+                      <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>
               </View>
 
               <View className='page-body' style={{ display: this.state.canChoose }}>
-                <View className="mask"  onClick={this.hideModal}></View>
+                <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='请输入姓名'/>
+                    <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>

src/pages/activity/detail/index.scss

   justify-content: space-between;
   align-items: center;
 }
+.btn-box{
+  padding: 50px 30px ;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 
 .share__friend,
 .creat__img {

src/pages/activity/index.js

     hasMore: true,
     isEmpty: false,
     recordId: null,
-    pageIndex:1
+    pageIndex: 1
   }
 
   componentWillMount() {
       console.log('活动列表')
     })
   }
+  componentDidMount() {
+    console.log(this.$router, "9999999999999999")
+  }
   componentWillUnmount() {
     const { recordId } = this.state
     updatePoint(recordId)
+
+    this.loadList(1)
+
   }
 
   loadList(pageNumber) {
     const { curCity: { id: cityId } } = this.props
     const payload = { pageSize: 10, pageNumber }
-    
+
     const { params: { buildingId, from } } = this.$router
     if (cityId) {
       payload.cityId = cityId
     }
     // 从个人中心过来
+    console.log(this.router, "from")
     if (from === 'mine') {
       payload.mine = true
     }
-    // 从项目详情过来
+    // // 从项目详情过来
     if (buildingId) {
       payload.buildingId = buildingId
     }
       list: _list,
       isEmpty: total == 0,
       hasMore: _list.length >= total ? false : true,
-      pageIndex:1
+      pageIndex: 1
     })
     rest && rest()
   }
   onScrollToLower = async (fn) => {
     const { list } = this.state;
     pageIndex++
-    const { records, list: list1, total } = await this.loadList(this.state.pageIndex+1);
+    const { records, list: list1, total } = await this.loadList(this.state.pageIndex + 1);
     const _list = records || list1 || []
     const newList = list.concat(_list)
     this.setState({
       list: newList,
       hasMore: newList.length >= total ? false : true,
-      pageIndex:this.state.pageIndex+1
+      pageIndex: this.state.pageIndex + 1
     });
     fn && fn();
   }

src/pages/activity/item/index.js

     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <Image className="pic" mode="aspectFill" src={data.mainImg}></Image>
+        <Image className="pic" mode="aspectFill" src={data.mainImg || data.imgUrl}></Image>
         <View className="box">
           <View className="title">{data.title}</View>
           {
             <View className={data.type == 'help' ? 'type' : 'type2'}>{data.type == 'help' ? '助力' : '拼团'}</View>
 
           }
-          {(data.type == 'help' || data.type == 'group') &&
+          {(data.type == 'help' || data.type == 'group') && data.successNum > 0 &&
             <View className="success-num">
               <View className="triangle"></View>
               <View className="text">已成功 {data.successNum}</View>
           {/* <View className="time">活动开始时间：{`${dayjs(data.startDate).format('YYYY-MM-DD HH:mm:ss')}`}</View> */}
 
           <View className="left">
-            <View className="time">参与截止时间：{`${dayjs(data.endDate).format('YYYY年MM月DD日 HH:mm:ss')}`}</View>
+            {data.endDate &&
+              <View className="time">参与截止时间：{`${dayjs(data.endDate).format('YYYY年MM月DD日 HH:mm:ss')}`}</View>
+            }
+            {!data.endDate &&
+              <View className="time">参与截止时间：</View>
+            }
             <View className={data.activityStatus == 0 ? "btn jionin " : data.activityStatus == 1 ? "btn nostart" : data.activityStatus == 2 ? "btn jioned" : "btn"}>{data.activityStatus == 0 ? "立即参与" : data.activityStatus == 1 ? "未开始" : data.activityStatus == 2 ? "已结束" : "已参与"}</View>
           </View>
         </View>

src/pages/activity/item/index.scss

     left:0;
     top:0;
     color: #fff;
-    background:rgba(246,182,29,0.66);
+    background:#F6B61D;
     padding: 10px 36px;
     border-radius: 12px 0 12px 0;
     font-size: 24px;
     left:0;
     top:0;
     color: #fff;
-    background:rgba(187,156,121,0.66);
+    background:#BB9C79;
     padding: 12px 36px;
     border-radius: 12px 0 12px 0;
     font-size: 24px;

src/pages/news/index.scss

 @import "@styles/theme.scss";
 
 .page {
-  background: $page-bg;
+  background: #fff;
   position: relative;
 }
 .list{

src/pages/person/favorite/index.js

   }
 
   handleActivityItemClick = (item) => {
-    Taro.navigateTo({
-      url: '/pages/activity/detail/index?id=' + item.dynamicId
-    })
+    if(item.status==0){
+      Taro.showToast({
+        title: '当前活动已失效',
+        icon: 'none'
+      })
+    }else{
+      Taro.navigateTo({
+        url: '/pages/activity/detail/index?id=' + item.dynamicId
+      })
+    }
+   
   }
 
   handleNewsItemClick = (item) => {

src/pages/person/index.js

       url: '/pages/toolKit/index'
     })
   }
+  toPolicy() {
+    Taro.navigateTo({
+      url: '/pages/policy/index?from=mine'
+    })
+  }
   toFeedback() {
     Taro.navigateTo({
       url: '/pages/person/feedback/index'
           </View>
         </View>
         <View>
-          <View onClick={this.toAgent} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/homepage.png')} ></Image>
-              <Text >我的主页</Text>
+          <View onClick={this.toAgent} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/homepage.png')} ></Image>
+            <View className="menu-maintext">
+              <Text className="menu-name">我的主页</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
-          <View onClick={this.toAgentClient} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/recommend.png')} ></Image>
-              <Text >推荐客户</Text>
+          <View onClick={this.toAgentClient} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/recommend.png')} ></Image>
+            <View className="menu-maintext">
+              <Text className="menu-name">推荐客户</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
           </View>
-          <View onClick={this.toAgentInvitation} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/development.png')} ></Image>
-              <Text >发展经纪人</Text>
+          <View onClick={this.toAgentInvitation} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/development.png')} ></Image>
+            <View className="menu-maintext">
+              <Text className="menu-name">发展经纪人</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
           </View>
           <View className='line'></View>
-          <View onClick={this.toActivity} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/activities.png')} ></Image>
-              <Text >我的活动</Text>
+          <View onClick={this.toActivity} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/activities.png')} ></Image>
+            <View className="menu-maintext">
+
+              <Text className="menu-name">我的活动</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
-          <View onClick={this.toAssemble} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/regiment.png')} ></Image>
-              <Text >我的拼团</Text>
+          <View onClick={this.toAssemble} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/regiment.png')} ></Image>
+            <View className="menu-maintext">
+              <Text className="menu-name">我的拼团</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
-          <View onClick={this.toAssistance} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/help.png')} ></Image>
-              <Text >我的助力</Text>
+          <View onClick={this.toAssistance} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/help.png')} ></Image>
+            <View className="menu-maintext">
+              <Text className="menu-name">我的助力</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
           <View className='line'></View>
-          <View onClick={this.toFavor} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/collection.png')} ></Image>
-              <Text >我的收藏</Text>
+          <View onClick={this.toFavor} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/collection.png')} ></Image>
+            <View className="menu-maintext">
+              <Text className="menu-name">我的收藏</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
-          <View onClick={this.toRecord} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/exchange.png')} ></Image>
-              <Text >兑换记录</Text>
+          <View onClick={this.toRecord} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/exchange.png')} ></Image>
+            <View className="menu-maintext">
+
+              <Text className="menu-name">兑换记录</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
-          <View onClick={this.toProfile} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/regiment.png')} ></Image>
-              <Text >我的资料</Text>
+          <View onClick={this.toProfile} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/profile.png')} ></Image>
+            <View className="menu-maintext">
+
+              <Text className="menu-name">我的资料</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
-          <View onClick={this.toToolkit} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/calculator.png')} ></Image>
-              <Text >房贷计算器</Text>
+          <View onClick={this.toToolkit} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/calculator.png')} ></Image>
+            <View className="menu-maintext">
+
+              <Text className="menu-name">房贷计算器</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
-          <View onClick={this.toToolkit} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/encyclopedia.png')} ></Image>
-              <Text >购房百科</Text>
+          <View onClick={this.toPolicy} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/encyclopedia.png')} ></Image>
+            <View className="menu-maintext">
+
+              <Text className="menu-name">购房百科</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
-          <View onClick={this.toFeedback} style=" display: flex;align-items: center;justify-content: space-between;margin: 0 20px;padding:10px 0;box-shadow:0px 1px 0px 0px rgba(0,0,0,0.12);">
-            <View style="display: flex;align-items: center;">
-              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/feedback.png')} ></Image>
-              <Text >意见反馈</Text>
+          <View onClick={this.toFeedback} className="menu-item-con">
+            <Image className="left-icon" src={require('@assets/mine/feedback.png')} ></Image>
+            <View className="menu-maintext">
+
+              <Text className="menu-name">意见反馈</Text>
+              <Text className="right-icon"></Text>
             </View>
-            <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
+
           </View>
         </View>
         {/* <View className="list-item">

src/pages/person/index.scss

   position: relative;
   overflow: hidden;
 }
+.menu-item-con{
+  display: flex;
+  align-items: center;
+  justify-content:
+   space-between;
+   margin: 0 40px;
+   .menu-maintext{
+    display: flex;
+    width:90vw;
+    padding:24px 0;
+    align-items: center;
+    justify-content: space-between;
+    box-shadow:0px 1.4px 0px 0px rgba(0,0,0,0.08);
+    .menu-name{
+      font-size: 32px;
+      color: #333;
+    }
+    .right-icon{
+      width:20px;
+      height:20px;
+      border-top: 2px solid #999;
+      border-right: 2px solid #999;
+      transform:rotate(45deg);
+    }
+  }
+
+  
+  .left-icon{
+    width:46px;
+    height:42px;
+    margin-right:20px;
+  }
+}
+
 
 .info {
   position: relative;
-  height: 356px;
+  height: 346px;
   overflow: hidden;
   .qiandao-con {
     position: absolute;
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 22px 40px;
+    padding: 0 40px;
+    height: 88px;
     background:rgba(255,255,255,0.22);
     .qiandao-text{
       font-size: 28px;

src/pages/project/banner/index.js

 import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
 // import { cdn } from '@constants/api'
 import './index.scss'
-
+import emptyImg  from '@assets/empty.png'
 export default class SwiperBanner extends Component {
   static defaultProps = {
     list: [],
           circular
           autoplay
           indicatorDots={indicatorDots}
-          indicatorActiveColor='rgb(178, 42, 49)'
+          indicatorActiveColor='rgb(256,256,256)'
         >
           {list.map((item, index) => (
             <SwiperItem
                 mode="widthFix"
                 style={style}
                 className='home-banner__swiper-item-img'
-                src={item.image || item.url}
+                src={item.image || item.url ||item.img||emptyImg }
               />
             </SwiperItem>
           ))}

src/pages/project/detail/index.js

 import Taro, { Component } from '@tarojs/taro';
 
 import './index.scss'
-// import WxParse from '../wxParse/wxParse'
 import Banner from '../banner'
 import Poster from './poster'
 import ActivityItem from '../../activity/item'
   cancelFavorProject
 } from '@services/item'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
-import { queryNewsList } from '@services/news'
+import { queryNewsList, queryHelpGroup } from '@services/news'
 import { queryActivityList } from '@services/activity'
 import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn' // 按需加载
 import { dispatchProjectDetail } from '@actions/project'
 import getUserPhone from '@utils/getUserPhone'
 import { ROLE_CODE } from '@constants/user'
+const buildBg = require('@assets/buildbg.png')
 
 @connect(
   ({ user, project }) => ({ ...user, ...project }),
     posterData: {},
     newsList: [],
     activityList: [],
+    helpList: [],
+    groupList: [],
     statusOpts: ['待定', '在建', '在售'],
     circumOpts: [
       {
         this.loadDetail()
         this.loadNewsData()
         this.loadActivityData()
+        this.loadHelpGroupList()
 
         addItemUv(id)
         // 埋点
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+  loadHelpGroupList() {
+    const { buildingId } = this.state
+    queryHelpGroup({ buildingId: buildingId }).then(res => {
+      console.log(res, "buildingId")
+      const helpList = []
+      const groupList = []
+      res.map(item => {
+        if (item.type == 1) {
+          helpList.push(item)
+        } else {
+          groupList.push(item)
+        }
+      })
+      this.setState({
+        helpList,
+        groupList
+      })
+    }
+    )
+  }
 
   loadDetail() {
     const { buildingId, circumOpts } = this.state
 
   loadActivityData() {
     const { buildingId } = this.state
-    const payload = { pageSize: 2, pageNumber: 1, buildingId }
+    const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
       this.setState({
         activityList: res.list || []
     })
   }
 
-  handActivityItemClick(item) {
+  handActivityItemClick(id) {
     Taro.navigateTo({
-      url: '/pages/activity/detail/index?id=' + item.dynamicId + '&buildingId=' + item.buildingId
+      url: '/pages/activity/detail/index?id=' + id
     })
   }
 
               <View className="type-intro__list">
                 {
                   buildingProjectType.map(item => (
-                    <View className='type-intro__item' key={item.buildingId}>
-                      <Text className='type-status'>{statusOpts[status]}</Text>
-                      <Icon className="iconfont icon-jinrongxianxingge-" onClick={this.handleToolsClick}></Icon>
-
-                      <View className='row' style="margin-top:0">
-                        <Text className='row-label'>项目类型：</Text>
-                        <Text className='row-txt black'>{item.buildingTypeName}</Text>
-                      </View>
-                      <View className='row'>
-                        <Text className='row-label'>项目参考价格：</Text>
-                        {
-                          item.price ? <Text className='row-txt'>约{item.price}元/m²</Text> : <Text className='row-txt'>待定</Text>
-                        }
-                      </View>
-                      <View className='row'>
-                        <Text className='row-label'>产权：</Text>
-                        <Text className='row-txt'>{item.rightsYear}年</Text>
-                        <View className='row-right'>
-                          <Text className='row-label'>装修：</Text>
-                          <Text className='row-txt'>{item.decoration}</Text>
+                    <View className='type-intro__item' key={item.buildingId} style={`background: url(${buildBg}) no-repeat center;background-size: 100% 100%;`}>
+
+                      <View >
+                        <Text className='type-status'>{statusOpts[status]}</Text>
+                        {/* <Icon className="iconfont icon-jinrongxianxingge-" onClick={this.handleToolsClick}></Icon> */}
+                        <View className='row' style="margin-top:0">
+                          <Text className='row-label'>项目类型：</Text>
+                          <Text className='row-txt black'>{item.buildingTypeName}</Text>
+                        </View>
+                        <View className='row'>
+                          <Text className='row-label'>项目参考价格：</Text>
+                          {
+                            item.price ? <Text className='row-txt'>约{item.price}元/m²</Text> : <Text className='row-txt'>待定</Text>
+                          }
+                        </View>
+                        <View className='row'>
+                          <Text className='row-label'>产权：</Text>
+                          <Text className='row-txt'>{item.rightsYear}年</Text>
+                          <View className='row-right'>
+                            <Text className='row-label'>装修：</Text>
+                            <Text className='row-txt'>{item.decoration}</Text>
+                          </View>
                         </View>
                       </View>
-
-
                     </View>
                   ))
                 }
     )
   }
 
-  renderHouseTypeList() {
-    const { statusOpts } = this.state
-    const { projectDetail: { buildingApartment } } = this.props
-    const list = buildingApartment.filter(item => item.apartmentType === 'apart')
-    let imgUrls = list.reduce((prev, cur) => {
-      prev = prev.concat(cur.buildingImgList)
-      return prev
-    }, [])
-    imgUrls = imgUrls.map(item => item.url)
-    return (
-      <Block>
-        {
-          list.length > 0 && (
-            <View className='house-type'>
-              <View className='house-type__title'>户型介绍({list.length})</View>
-              <ScrollView scrollX>
-
-                <View className='house-type__list'>
-                  {list.map(item => (
-                    <View className='item' key={item.apartmentId}>
-                      {
-                        item && (
-                          <View className='house__img-info'>
-                            <Image className='house__img' src={item.buildingImgList[0].url} mode="widthFix" onClick={this.handlePreviewHxImage.bind(this, item.buildingImgList[0].url, imgUrls)}></Image>
-                            <View className='house-type__state'>{statusOpts[item.marketStatus - 1]}</View>
-                          </View>
-
 
-                        )
-                      }
-                      {/* <View className='house__img__len'>共{item.buildingImgList.length}张</View> */}
-
-                      <View className="rest-info">
-                        <View className='house-type__name'><Text style="color:#FA5431;margin-right:10px">{item.buildingArea}</Text>{item.apartmentName}</View>
-                        <View className='construction__area'>
-                          <Text>建面{item.buildingArea}m²</Text>
-                          
-                        {
-                          item.insideArea ? <Text className='sleeve__surface__txt'>套内{item.insideArea}m²</Text> : <Text className='sleeve__surface__txt'>套内待定</Text>
-                        }
-                        </View>
-                      </View>
-                    </View>
-                  ))}
-
-                </View>
-              </ScrollView>
-            </View>
-          )
-        }
-      </Block>
-    )
-  }
   renderPhotoAlbum() {
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'photo')
             {
               panel.content.map((text, index) => (
                 <View className="row" key={index}>
-                  {/* <Text className="dian">·</Text> */}
                   {text}</View>
               ))
             }
     )
   }
 
- 
+
   renderHelp() {
-    const { newsList } = this.state
+    const { helpList } = this.state
     return (
       <Block>
-        {
-          newsList.length > 0 && (
-            <View className="activity">
-              <View className="title">助力活动</View>
-              <Image src={require('@assets/shop/banner1.jpg')} className="activity-img"></Image>
+        {helpList.length > 0 &&
+          <View className="activity">
+            <View className="title">助力活动</View>
+            <View style={{ position: 'relative' }}>
+              <Banner
+                style={{ height: '130px' }}
+                indicatorDots={false}
+                list={helpList}
+                onClick={this.handleHelpClick}>
+              </Banner>
             </View>
-          )
+          </View>
         }
       </Block>
     )
   }
+
+  handleHelpClick(item) {
+    Taro.navigateTo({
+      url: '/pages/activity/detail/assistance?id=' + item.activityId
+    })
+  }
+  handleGroupClick(item) {
+    Taro.navigateTo({
+      url: '/pages/activity/detail/assemble?id=' + item.activityId
+    })
+  }
   renderGroup() {
-    const { newsList } = this.state
+    const { groupList } = this.state
     return (
       <Block>
-        {
-          newsList.length > 0 && (
-            <View className="activity">
-              <View className="title">拼团活动</View>
-              <Image src={require('@assets/shop/banner1.jpg')} className="activity-img"></Image>
+        {groupList.length > 0 &&
+          <View className="activity">
+            <View className="title">拼团活动</View>
+            <View
+              style={{ position: 'relative' }}>
+              <Banner
+                style={{ height: '130px' }}
+                indicatorDots={false}
+                list={groupList}
+                onClick={this.handleGroupClick}>
+              </Banner>
             </View>
-          )
+          </View>
         }
       </Block>
     )
   }
-  renderNews() {
-    const { newsList } = this.state
+
+  renderHouseTypeList() {
+    const { statusOpts } = this.state
+    const { projectDetail: { buildingApartment } } = this.props
+    const list = buildingApartment.filter(item => item.apartmentType === 'apart')
+    let imgUrls = list.reduce((prev, cur) => {
+      prev = prev.concat(cur.buildingImgList)
+      return prev
+    }, [])
+    imgUrls = imgUrls.map(item => item.url)
     return (
       <Block>
         {
-          newsList.length > 0 && (
-            <View className="section news">
-              <View className="section-head">
-                <Text className="section-head__title">新鲜资讯</Text>
-                <View className="section-head__more" onClick={this.handleNewsMoreClick}>
-                  更多资讯<Text className="iconfont icon-more"></Text>
-                </View>
-              </View>
-              <View className="section-content">
-                {
-                  newsList.map(item => (
-                    <View className="news-item" key={item.newsId} onClick={this.handNewsItemClick.bind(this, item.newsId)}>
-                      <Image src={item.newsImg} className="news-item__pic"></Image>
-                      <View className="news-item__title">{item.newsName}</View>
+          list.length > 0 && (
+            <View className='house-type'>
+              <View className='house-type__title'>户型介绍({list.length})</View>
+              <ScrollView scrollX>
+
+                <View className='house-type__list'>
+                  {list.map(item => (
+                    <View className='item' key={item.apartmentId}>
+                      {
+                        item && (
+                          <View className='house__img-info'>
+                            <Image className='house__img' src={item.buildingImgList[0].url} mode="widthFix" onClick={this.handlePreviewHxImage.bind(this, item.buildingImgList[0].url, imgUrls)}></Image>
+                            <View className='house-type__state'>{statusOpts[item.marketStatus - 1]}</View>
+                          </View>
+                        )
+                      }
+                      <View className="rest-info">
+                        <View className='house-type__name'><Text style="color:#FA5431;margin-right:10px">{item.buildingArea}</Text>{item.apartmentName}</View>
+                        <View className='construction__area'>
+                          <Text>建面{item.buildingArea}m²</Text>
+                          {
+                            item.insideArea ? <Text>套内{item.insideArea}m²</Text> : <Text>套内待定</Text>
+                          }
+                        </View>
+                      </View>
                     </View>
-                  ))
-                }
-              </View>
+                  ))}
+                </View>
+              </ScrollView>
             </View>
           )
         }
       </Block>
+
     )
   }
   renderActivities() {
       <Block>
         {
           activityList.length > 0 && (
-            <View className="section activity">
+            <View className="house-type">
               <View className="section-head">
                 <Text className="section-head__title">热门活动</Text>
                 <View className="section-head__more" onClick={this.handleActivityMoreClick}>
                   更多活动<Text className="iconfont icon-more"></Text>
                 </View>
               </View>
-              <View className="section-content" style="height:200px">
-                {
-                  activityList.map(item => (
-                    <View className="news-item" key={item.dynamicId} onClick={this.handActivityItemClick.bind(item)}>
-                      <Image src={item.imgUrl} className="news-item__pic"></Image>
-                      <View className="news-item__title">{item.title}</View>
-                    </View>
-                    // <ActivityItem
-                    //   data={item}
-                    //   style={{
-                    //     marginBottom: 0
-                    //   }}
-                    //   key={item.dynamicId}
-                    //   onClick={this.handActivityItemClick}>
-                    // </ActivityItem>
-                  ))
-                }
+              <ScrollView scrollX>
+                <View className="house-type__list" style="margin-top:10px">
+                  {
+                    activityList.map(item => (
+                      <View className="news-item" key={item.dynamicId} onClick={this.handActivityItemClick.bind(this, item.dynamicId)}>
+                        <Image src={item.imgUrl} className="news-item__pic"></Image>
+                        <View className="news-item__title">{item.title}</View>
+                      </View>
+                    ))
+                  }
+                </View>
+              </ScrollView>
+            </View>
+          )
+        }
+      </Block>
+    )
+  }
+  renderNews() {
+    const { newsList } = this.state
+    return (
+      <Block>
+        {
+          newsList.length > 0 && (
+            <View className="house-type">
+              <View className="section-head">
+                <Text className="section-head__title">新鲜资讯</Text>
+                <View className="section-head__more" onClick={this.handleNewsMoreClick}>
+                  更多资讯<Text className="iconfont icon-more"></Text>
+                </View>
               </View>
+              <ScrollView scrollX>
+                <View className="house-type__list" style="margin-top:10px">
+                  {
+                    newsList.map(item => (
+                      <View className="news-item" key={item.newsId} onClick={this.handNewsItemClick.bind(this, item.newsId)}>
+                        <Image src={item.newsImg} className="news-item__pic"></Image>
+                        <View className="news-item__title">{item.newsName}</View>
+                      </View>
+                    ))
+                  }
+                </View>
+              </ScrollView>
             </View>
           )
         }

src/pages/project/detail/index.scss

     margin-bottom: 70px;
     border-top-left-radius: 28px;
     border-top-right-radius: 28px;
-    // margin-top: -50px;
   }
 }
 .activity{
   background: white;
-  padding: 30px 0;
+  padding: 40px 0;
   margin-top: 20px;
   .title {
     font-size: 40px;
     margin: 10px 0 40px 35px;
     
   }
-  .activity-img{
-    width: 100%;
-    height: 260px;
-  }
 }
 .section {
   background: white;
     background:rgba(248,248,248,1);
     border-radius:12px;
     text-align: center;
-    font-weight: bold;
     color: $primary-color;
+    font-weight: 500;
     font-size: 34px;
     margin-top: 40px;
     line-height: 1.1;
     position: relative;
     width: 100%;
     background: #fff;
-    padding: 30px 40px 60px 40px;
+    padding: 30px 40px 40px 40px;
     border-top-left-radius: 28px;
     border-top-right-radius: 28px;
 
     }
 
     .type-intro {
-      margin: 30px 0;
       width: 100%;
 
       &__list {
         display: flex;
         padding: 30px 4px;
       }
+      
 
       &__item {
         padding: 20px 86px 20px 30px;
         margin-right: 30px;
         position: relative;
         font-size: 32px;
-
+        .build-bg{
+          position: absolute;
+          width: 100%;
+          height: 100%;
+          top:0;
+          left:0;
+          
+        }
         .row {
           margin-top: 20px;
           display: flex;
       background:rgba(248,248,248,1);
       border-radius:12px;
       text-align: center;
-      font-weight: bold;
+      font-weight: 500;
       color: $primary-color;
       font-size: 34px;
       margin-top: 40px;
     color: white;
     position: absolute;
     right: 5%;
-    bottom: 30%;
+    bottom: 30px;
   }
 }
 
   width: 100%;
   padding: 40px;
   background: #fff;
-  top: 30px;
-  margin-bottom: 60px;
+  margin: 20px 0;
 
   .house-type__title {
     width: 100%;

src/pages/project/index.js

 import Banner from './banner'
 import ActivityItem from '../activity/item'
 
+
 import ready from '@utils/ready'
 
 import { queryBanners, savePoint } from '@services/common'
-import { queryNewsList } from '@services/news'
+import { queryNewsList, queryHelpGroup } from '@services/news'
 import { queryActivityList } from '@services/activity'
 import { dispatchCitySelected } from '@actions/city'
 import { ROLE_CODE } from '@constants/user'
     maskBanner: '',
     shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1565358322510-share.jpg',
     bannerList: [],
+    helpGroupList: [],
     newsList: [],
     activityList: [],
     recordId: null,
 
   loadData() {
     this.loadBannerList()
+    this.loadHelpGroupList()
     this.loadNewsList()
     this.loadActivityList()
     this.loadList()
     this.setState({
       visBanner: false
     })
+
+
     queryBanners('banner', payload).then(res => {
       this.setState({
         visBanner: true,
     })
   }
 
+  loadHelpGroupList() {
+    queryHelpGroup().then(res => {
+      console.log(res, "res")
+      this.setState({
+
+        helpGroupList: res || []
+      })
+    }
+    )
+  }
+
+
   loadNewsList() {
     const { curCity } = this.props
     const payload = {
     })
   }
 
-
   //   转发
   onShareAppMessage = () => {
     const {
     })
   }
 
-  goPerson() {
-    Taro.navigateTo({
-      url: `/pages/person/index`
-    })
-  }
-
   handleBannerClick(item) {
     Taro.navigateTo({
       url: `/pages/project/detail/index?id=${item.buildingId}`
     })
   }
+  handleHelpGroupClick(item) {
+    if (item.type == 1) {
+      Taro.navigateTo({
+        url: '/pages/activity/detail/assistance?id=' + item.activityId
+      })
+    } else {
+      Taro.navigateTo({
+        url: '/pages/activity/detail/assemble?id=' + item.activityId
+      })
+    }
+  }
 
   handleMaskClose() {
     this.setState({
     Taro.navigateTo({
       url: '/pages/project/detail/index?id=' + data.buildingId
     })
-    // App.zhuge.track('点击首页banner')
   }
 
-  handleToolsClick() {
-    // App.zhuge.track('进入房贷计算器')
-    Taro.navigateTo({
-      url: `/pages/toolKit/index`
-    })
-  }
-
-  handleNewsMoreClick() {
-    Taro.navigateTo({
-      url: `/pages/news/index`
-    })
-  }
-
-  handNewsItemClick(id) {
-    Taro.navigateTo({
-      url: '/pages/news/detail/index?id=' + id
-    })
-  }
-
-  handleActivityItemClick(item) {
-    // App.zhuge.track('点击活动')
-    Taro.navigateTo({
-      url: `/pages/activity/detail/index?id=${item.dynamicId}&buildingId=${item.buildingId}`
-    })
-  }
-
-  handleActivityMoreClick(item) {
-    Taro.navigateTo({
-      url: `/pages/activity/index`
-    })
-  }
 
   handleLocationClick() {
     Taro.navigateTo({
       url: '/pages/project/list/index'
     })
   }
-  purchasingPolicy = () => {
-    Taro.navigateTo({
-      url: `/pages/policy/index`
-    })
-  }
+
   toRecomonedPage() {
     const {
       userInfo: { person: { personType } }
       url: `/pages/project/map/index`
     })
   }
-  renderActivities() {
-    const { activityList } = this.state
-    return (
-      <Block>
-        {/* {
-          activityList.length > 0 && (
-            <View className="section activity">
-              <View className="section-head">
-                <Text className="section-head__title">热门活动</Text>
-                <View className="section-head__more" onClick={this.handleActivityMoreClick}>
-                  更多活动<Text className="iconfont icon-more"></Text>
-                </View>
-              </View>
-              <View className="section-content">
-                {
-                  activityList.map(item => (
-                    <ActivityItem
-                      data={item}
-                      style={{
-                        marginBottom: 0
-                      }}
-                      key={item.dynamicId}
-                      onClick={this.handleActivityItemClick.bind(this, item)}>
-                    </ActivityItem>
-                  ))
-                }
-              </View>
-            </View>
-          )
-        } */}
-      </Block>
-    )
-  }
+
 
   renderProjectList() {
     const { proList: { records } } = this.props
+    const { helpGroupList } = this.state
     return (
       <Block>
         {
           records.length > 0 && (
-            < View className="section houses" >
+            < View className="houses" >
               <View className="section-head">
-              <View>
-                <Text className="section-head__title">全部楼盘
+                <View style="display:flex;align-items:center">
+                  <Text className="section-head__title" onClick={this.handleProItemClick}>全部楼盘
                 </Text>
-                <Image src={require('@assets/index/map.png')} onClick={this.toMapHouse} className='map-img'></Image>
+                  <Image src={require('@assets/index/map.png')} onClick={this.toMapHouse} className='map-img'></Image>
                   <Text className='map-txt' onClick={this.toMapHouse}>地图看房</Text>
                 </View>
                 <View className="section-head__more" onClick={this.handleProItemClick}>
             </View >
           )
         }
-        <Image className="advertisement" src={require('@assets/shop/banner1.jpg')}></Image>
+        {
+          helpGroupList.length > 0 &&
+          <View
+            style={{
+              position: 'relative', padding: '20px 20px 0 20px'
+            }}>
+
+            <Banner
+              style={{
+                borderRadius: '6px',
+                height: '88px'
+              }}
+              indicatorDots={false}
+              list={helpGroupList}
+              onClick={this.handleHelpGroupClick}>
+            </Banner>
+          </View>
+        }
+
         <View className="last-text">已经到底了~</View>
       </Block>
     )
     )
   }
 
-  renderNews() {
-    const { newsList } = this.state
-    return (
-      <Block>
-        {
-          newsList.length > 0 && (
-            <View className="section news">
-              <View className="section-head">
-                <Text className="section-head__title">新鲜资讯</Text>
-                <View className="section-head__more" onClick={this.handleNewsMoreClick}>
-                  更多资讯<Text className="iconfont icon-more"></Text>
-                </View>
-              </View>
-              <View className="section-content">
-                {
-                  newsList.map(item => (
-                    <View className="news-item" key={item.newsId} onClick={this.handNewsItemClick.bind(this, item.newsId)}>
-                      <Image src={item.newsImg} mode="aspectFill" className="news-item__pic"></Image>
-                      <View className="news-item__title">{item.newsName}</View>
-                    </View>
-                  ))
-                }
-              </View>
-            </View>
-          )
-        }
-      </Block>
-    )
-  }
 
   render() {
     const { curCity } = this.props
                     this.state.visBanner && (
                       <Banner
                         style={{
-                          borderRadius: '3px',
                           height: '250px'
                         }}
-                        indicatorDots={false}
+                        indicatorDots={true}
                         list={this.state.bannerList}
                         onClick={this.handleBannerClick}>
                       </Banner>
                     )
                   }
                 </View>
-                <View className="search" onClick={this.handleToHouseList}>
-                  <Text className="search-icon icon-sousuo iconfont"></Text>
-                  <Input className="search-input" placeholder="输入你想查询的楼盘"></Input>
-                </View>
-                <View className="location" onClick={this.handleLocationClick}>
-                  <Text className="location-icon iconfont icon-daohangdizhi"></Text>
-                  <Text className="location-text">{curCity.id ? curCity.name : '正在定位'}</Text>
+                <View className="top-box">
+                  <View className="search" onClick={this.handleToHouseList}>
+                    <Text className="search-icon icon-sousuo iconfont"></Text>
+                    <Input className="search-input" placeholder="输入你想查询的楼盘"></Input>
+                  </View>
+                  <View className="location" onClick={this.handleLocationClick}>
+                    <Text className="location-icon iconfont icon-daohangdizhi"></Text>
+                    <Text className="location-text">{curCity.id ? curCity.name : '正在定位'}</Text>
+                  </View>
                 </View>
+
                 {
                   (personType !== ROLE_CODE['CONSULTANT']) && (
                     <View className='section sectionn-customer' >
                     </View>
                   )
                 }
-                {/* 工具箱 */}
-                {/* <View className="tools">
-                  <View className="section-head">
-                    <Text className="section-head__title">橙蕉</Text>
-                    <View className="section-head__more">更多服务</View>
-                  </View>
-                  <View className='tools-main'>
-                    <View className='tools-item' onClick={this.handleProItemClick}>
-                      <Image src={require('@assets/loupan.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>楼盘展示</Text>
-                    </View> */}
-                {/* <View className='tools-item' onClick={this.purchasingPolicy}>
-                      <Image src={require('@assets/jianli.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>购房政策</Text>
-                    </View> */}
-                {/* <View className='tools-item' onClick={this.handleToolsClick}>
-                      <Image src={require('@assets/jisuanqi.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>房贷计算</Text>
-                    </View>
-                    <View className='tools-item' onClick={this.toMapHouse}>
-                      <Image src={require('@assets/didian.png')} className='tools-item-img'></Image>
-                      <Text className='tools-item-txt'>地图看房</Text>
-                    </View>
-                  </View>
-                </View> */}
 
 
-              </View>
-              {/* 资讯 */}
-              {/* {
-                newsList.length > 0 && (<View className='section sectionn-news' onClick={this.handleNewsMoreClick}>
-                  <Image src={require('@assets/zixun.png')} className='sectionn-news_img' mode="widthFix"></Image>
-                  <View className='sectionn-news-list'>
-                    <Swiper
-                      className='test-h'
-                      indicatorColor='#999'
-                      indicatorActiveColor='#333'
-                      vertical={vertical}
-                      circular
-                      indicatorDots={indicatorDots}
-                      autoplay>
-                      {
-                        newsList.map(item => (
-                          <SwiperItem key={item.newsId}>
-                            <Text className='sectionn-news_txt'>{item.newsName}</Text>
-                          </SwiperItem>
-                        ))
-                      }
-                    </Swiper>
-                  </View>
-                </View>)
-              } */}
-
-              {/* 推荐客户 */}
-
 
+              </View>
 
-              {/* 热门活动 */}
-              {this.renderActivities()}
-
-              {/* 新鲜资讯 */}
-              {/* {this.renderNews()} */}
 
               {/* 推荐楼盘 */}
               {this.renderProjectList()}

src/pages/project/index.scss

   justify-content: space-between;
   align-items: center;
 }
-
-.search {
-  width: 66%;
-  height: 60px;
-  background:rgba(161,161,161,0.2);
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
+.top-box{
+  display: flex;
+  width: 100%;
+  align-items: center;
+  justify-content: space-between;
   position: absolute;
-  left: 6%;
   top: 5%;
-  justify-content: flex-start;
-  border-radius: 6px;
-  @extend .flex;
-  justify-content: flex-start;
-
-  &-icon {
-    font-size: 24px;
-    color: rgb(209, 204, 204);
-    font-weight: bold;
-    margin: 0 10px 0 10px;
+  left: 0;
+  padding: 0 60px;
+  .location {
+    @extend .flex;
+    justify-content: center;
+    padding: 13px 14px;
+    background:rgba(161,161,161,0.2);
+    border-radius:12px;
+    
+  
+    &-text {
+      font-size: 25px;
+      padding-left: 13px;
+      color: rgba(255, 255, 255, 1);
+      @include text-ellipsis; 
+      width: 100px;
+    }
+  
+    &-icon {
+      color: rgb(209, 204, 204);
+      font-size: 16px;
+      font-weight: bold;
+      display: block;
+      margin-top: 10px;
+      animation: bigger 1s ease 3 both;
+    }
   }
+  
+  .search {
 
-  &-input {
-    font-size: 24px;
-    line-height: 60px;
-    color: #A2A2A2;
+    height: 60px;
+    background:rgba(161,161,161,0.2);
+    -webkit-box-pack: start;
+    -webkit-justify-content: flex-start;
+    -ms-flex-pack: start;
+    border-radius: 12px;
+    @extend .flex;
+    justify-content: flex-start;
+    width: 440px;
+  
+    &-icon {
+      font-size: 24px;
+      color: rgb(209, 204, 204);
+      font-weight: bold;
+      margin: 0 10px 0 10px;
+    }
+  
+    &-input {
+      font-size: 24px;
+      line-height: 60px;
+      color: #A2A2A2;
+    }
   }
 }
 
-.location {
-  @extend .flex;
-  justify-content: center;
-  position: absolute;
-  right: 6%;
-  top: 5%;
-  padding: 13px 14px;
-  background:rgba(161,161,161,0.2);
-  border-radius:6px;
-
-  &-text {
-    font-size: 25px;
-    padding-left: 13px;
-    color: rgba(255, 255, 255, 1);
-  }
 
-  &-icon {
-    color: rgb(209, 204, 204);
-    font-size: 16px;
-    font-weight: bold;
-    display: block;
-    margin-top: 10px;
-    animation: bigger 1s ease 3 both;
-  }
-}
+
 
 
 
     @extend .flex;
 
     &__title {
-      font-size: 32px;
+      font-size: 40px;
       font-weight: bold;
       // font-family: PingFangSC;
     }
     padding: 0px 20px;
 
     .section-content_img{
-      width: 240px;
+      width: 204px;
       height: 132px;
     }
     .logo_img{
 
 .houses {
   box-shadow:0px 2px 12px 2px rgba(29,29,29,0.09);
+  background: white;
+  padding: 30px 40px 20px 40px;
+  .section-content{
+    .item:last-of-type{
+      border:none;
+      padding-bottom: 20px;
+    }
+  }
   
   .map-img{
-    width: 22px;
-    height: 22px;
-    margin: 0 20px 0 36px;
+    width: 28px;
+    height: 28px;
+    margin: 0 8px 0 38px;
   }
   .map-txt{
     color: $primary-color;
-    font-size: 26px;
+    font-size: 28px;
   }
 }
 .advertisement{
   font-size: 28px;
   color: #dcdcdc;
   text-align: center;
-  line-height: 120px;
-  // box-shadow:0px -20px 8px -10px rgba(29,29,29,0.1) inset;
+  margin-bottom: 60px;
+  margin-top: 40px;
 }
 @keyframes moveY {
   0% {

src/pages/project/item/index.js

 
         <View className='item__bottom'>
           <View className='item__bottom__left'>
-            {/* <Text className='iconfont icon-fenxiang'></Text> */}
             <Image src={require('@assets/index/share.png')} className='share-img'></Image>
             <Text className='item__bottom__sharenum'>{shareList.total}次分享</Text>
           </View>

src/pages/project/item/index.scss

 
 .item {
   position: relative;
-  padding: 40px 0 40px;
+  padding: 30px 0;
   border-bottom: 1px solid $border-color-light;
 
 //&:last-child {
     .see__img {
       height: 56px;
       margin-left: 20px;
+      display: flex;
+      align-items: center;
 
       .userImg {
         width: 56px;

src/pages/project/list/index.scss

 }
 
 .list-view {
-  padding-top: 220px;
+  padding-top: 210px;
 }
 
 .list {
-  padding: 50px;
+  padding: 0 40px;
 }

src/pages/shop/index.js

 import ready from '@utils/ready'
 // import { ROLE_CODE } from '@constants/user'
 import { queryBanners } from '@services/common'
+import { getGoodsBuilding, getGoodsList } from '@services/item'
 import { connect } from '@tarojs/redux'
 import * as actions from '@actions/shop'
 // import { queryUserInfo, doUserSignin } from '@services/user'
       'https://estateagents.oss-cn-shanghai.aliyuncs.com/images/banner/5.jpg'
     ],
     user: {},
-    cityName: ''
+    cityName: '',
+    goodsBuilding: [],
+    goodsList: [],
   }
 
   componentDidShow() {
     Taro.showLoading()
     ready.queue(() => {
       this.loadBannerList()
-      this.loadList()
+      this.loadGoodsBuilding()
+
       //    this.loadCity()
       // this.loadUserInfo()
     })
     })
   }
 
-  onSearch(val) {
-    // App.zhuge.track('搜索商品', {
-    //   '商品名称': val
-    // })
-    this.setState({
-      keywords: val,
-    }, this.loadList)
-  }
+  // onSearch(val) {
+  //   // App.zhuge.track('搜索商品', {
+  //   //   '商品名称': val
+  //   // })
+  //   this.setState({
+  //     keywords: val,
+  //   }, this.loadList)
+  // }
 
   loadList() {
-    // const payload = { buildingId: '369b7d7e5bc6e6b91f2e8f5e775035e2' }
+
     Taro.showLoading()
-    this.props.dispatchGoodsList().then(res => {
+    const params = {
+      pageNum: '1',
+      pageSize: '9999',
+      buildingId: this.state.goodsBuilding[0].buildingId
+    }
+    console.log(params, "params")
+    getGoodsList(params).then(res => {
+      this.setState({
+        goodsList: res.records || []
+      })
       Taro.hideLoading()
     })
   }
+  loadGoodsBuilding() {
+    getGoodsBuilding().then(res => {
+
+      res.map(item => {
+        item.title = item.buildingName
+
+      })
+      this.setState({
+        goodsBuilding: res || []
+
+      }, () => {
+        this.loadList()
+      }
+      )
+    })
+  }
+
+  handleClick(value) {
+
+    const payload = {
+      pageNum: '1',
+      pageSize: '9999',
+      buildingId: this.state.goodsBuilding[value].buildingId
+    }
+    getGoodsList(payload).then(res => {
+      this.setState({
+        goodsList: res.records || []
+      })
+    })
+    this.setState({
+      current: value
+    })
+  }
 
   onViewDetail(item) {
     Taro.navigateTo({
     current: 0,
   }
 
-  handleClick(value) {
-    this.setState({
-      current: value
-    })
-  }
+
 
   renderGoods() {
     const { goods: { records = [] } } = this.props
+    const { goodsList, goodsBuilding, current } = this.state
 
     return (
 
+
+
       <View className="list__wrap">
-        <AtTabs  current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
-          <AtTabsPane  current={this.state.current} index={0} >
-            <View >
-
-              {
-                records.map(item => (
-                  <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
-                    <Image className="item__img" src={item.imgUrl} />
-                    {/* <View className='item__exchange'>立即兑换</View> */}
-                    <View className="item__title">{item.goodsName}</View>
-                    <View className="item__des">
-                      <View>
-                        剩余数量{item.inventory}
-                      </View>
-                      <View >
-                        <Text className="item__jifen">{item.pointPrice}</Text>积分
-                </View>
+        {
+
+          goodsBuilding && goodsBuilding.length < 2 &&
+          <View>
+            <View className="hot_title">热门商品</View>
+            {
+              goodsList.map(item => (
+                <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
+                  <Image className="item__img" src={item.imgUrl} />
+                  <View className="item__title">{item.goodsName}</View>
+                  <View className="item__des">
+                    <View>
+                      剩余数量{item.inventory}
                     </View>
-
-                    {/* <Image className="item__hot" mode="aspectFit" src={require('@assets/shop/hot.png')}></Image> */}
+                    <View >
+                      <Text className="item__jifen">{item.pointPrice}</Text>积分
+                </View>
                   </View>
-                ))
-              }
-
-            </View>
-          </AtTabsPane>
-          <AtTabsPane current={this.state.current} index={1}>
-            <View >
-              123
+                </View>
+              ))
+            }
           </View>
-          </AtTabsPane>
-        </AtTabs>
+        }
+        {
+          goodsBuilding && goodsBuilding.length > 2 &&
+          <AtTabs scroll tabDirection='horizontal' current={current} tabList={goodsBuilding} onClick={this.handleClick.bind(this)}>
+            <AtTabsPane current={current}  >
+              <View>
+                {
+                  goodsList.map(item => (
+                    <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
+                      <Image className="item__img" src={item.imgUrl} />
+                      <View className="item__title">{item.goodsName}</View>
+                      <View className="item__des">
+                        <View>
+                          剩余数量{item.inventory}
+                        </View>
+                        <View >
+                          <Text className="item__jifen">{item.pointPrice}</Text>积分
+                </View>
+                      </View>
+
+                    </View>
+                  ))
+                }
+
+              </View>
+            </AtTabsPane>
+          </AtTabs>
+        }
       </View>
 
 
           }}>
           <View className="user_box">
             <View className="user_con">
-            <Image className="bg" src={require('@assets/shop/background.jpg')} ></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>
                     <Image className="message__left__img" src={require('@assets/shop/liebiao.png')} />
                     <View className='message__left__word'>积分明细</View>
                   </View>
-                  
+
                 </View>
                 {/* <View className='message__right' onClick={this.handleLocationClick.bind(this)}>
                 <Image className="message__right__img" src={require('@assets/shop/address.png')} />
           </View>
 
 
-          {/* <View className="hot_title">热门商品</View> */}
+
           <Banner list={this.state.bannerList} indicatorDots={false}></Banner>
 
           {this.renderGoods()}

src/pages/shop/index.scss

     left:0;
     width: 100%;
     height: 100%;
+    border-radius: 12px;
 
   }
 
 .list__wrap {
   margin-top: 20px;
   overflow: hidden;
-  padding: 20px 30px;
+  padding: 20px;
   background-color: #fff;
   .at-tabs__item{
-    display: block;
     flex: none;
     font-size: 34px;
     font-weight: 600;
 
   .item {
     background: white;
-    width: 320px;
+    width: 335px;
     position: relative;
-    margin: 15px 0;
+    display: inline-block;
+    margin: 15px 10px;
     height: 440px;
     box-shadow:0px 6px 10px 0px rgba(0,0,0,0.12);
     border-radius:12px;

src/services/item.js

   API_ITEMS_SHARE,
   API_ITEMS_TYPE,
   API_PROJECT_FAVOR,
+  API_GOODS_BUILDING,
+  API_GOODS_LIST
 } from '@constants/api'
 
 /**
  * @param {*} payload 
  */
 export const getItemList = payload => fetch({ url: API_ITEMS_LIST, payload })
+/**
+ * 获取楼盘商品列表
+ * @param {*} payload 
+ */
+export const getGoodsBuilding = payload => fetch({ url: API_GOODS_BUILDING, payload })
+/**
+ * 获取楼盘商品列表
+ * @param {*} payload 
+ */
+export const getGoodsList = payload => fetch({ url: API_GOODS_LIST, payload })
+/**
+ * 商品列表
+ * @param {*} payload
+ */
+
 
 /**
  * 获取项目详情

src/services/news.js

   API_NEWS_LIST,
   API_NEWS_FAVOR,
   API_NEWS_UV,
-  API_NEWS_SHARE
+  API_NEWS_SHARE,
+  API_ACTIVITY_GROUP
 } from '@constants/api'
 
 /**
  */
 export const queryNewsDetail = id => fetch({ url: `${API_NEWS_LIST}/${id}` })
 
+/**
+ * 首页获取助力拼团 
+ * @param {*} payload 
+ */
+export const queryHelpGroup = payload => fetch({ url: API_ACTIVITY_GROUP, payload })
+
 
 /**
  *资讯收藏