pingtuanstyle

src/pages/activity/assembleItem/index.js

@@ -18,62 +18,65 @@ export default class Item extends Component {
 
     leftTime: 0,  // 剩余时间
   }
-  componentWillMount() {
-    this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
-  }
+  // componentWillMount() {
+  //   this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
+  // }
 
-  updateLeftTime(startDate, endDate) {
-    const st = dayjs(startDate).valueOf()
-    const ed = dayjs(endDate).valueOf()
+  // updateLeftTime(startDate, endDate) {
+  //   const st = dayjs(startDate).valueOf()
+  //   const ed = dayjs(endDate).valueOf()
 
-    this.setState({
-      ltTicker: setInterval(() => {
-        const nw = dayjs().valueOf()
+  //   this.setState({
+  //     ltTicker: setInterval(() => {
+  //       const nw = dayjs().valueOf()
 
-        if (st > nw) {
-          // 活动未开始
-          this.setState({
-            leftTime: st - nw,
-            actState: 0,
-          })
-        } else if (ed > nw) {
-          // 活动未结束
-          this.setState({
-            leftTime: ed - nw,
-            actState: 1,
-          })
-        } else {
-          // 活动已结束
-          this.clearTicker()
-          this.setState({
-            leftTime: 0,
-            actState: 2,
-          })
-        }
-      }, 1000)
-    })
-  }
-  formateLeftTime() {
-    const nd = 1000 * 24 * 60 * 60;
-    const nh = 1000 * 60 * 60;
-    const nm = 1000 * 60;
-    const ns = 1000;
+  //       if (st > nw) {
+  //         // 活动未开始
+  //         this.setState({
+  //           leftTime: st - nw,
+  //           actState: 0,
+  //         })
+  //       } else if (ed > nw) {
+  //         // 活动未结束
+  //         this.setState({
+  //           leftTime: ed - nw,
+  //           actState: 1,
+  //         })
+  //       } else {
+  //         // 活动已结束
+  //         this.clearTicker()
+  //         this.setState({
+  //           leftTime: 0,
+  //           actState: 2,
+  //         })
+  //       }
+  //     }, 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);
+  //   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}秒`
-  }
+  //   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.mainImg} ></Image>
         <View className="title">{data.activityName}</View>
-        {!data.verificationCode &&
-          <View className="time">{this.state.actState === 1 ? '距活动结束:' : '活动已结束'}<Text className="count-time">{this.state.actState != 2 ? this.formateLeftTime() : ''}</Text></View>
+        {(!data.verificationCode && data.status == 1) &&
+          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD hh:mm:ss')}`}</Text></View>
+        }
+        {(!data.verificationCode && data.status != 1) &&
+          <View className="time"><Text className="count-time">活动已结束</Text></View>
         }
         {data.verificationCode &&
           <Block>

src/pages/activity/assistanceItem/index.js

@@ -17,62 +17,65 @@ export default class Item extends Component {
 
     leftTime: 0,  // 剩余时间
   }
-  componentWillMount() {
-    this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
-  }
+  // componentWillMount() {
+  //   this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
+  // }
 
-  updateLeftTime(startDate, endDate) {
-    const st = dayjs(startDate).valueOf()
-    const ed = dayjs(endDate).valueOf()
+  // updateLeftTime(startDate, endDate) {
+  //   const st = dayjs(startDate).valueOf()
+  //   const ed = dayjs(endDate).valueOf()
 
-    this.setState({
-      ltTicker: setInterval(() => {
-        const nw = dayjs().valueOf()
+  //   this.setState({
+  //     ltTicker: setInterval(() => {
+  //       const nw = dayjs().valueOf()
 
-        if (st > nw) {
-          // 活动未开始
-          this.setState({
-            leftTime: st - nw,
-            actState: 0,
-          })
-        } else if (ed > nw) {
-          // 活动未结束
-          this.setState({
-            leftTime: ed - nw,
-            actState: 1,
-          })
-        } else {
-          // 活动已结束
-          this.clearTicker()
-          this.setState({
-            leftTime: 0,
-            actState: 2,
-          })
-        }
-      }, 1000)
-    })
-  }
-  formateLeftTime() {
-    const nd = 1000 * 24 * 60 * 60;
-    const nh = 1000 * 60 * 60;
-    const nm = 1000 * 60;
-    const ns = 1000;
+  //       if (st > nw) {
+  //         // 活动未开始
+  //         this.setState({
+  //           leftTime: st - nw,
+  //           actState: 0,
+  //         })
+  //       } else if (ed > nw) {
+  //         // 活动未结束
+  //         this.setState({
+  //           leftTime: ed - nw,
+  //           actState: 1,
+  //         })
+  //       } else {
+  //         // 活动已结束
+  //         this.clearTicker()
+  //         this.setState({
+  //           leftTime: 0,
+  //           actState: 2,
+  //         })
+  //       }
+  //     }, 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);
+  //   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}秒`
-  }
+  //   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}</View>
-        {!data.verification &&
-          <View className="time">{this.state.actState === 1 ? '距活动结束:' : '活动已结束'}<Text className="count-time">{this.state.actState != 2 ? this.formateLeftTime() : ''}</Text></View>
+        {(!data.verification &&data.status == 1 )&&
+          <View className="time">参与截止时间: <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD hh:mm:ss')}`}</Text></View>
+        }
+        {(!data.verification &&data.status != 1)&&
+          <View className="time"><Text className="count-time">活动已结束</Text></View>
         }
         {data.verification &&
           <Block>

src/pages/activity/detail/assemble.js

@@ -303,7 +303,7 @@ export default class Detail extends Component {
       }).catch(err => {
         console.log('err:', err)
         Taro.hideLoading()
-        
+
         Taro.showToast({
           title: '失败: ' + err.message,
           icon: 'none'
@@ -432,14 +432,6 @@ export default class Detail extends Component {
               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.mainImg} className="detail-banner__img"></Image>
-<<<<<<< HEAD
-                
-                <View className="rest-time">
-                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
-                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
-                </View>
-
-=======
                 {
                   groupState === GroupInProcess && actState != ActFinished &&
                   (
@@ -450,17 +442,19 @@ export default class Detail extends Component {
                   )
                 }
                 {detail.successNum > 0 &&
-                  <View className="success-num">已成功 {detail.successNum}</View>
+                  <View className="success-num">
+                    <View className="triangle"></View>
+                    <View className="text">已成功 {detail.successNum}</View>
+                  </View>
 
                 }
->>>>>>> 4fa08fccaf3ed20ed1dcc549346b4b829f473145
               </View>
               <ScrollView
                 scrollY
                 className="detail-wrap">
                 <View className="detail">
                   <View class="detail-title">{detail.activityName}</View>
-                  <View className="detail-info">
+                  <View className="detail-info" >
                     <View style="margin-right:30px">所需<Text style="color:#FF245A">{detail.integral}</Text>积分</View>
                     <Image style="width:20px;height:20px;margin-right:2px" src={memberImg} ></Image>
                     <Text >{detail.groupBuyPeople}人团</Text>
@@ -469,7 +463,7 @@ export default class Detail extends Component {
                     groupState === GroupSuccess &&
                     (
                       <Block>
-                        <Image className="status__img"style="margin:40rpx auto 24rpx auto" src={successImg}></Image>
+                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={successImg}></Image>
                         <View className="hexiaoma" style="margin:0 auto 40rpx auto">核销码: {verificationCode}</View>
                       </Block>
                     )
@@ -479,16 +473,16 @@ export default class Detail extends Component {
                     groupState === GroupFailure &&
                     (
                       <View>
-                        <Image className="status__img" style="margin:40rpx auto 24rpx auto" src={failImg}></Image>
+                        <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={failImg}></Image>
                         <View className="fail-text" style="margin:0 auto 40rpx auto">活动已超时,拼团失败!</View>
                       </View>
                     )
                   }
 
-                  {isStarter&&
-                    <View className="detail-title">我的拼团</View>
+                  {isStarter &&
+                    <View className="detail-title" >我的拼团</View>
                   }
-                  
+
                   <View className='tools-main'>
                     {
                       recordDetail.recordId &&
@@ -523,9 +517,9 @@ export default class Detail extends Component {
                   </View>
                 </View>
 
-                <View className="assistance-text"><Text style="color:#dcdcdc">————————</Text><Text className="acitivty-desc">活动说明</Text><Text style="color:#dcdcdc">————————</Text></View>
+                <View className="assistance-text"><Text style="color:#dcdcdc">------------------- </Text><Text className="acitivty-desc">活动说明</Text><Text style="color:#dcdcdc">-------------------</Text></View>
                 <View style="padding:0 40rpx">
-                <Image src={detail.descImg} style="width:100%"></Image>
+                  <Image src={detail.descImg} style="width:100%"></Image>
                 </View>
 
                 {

src/pages/activity/detail/assistance.js

@@ -304,7 +304,7 @@ export default class Detail extends Component {
       }).catch(err => {
         console.log('err:', err)
         Taro.hideLoading()
-        
+
         Taro.showToast({
           title: '失败: ' + err.message,
           icon: 'none'
@@ -430,14 +430,6 @@ export default class Detail extends Component {
               <Notice></Notice>
               <View className="detail-banner">
                 <Image mode="widthFix" src={detail.img} className="detail-banner__img"></Image>
-<<<<<<< HEAD
-                
-                <View className="rest-time">
-                  <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
-                  <Text className="row-content">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
-                </View>
-
-=======
                 {
                   helpState === HelpInProcess && actState != ActFinished &&
                   (
@@ -447,11 +439,14 @@ export default class Detail extends Component {
                     </View>
                   )
                 }
-                {detail.successNum>0 &&
-                  <View className="success-num">已成功 {detail.successNum}</View>
+                {detail.successNum > 0 &&
+
+                  <View className="success-num">
+                    <View className="triangle"></View>
+                    <View className="text">已成功 {detail.successNum}</View>
+                  </View>
 
                 }
->>>>>>> 4fa08fccaf3ed20ed1dcc549346b4b829f473145
               </View>
               <ScrollView
                 scrollY
@@ -530,11 +525,11 @@ export default class Detail extends Component {
                     )
                   }
                 </View>
-                <View className="assistance-text"><Text style="color:#dcdcdc">————————</Text><Text className="acitivty-desc">活动说明</Text><Text style="color:#dcdcdc">————————</Text></View>
+                <View className="assistance-text"><Text style="color:#dcdcdc">------------------- </Text><Text className="acitivty-desc">活动说明</Text><Text style="color:#dcdcdc">-------------------</Text></View>
                 <View style="padding:0 40rpx">
-                <Image src={detail.activityInstructions} style="width:100%;margin-bottom:20px"></Image>
+                  <Image src={detail.activityInstructions} style="width:100%;margin-bottom:20px"></Image>
                 </View>
-               
+
               </ScrollView>
 
               <action-sheet hidden={!actionSheetVisible} bindchange={this.toggleActionVisible}>

src/pages/activity/detail/index.scss

@@ -35,7 +35,7 @@
     bottom:0;
     left:0;
     background-color: #DFDFDF;
-    padding: 10px 40px;
+    padding: 10px 36px;
     font-size: 30px;
     border-radius: 0 12px 0 0 ;
     .row-label{
@@ -51,16 +51,32 @@
     right:0;
     bottom:0;
     color: #fff;
+    display: flex;
+    height: 48px;
+    line-height: 48px;
+
+    .triangle{
+      width: 0px;
+      height: 0px;
+      border: 50px solid;
+      border-top-color: transparent;
+      border-left-color:transparent;
+      border-right: none;  
+      border-bottom-color: rgba(47,6,1,0.5) ;
+      margin-top: -48px;
+    }
+    .text{
     background:rgba(47,6,1,0.5);
-    padding: 8px 22px 8px 42px;
-    border-radius: 100px 0 0 0;
+    padding:0 18px 0 6px;
     font-size: 24px;
+    }
   }
 }
 .detail-info{
   display: flex;
   align-items: center;
   color: $primary-color;
+  margin-bottom: 28px;
 }
 .detail-wrap {
   background: transparent;

src/pages/activity/item/index.js

@@ -24,11 +24,14 @@ export default class Item extends Component {
           }
           {(data.type == 'help' || data.type == 'group') &&
             <View className={data.type == 'help' ? 'type' : 'type2'}>{data.type == 'help' ? '助力' : '拼团'}</View>
-            
+
           }
           {(data.type == 'help' || data.type == 'group') &&
-            <View className="success-num">已成功 {data.successNum}</View>
-            
+            <View className="success-num">
+              <View className="triangle"></View>
+              <View className="text">已成功 {data.successNum}</View>
+            </View>
+
           }
 
           {/* <View className="time">活动开始时间：{`${dayjs(data.startDate).format('YYYY-MM-DD HH:mm:ss')}`}</View> */}

src/pages/activity/item/index.scss

@@ -41,10 +41,25 @@
     right:0;
     top:282px;
     color: #fff;
+    display: flex;
+    height: 48px;
+    line-height: 48px;
+
+    .triangle{
+      width: 0px;
+      height: 0px;
+      border: 48px solid;
+      border-top-color: transparent;
+      border-left-color:transparent;
+      border-right: none;  
+      border-bottom-color: rgba(47,6,1,0.5) ;
+      margin-top: -48px;
+    }
+    .text{
     background:rgba(47,6,1,0.5);
-    padding: 8px 24px 8px 46px;
-    border-radius: 100px 0 0 0;
+    padding:0 20px 0 12px;
     font-size: 24px;
+    }
   }
   .hot-tip{
     position: absolute;

src/pages/person/index.js

@@ -81,7 +81,6 @@ export default class Person extends Component {
       Taro.showToast({ title: '暂无客户', icon: 'none' })
       return
     }
-    // App.zhuge.track('推荐客户')
 
     Taro.navigateTo({
       url: '/pages/person/myGuest/index'
@@ -93,6 +92,11 @@ export default class Person extends Component {
       url: '/pages/person/favorite/index'
     })
   }
+  toAgentClient() {
+    Taro.navigateTo({
+      url: '/pages/agent/client/index'
+    })
+  }
   toAssemble() {
     Taro.navigateTo({
       url: '/pages/activity/assemblePage'
@@ -108,6 +112,36 @@ export default class Person extends Component {
       url: '/pages/person/profile/index'
     })
   }
+  toAgent() {
+    Taro.navigateTo({
+      url: '/pages/agent/index'
+    })
+  }
+  toAgentInvitation() {
+    Taro.navigateTo({
+      url: '/pages/agent/invitation/index'
+    })
+  }
+  toActivity() {
+    Taro.navigateTo({
+      url: '/pages/activity/index?from=mine'
+    })
+  }
+  toRecord() {
+    Taro.navigateTo({
+      url: '/pages/shop/record/index'
+    })
+  }
+  toToolkit() {
+    Taro.navigateTo({
+      url: '/pages/toolKit/index'
+    })
+  }
+  toFeedback() {
+    Taro.navigateTo({
+      url: '/pages/person/feedback/index'
+    })
+  }
 
   getRoleName(type) {
     switch (type) {
@@ -124,7 +158,6 @@ export default class Person extends Component {
         return '渠道经纪人'
         break;
       default:
-
         return '普通用户'
         break;
     }
@@ -176,7 +209,7 @@ export default class Person extends Component {
                 <View className="info-text__name">{user.name ? user.name : user.nickname} {/* <Text className="iconfont icon-more"></Text> */}</View>
                 <View className="info-text__intro">积分 {user.points || 0}</View>
               </View>
-              <Navigator url={`/pages/person/spread/index`}  className="tuiguang">
+              <Navigator url={`/pages/person/spread/index`} className="tuiguang">
                 <Image style="width:40px;height:36px" src={require('@assets/mine/tuiguangma.png')} ></Image>
                 <View className="info-text__intro" style="margin:4px 0 0 4px">推广码</View>
               </Navigator>
@@ -196,18 +229,32 @@ export default class Person extends Component {
           </View>
         </View>
         <View>
-          {/* <View></View> */}
-          <View 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 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>
             <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
           </View>
-          <View 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 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/homepage.png')} ></Image>
-              <Text >我的收藏</Text>
+              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/recommend.png')} ></Image>
+              <Text >推荐客户</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>
+            <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>
             <Text style=" width:10px;height:10px;border-top: 1px solid #999;border-right: 1px solid #999;transform:rotate(45deg);"></Text>
           </View>
@@ -218,6 +265,28 @@ export default class Person extends Component {
             </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>
+            <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>
+            <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>
+            <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>
@@ -225,25 +294,43 @@ export default class Person extends Component {
             </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 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/help.png')} ></Image>
-              <Text >我的助力</Text>
+              <Image style="width:22px;height:22px;margin-right:10px" src={require('@assets/mine/calculator.png')} ></Image>
+              <Text >房贷计算器</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>
+            <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>
             <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>
         {/* <View className="list-item">
           <Image src={require('@assets/person/shouye.png')} className="icon" ></Image>
           <Text className='menu-item_txt'>我的主页</Text>
         </View> */}
         {/* <View className="menu menu1"> */}
-        {/* 经纪人我的主页 */}
+        {/* 经纪人的主页 */}
         {/* {(user.personType == ROLE_CODE['ESTATE_AGENT'] || user.personType == ROLE_CODE['CHANNEL_AGENT']) && (<Navigator className="menu-item" hover-class="none" url={`/pages/agent/index`}>
             <Image src={require('@assets/person/shouye.png')} className='menu-item_img' mode="widthFix"></Image>
             <Text className='menu-item_txt'>我的主页</Text>
           </Navigator>)} */}
+        {/* 置业顾问主页 */}
+        {/* {user.personType == 'Realty Consultant' && (<Navigator className="menu-item" hover-class="none" url={`/pages/card/index?id=${user.id}`}>
+            <Image src={require('@assets/person/shouye.png')} className='menu-item_img' mode="widthFix"></Image>
+            <Text className='menu-item_txt'>我的主页</Text>
+          </Navigator>)} */}
 
         {/* 经纪人推荐客户 */}
         {/* {(user.personType == ROLE_CODE['ESTATE_AGENT'] || user.personType == ROLE_CODE['CHANNEL_AGENT']) && (<Navigator className="menu-item" hover-class="none" url={`/pages/agent/client/index`}>
@@ -251,11 +338,7 @@ export default class Person extends Component {
             <Text className='menu-item_txt'>推荐客户</Text>
           </Navigator>)} */}
 
-        {/* 置业顾问主页 */}
-        {/* {user.personType == 'Realty Consultant' && (<Navigator className="menu-item" hover-class="none" url={`/pages/card/index?id=${user.id}`}>
-            <Image src={require('@assets/person/shouye.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>我的主页</Text>
-          </Navigator>)} */}
+
 
         {/* 游客主页 */}
         {/* {(user.personType == ROLE_CODE['CUSTOMER'] || !user.personType) && (<Navigator className="menu-item" hover-class="none" url={`/pages/agent/become/index`}>
@@ -289,14 +372,7 @@ export default class Person extends Component {
             <Image src={require('@assets/person/shou.png')} className='menu-item_img' mode="widthFix"></Image>
             <Text className='menu-item_txt'>我的收藏</Text>
           </View>
-          <View className='menu-item' onClick={this.toAssemble}>
-            <Image src={require('@assets/person/shou.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>我的拼团</Text>
-          </View>
-          <View className='menu-item' onClick={this.toAssistance}>
-            <Image src={require('@assets/person/shou.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>我的助力</Text>
-          </View> */}
+        */}
 
         {/* 经纪人我的邀请 */}
         {/* {(user.personType == ROLE_CODE['ESTATE_AGENT'] || user.personType == ROLE_CODE['CHANNEL_AGENT']) && (<Navigator className="menu-item" hover-class="none" url={`/pages/agent/invitation/index`}>