zls

config/dev.js

@@ -3,7 +3,7 @@ module.exports = {
     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"',

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "dev环境",
-	"appid": "wxda1f84b79b3edeb3",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/pages/activity/activity.js

@@ -21,6 +21,27 @@ export default class active extends Component {
 
   state = {
     current: 0,
+    recordId: undefined, // 埋点ID
+  }
+  
+  componentWillMount() {
+    // App.zhuge.track('查看活动列表页面')
+    savePoint({
+      event: 'list',
+      eventType: 'activity',
+      propertyName: '活动列表',
+      data: '{}'
+    }).then(res => {
+      this.setState({
+        recordId: res.recordId
+      })
+      console.log('活动列表')
+    })
+  }
+
+  componentWillUnmount() {
+    const { recordId } = this.state
+    recordId && updatePoint(recordId)
   }
 
   handleClick(value) {

src/pages/activity/detail/assemble.js

@@ -63,6 +63,7 @@ export default class Detail extends Component {
     posterVisible: false, // 海报分享
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
+    pointRecordId: undefined, // 埋点ID
   }
 
   componentWillMount() {
@@ -76,6 +77,7 @@ export default class Detail extends Component {
 
   componentWillUnmount() {
     this.clearTicker()
+    this.state.pointRecordId && updatePoint(pointRecordId)
   }
 
   // 初始化页面数据
@@ -218,7 +220,9 @@ export default class Detail extends Component {
         buildingId: res.taShareActivity.buildingId,
         targetId: id,
         data: '{"recordId":"' + recordId + '"}'
-      }).then(() => { })
+      }).then((res) => {
+        this.setState({ pointRecordId: res.recordId })
+      })
     })
   }
 
@@ -334,11 +338,11 @@ export default class Detail extends Component {
           avatarurl: person.avatarurl,
         }).then(res => {
           this.setState({
-            recordDetail: res,
-            recordId: res.recordId,
-            memberList: [],
+            recordDetail: res.taShareRecord,
+            recordId: res.taShareRecord.recordId,
+            memberList: res.shareChildRecordList || [],
             isStarter: true,
-            groupState: GroupInProcess,
+            groupState: res.taShareRecord.status === undefined ? GroupInProcess : res.taShareRecord.status,
           }, resolve)
         }).catch(err => {
           console.log('err:', err)

src/pages/activity/detail/assistance.js

@@ -62,6 +62,7 @@ export default class Detail extends Component {
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
     handleHelpBtn: true, // 立即助力好友
+    pointRecordId: undefined, // 埋点ID
   }
 
   componentWillMount() {
@@ -75,6 +76,7 @@ export default class Detail extends Component {
 
   componentWillUnmount() {
     this.clearTicker()
+    this.state.pointRecordId && updatePoint(pointRecordId)
   }
 
   // 初始化页面数据
@@ -220,7 +222,9 @@ export default class Detail extends Component {
         buildingId: res.helpActivity.buildingId,
         targetId: id,
         data: '{"initiateId":"' + initiateId + '"}'
-      }).then(() => { })
+      }).then((res) => {
+        this.setState({ pointRecordId: res.recordId })
+      })
     })
   }
 
@@ -337,12 +341,11 @@ export default class Detail extends Component {
           avatarurl: person.avatarurl,
         }).then(res => {
           this.setState({
-            initiateDetail: res,
-            initiateId: res.helpRecordInitiateId,
-            // helpList: res.helpRecordList,  // bug #5282
-            helpList: [],
+            initiateDetail: res.helpInitiateRecord,
+            initiateId: res.helpInitiateRecord.helpRecordInitiateId,
+            helpList: res.helpRecordList,
             isStarter: true,
-            helpState: HelpInProcess,
+            helpState: res.helpInitiateRecord.status === undefined ? HelpInProcess : res.helpInitiateRecord.status,
           }, resolve)
         }).catch(err => {
           console.log('err:', err)

src/pages/activity/detail/index.js

@@ -317,37 +317,38 @@ export default class Detail extends Component {
               <ScrollView
                 scrollY
                 className="detail-wrap">
-              <View className="detail">
-                {detail.isEnlist == 0 &&
-                  <View className="detail-sign__num">不需要报名</View>
-                }
-                {detail.isEnlist != 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">
-                    <Text className="row-label">活动时间：</Text>
-                    <Text className="row-content">{dayjs(detail.startDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
-                  </View>
-                  <View className="detail-top__row">
-                    <Text className="row-label">活动地址：</Text>
-                    <Text className="row-content">{detail.address}</Text>
-                  </View>
-                  <View className="detail-top__row">
-                    <Text className="row-label">报名截止：</Text>
-                    {detail.enlistEnd &&
-                      <Text className="row-content">{dayjs(detail.enlistEnd).format('YYYY-MM-DD HH:mm:ss')}</Text>
+                <View className="detail">
+                  {detail.isEnlist == 0 &&
+                    <View className="detail-sign__num">不需要报名</View>
+                  }
+                  {detail.isEnlist != 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">
+                      <Text className="row-label">活动时间：</Text>
+                      <Text className="row-content">{dayjs(detail.startDate).format('YYYY-MM-DD HH:mm:ss')}</Text>
+                    </View>
+                    <View className="detail-top__row">
+                      <Text className="row-label">活动地址：</Text>
+                      <Text className="row-content">{detail.address}</Text>
+                    </View>
+                    {detail.isEnlist != 0 &&
+                      <View className="detail-top__row">
+                        <Text className="row-label">报名截止：</Text>
+                        {detail.enlistEnd &&
+                          <Text className="row-content">{dayjs(detail.enlistEnd).format('YYYY-MM-DD HH:mm:ss')}</Text>
+                        }
+                      </View>
                     }
-
+                  </View>
+                  <View className="detail-con">
+                    <View className="detail-con__title">活动详情</View>
+                    <import src='../../../components/wxParse/wxParse.wxml' />
+                    <template is='wxParse' data='{{wxParseData:article.nodes}}' />
                   </View>
                 </View>
-                <View className="detail-con">
-                  <View className="detail-con__title">活动详情</View>
-                  <import src='../../../components/wxParse/wxParse.wxml' />
-                  <template is='wxParse' data='{{wxParseData:article.nodes}}' />
-                </View>
-              </View>
               </ScrollView>
 
               <View className="chat-entrance" onClick={this.handleMoreClick}>

src/pages/activity/index.js

@@ -44,7 +44,7 @@ export default class Index extends Component {
   
   componentWillUnmount() {
     const { recordId } = this.state
-    updatePoint(recordId)
+    recordId && updatePoint(recordId)
   }
 
   loadList(pageNumber) {

src/pages/activity/item/index.js

@@ -40,8 +40,8 @@ export default class Item extends Component {
             {data.endDate &&
               <View className="time">参与截止时间：{`${dayjs(data.endDate).format('YYYY年MM月DD日 HH:mm:ss')}`}</View>
             }
-            {!data.endDate &&
-              <View className="time">参与截止时间：</View>
+            {!data.endDate  &&
+              <View className="time">{data.type != 'dynamic'?'参与截止时间：':''}</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>

src/pages/agent/client/index.scss

@@ -124,6 +124,9 @@
 
 .phone{
   line-height:50px;
+  width: 480px;
+  @include text-ellipsis; 
+
 }
 
 .time{

src/pages/card/index.js

@@ -470,9 +470,9 @@ export default class Index extends Component {
 
                 {/* 职位 */}
                 <View className='mycard__work'>
-                  <View className='row mycard__work-department'>{cardInfo.department}<Text className='txt'>部门</Text></View>
-                  <View className='row mycard__work-position'>{cardInfo.post}<Text className='txt'>职位</Text></View>
-                  <View className='row mycard__work-company'>{projectDetail.buildingName}<Text className='txt'>楼盘</Text></View>
+                  <View className='row mycard__work-department'>{cardInfo.department || ''}<Text className='txt'>部门</Text></View>
+                  <View className='row mycard__work-position'>{cardInfo.post || ''}<Text className='txt'>职位</Text></View>
+                  <View className='row mycard__work-company'>{projectDetail.buildingName || ''}<Text className='txt'>楼盘</Text></View>
                 </View>
 
                 {/* 人气 */}

src/pages/checkin/index.js

@@ -71,9 +71,7 @@ export default class checkin extends Component {
   }
 
   render () {
-    const { data, style } = this.props
-
-
+    const { data = { person: {}, dynamic: {} }, style } = this.props
 
     return (
       <View className="checkin" style="width:100vw;height:100vh;" >
@@ -81,13 +79,13 @@ export default class checkin extends Component {
         {/* <checkinsuccess></checkinsuccess> */}
         {/* <achievePhone></achievePhone> */}
         <View>
-          <Image className="img" src={this.state.data.dynamic.imgUrl}  ></Image>
+          <Image className="img" src={data.dynamic.imgUrl}  ></Image>
         </View>
         <View style="margin-bottom:20px"  >
-          <View className="text1"> <Text>{this.state.data.dynamic.title}</Text></View>
+          <View className="text1"> <Text>{data.dynamic.title}</Text></View>
         </View >
 
-        {this.state.data.enlist != null && <View>
+        {data.enlist != null && <View>
           <View style="text-align: center;">
             <Text className="line">- - - - - - - - - </Text>
             <Text className="text2">活动报名信息</Text>
@@ -97,24 +95,22 @@ export default class checkin extends Component {
           <View className="text3">
             <View className='at-row'>
               <View className='at-col at-col-3'>用户名：</View>
-              <View className='at-col at-col-9'>{this.state.data.person.name || this.state.data.person.nickname}</View>
+              <View className='at-col at-col-9'>{data.person.name || data.person.nickname}</View>
             </View>
             <View className='at-row'>
               <View className='at-col at-col-3'>手机号：</View>
-              <View className='at-col at-col-9'>{this.state.data.person.tel || this.state.data.person.phone}</View>
+              <View className='at-col at-col-9'>{data.person.tel || data.person.phone}</View>
             </View>
             <View className='at-row'>
               <View className='at-col at-col-3'>参与人数：</View>
-              <View className='at-col at-col-9'>{this.state.data.enlist.attendNum}</View>
+              <View className='at-col at-col-9'>{(data.enlist || {}).attendNum}</View>
             </View>
           </View>
 
-
-
-          {!this.state.data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkin.png')} onClick={this.checkinActive}   ></Image>}
-          {this.state.data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkined.png')}></Image>}
+          {!data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkin.png')} onClick={this.checkinActive}   ></Image>}
+          {data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkined.png')}></Image>}
         </View>}
-        {this.state.data.enlist == null && <View className="unregistered">
+        {data.enlist == null && <View className="unregistered">
           <View>
             <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>
           </View>

src/pages/city/index.scss

@@ -23,7 +23,7 @@
 
   .search-list {
     position: absolute;
-    top: 136px;
+    top: 114px;
     width: 100%;
     background: white;
     min-height: 100vh;

src/pages/im/index.js

@@ -375,9 +375,6 @@ export default class Chat extends Component {
     // 发送消息
     socket.sendNotice(payload, res => {
       console.log('发送成功')
-      this.setState({
-        inputText:'',
-      })
       this.appendData(payload)
     })
   }

src/pages/person/index.js

@@ -75,21 +75,12 @@ export default class Person extends Component {
     })
   }
 
-  toClientPage() {
-    const { user: { customerNum } } = this.state
-
-    if (customerNum <= 0) {
-      Taro.showToast({ title: '暂无客户', icon: 'none' })
-      return
+  redirectTo = (url) => {
+    if (typeof url === 'function') {
+      Taro.navigateTo({ url: url(this.state.user) })
+    } else {
+      Taro.navigateTo({ url })
     }
-
-    Taro.navigateTo({
-      url: '/pages/person/myGuest/index'
-    })
-  }
-
-  redirectTo(url) {
-    Taro.navigateTo({ url })
   }
 
   getRoleName(type) {
@@ -97,18 +88,14 @@ export default class Person extends Component {
       case ROLE_CODE['CONSULTANT']:
         this.setState({ consultant: true })
         return '置业顾问'
-        break;
       case ROLE_CODE['ESTATE_AGENT']:
         this.setState({ isAgent: true })
         return '独立经纪人'
-        break;
       case ROLE_CODE['CHANNEL_AGENT']:
         this.setState({ isAgent: true })
         return '渠道经纪人'
-        break;
       default:
         return '普通用户'
-        break;
     }
   }
 
@@ -125,12 +112,14 @@ export default class Person extends Component {
   }
 
   goPersonDetail() {
+
     const { user: { personType } } = this.state
-    if (personType == ROLE_CODE['CHANNEL_AGENT'] || personType == ROLE_CODE['ESTATE_AGENT']) {
-      Taro.navigateTo({
-        url: '/pages/person/personDetail/index'
-      })
-    }
+
+    // if (personType == ROLE_CODE['CHANNEL_AGENT'] || personType == ROLE_CODE['ESTATE_AGENT']) {
+    Taro.navigateTo({
+      url: '/pages/person/personDetail/index'
+    })
+    // }
 
   }
 
@@ -140,6 +129,7 @@ export default class Person extends Component {
 
   renderDetail() {
     const { user, menus, isAgent, consultant, tourist } = this.state
+    const showQRCode = user.personType === ROLE_CODE['CONSULTANT'] || ROLE_CODE['ESTATE_AGENT'] || ROLE_CODE['CHANNEL_AGENT']
     // const isConsultant = user.personType == ROLE_CODE['CONSULTANT']
     // const isConsultant = user.personType
     return (
@@ -155,13 +145,17 @@ export default class Person extends Component {
               </View>
 
               <View className="info-text" onClick={this.goPersonDetail}>
-                <View className="info-text__name">{user.name ? user.name : user.nickname} {/* <Text className="iconfont icon-more"></Text> */}</View>
+                <View className="info-text__name">{user.name ? user.name : user.nickname}</View>
                 <View className="info-text__intro">积分 {user.points || 0}</View>
               </View>
-              <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>
+              {
+                showQRCode && (
+                  <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>
+                )
+              }
             </View>
             {/* <View
               className={`sign__btn ${user.havaSigned && 'signed'}`}
@@ -171,7 +165,7 @@ export default class Person extends Component {
           </View>
           <View className='qiandao-con'>
             <Text className='qiandao-text'>签到得积分，积分兑好礼，马上去签到吧！</Text>
-            <View className={user.havaSigned?'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View>
+            <View className={user.havaSigned ? 'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View>
 
             {/* <Text className='integral-cont_btn' onClick={this.goShop}>去兑换</Text> */}
 
@@ -190,7 +184,7 @@ export default class Person extends Component {
                           <View className="menu-maintext">
                             <Text className="menu-name">{menu.name}</Text>
                             <Text className="right-icon"></Text>
-                          </View>        
+                          </View>
                         </View>
                       )
                     })
@@ -210,7 +204,7 @@ export default class Person extends Component {
     return (
       <View className='wrap'>
         {(phone || tel) && this.renderDetail()}
-        {!phone && !tel  && this.renderLogin()}
+        {!phone && !tel && this.renderLogin()}
       </View>
     )
   }

src/pages/person/menus.js

@@ -28,7 +28,14 @@ const menus = [
       url: '/pages/agent/index',
       icon: icons.homepage,
       extends: undefined,
-      userTypes: [CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+      userTypes: [ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '我的主页',
+      url: ({id}) => `/pages/card/index?id=${id}`,
+      icon: icons.homepage,
+      extends: undefined,
+      userTypes: [CONSULTANT],
     },
     {
       name: '成为经纪人',
@@ -53,6 +60,13 @@ const menus = [
     },
   ],
   [
+    {
+      name: '我的客户',
+      url: '/pages/person/myGuest/index',
+      icon: icons.activities,
+      extends: undefined,
+      userTypes: [CONSULTANT],
+    },
     {
       name: '我的活动',
       url: '/pages/activity/myActivity?from=mine',
@@ -88,7 +102,7 @@ const menus = [
       url: '/pages/person/profile/index',
       icon: icons.profile,
       extends: undefined,
-      userTypes: [CUSTOMER, ESTATE_AGENT, CHANNEL_AGENT],
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
     },
     {
       name: '兑换记录',

src/pages/person/personDetail/index.js

@@ -11,7 +11,7 @@ export default class personDetail extends Component {
     userName: '用户名',
     phone: '电话号码',
     manType: '经纪人类型',
-    user:{}
+    user: {}
   }
   config = {
     navigationBarTitleText: '个人资料',
@@ -72,13 +72,17 @@ export default class personDetail extends Component {
             <Image src={require('@assets/person/arrow2.png')} mode="widthFix"></Image>
           </View>
         </View>
-        <View className='col_box' onClick={this.goEdit.bind(this)}>
-          <Text>{manType}</Text>
-          <View className='col_right'>
-            <Text>{this.getRoleName(user.personType)}</Text>
-            <Image src={require('@assets/person/arrow2.png')} mode="widthFix"></Image>
+        {
+          (user.personType == ROLE_CODE['CHANNEL_AGENT'] || user.personType == ROLE_CODE['ESTATE_AGENT']) &&
+
+          <View className='col_box' onClick={this.goEdit.bind(this)}>
+            <Text>{manType}</Text>
+            <View className='col_right'>
+              <Text>{this.getRoleName(user.personType)}</Text>
+              <Image src={require('@assets/person/arrow2.png')} mode="widthFix"></Image>
+            </View>
           </View>
-        </View>
+        }
       </View>
     )
   }

src/pages/person/profile/detail/index.js

@@ -42,7 +42,7 @@ export default class Profile extends Component {
       getProfileDetail(id).then(res => {
         this.setState({
           detail: res,
-          imgList: res.imgList,
+          imgList: res.imgList || [],
           documentTitle: res.documentTitle,
         })
       })
@@ -66,7 +66,7 @@ export default class Profile extends Component {
           this.setState({
             marginTop: 0,
             messageType: 'image',
-            imgList: imgList
+            imgList: imgList|| []
           }, this.onSendMsg)
         })
       }
@@ -78,7 +78,7 @@ export default class Profile extends Component {
     const imgList = this.state.imgList;
     imgList.splice(inx, 1);
     this.setState({
-      imgList: imgList
+      imgList: imgList || []
     })
   }
 
@@ -100,7 +100,7 @@ export default class Profile extends Component {
       editDocumentVerify(payload).then(res => {
         this.setState({
           detail: res,
-          imgList: res.imgList,
+          imgList: res.imgList || [],
           documentTitle: res.documentTitle,
         })
         Taro.showToast({ icon: 'none', title: '提交成功' });

src/pages/person/profile/index.js

@@ -14,13 +14,13 @@ export default class Profile extends Component {
   }
 
   state = {
-    files: [],
-    auditStatus: 0,
+   
     documentVerifyId: '',
     imgList: [],
     documentTitle: '',
     verfyList: [], // 审核列表
     descVisible: false,
+    showWhich: true,
 
   }
 
@@ -32,7 +32,18 @@ export default class Profile extends Component {
     Taro.showLoading()
     getVerifyList().then(res => {
       this.setState({
-        verfyList: res
+        verfyList: res || []
+      }, () => {
+        if (this.state.verfyList.length == 0) {
+          this.setState({
+            showWhich: true
+          })
+        } else {
+          this.setState({
+            showWhich: false
+          })
+        }
+
       })
       Taro.hideLoading()
     }).catch((err) => {
@@ -47,7 +58,8 @@ export default class Profile extends Component {
   // 选择图片
   bindAlbumClick(e) {
     this.setState({
-      descVisible: true
+      descVisible: true,
+      showWhich: false
     })
     e.stopPropagation()
     Taro.chooseImage({
@@ -63,7 +75,7 @@ export default class Profile extends Component {
           this.setState({
             marginTop: 0,
             messageType: 'image',
-            imgList: imgList
+            imgList: imgList || []
           }, this.onSendMsg)
         })
       }
@@ -75,7 +87,7 @@ export default class Profile extends Component {
     const imgList = this.state.imgList;
     imgList.splice(inx, 1);
     this.setState({
-      imgList: imgList
+      imgList: imgList || []
     })
   }
   toProfileDetail(item) {
@@ -99,7 +111,7 @@ export default class Profile extends Component {
   }
   // 提交资料审核
   commitBtn() {
-    console.log(this.state.auditStatus, "this.state.auditStatus")
+
     if (this.state.imgList.length == 0) {
       Taro.showToast({ icon: 'none', title: '请先上传图片' });
     } else if (this.state.documentTitle == "") {
@@ -174,25 +186,25 @@ export default class Profile extends Component {
 
 
   render() {
-    const { imgList, documentTitle, verfyList, descVisible } = this.state
+    const { imgList, documentTitle, verfyList, descVisible,showWhich } = this.state
 
     return (
       <View className="profile-page" style={`background: url(${profileBg}) no-repeat top;background-size: 100% 100%;`}>
         <ScrollView scrollY scrollWithAnimation style="height: 100vh">
 
-          {!verfyList.length &&
+          {(!verfyList.length && showWhich) &&
             <View className="up-images">
               {this.renderUpImages()}
 
               <View className="tip">
                 建议上传相关购房资格等相关资料,审核
-          </View>
+              </View>
               <View className="tip">
                 通过后将获取更多积分、兑换好礼~
-          </View>
+              </View>
             </View>
           }
-          {verfyList.length &&
+          {(verfyList.length || !showWhich) &&
             <View>
 
               {descVisible &&

src/pages/project/detail/index.js

@@ -279,7 +279,7 @@ export default class Index extends Component {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
       Taro.navigateTo({
-        url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.name)}`
+        url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.userName)}`
       })
     })
   }

src/pages/project/index.js

@@ -7,7 +7,7 @@ import ActivityItem from '../activity/item'
 
 import ready from '@utils/ready'
 
-import { queryBanners, savePoint } from '@services/common'
+import { queryBanners, savePoint, updatePoint } from '@services/common'
 import { queryNewsList, queryHelpGroup } from '@services/news'
 import { queryActivityList } from '@services/activity'
 import { dispatchCitySelected } from '@actions/city'
@@ -66,6 +66,7 @@ export default class Index extends Component {
       })
     })
   }
+
   componentDidShow() {
     if (this.props.curCity.id) {
       ready.queue(() => {
@@ -74,6 +75,11 @@ export default class Index extends Component {
     }
   }
 
+  componentWillUnmount() {
+    const { recordId } = this.state
+    recordId && updatePoint(recordId)
+  }
+
   getLocation() {
     const { cityList } = this.props
     Taro.getLocation().then(location => {
@@ -255,11 +261,12 @@ export default class Index extends Component {
     })
   }
 
-  handleBannerClick(item) {
+  handleBannerClick=(item) =>{
+    console.log(this,"this")
     this.redirectTo(item)
   }
 
-  redirectTo({ contentId, contentType, buildingId } = {}) {
+  redirectTo({ targetId, contentType, buildingId } = {}) {
     switch (contentType) {
       // 项目
       case 'project':
@@ -271,28 +278,28 @@ export default class Index extends Component {
       // 活动
       case 'activity':
         Taro.navigateTo({
-          url: '/pages/activity/detail/index?id=' + contentId
+          url: '/pages/activity/detail/index?id=' + targetId
         })
         return;
 
       // 助力
       case 'help':
         Taro.navigateTo({
-          url: '/pages/activity/detail/assistance?id=' + contentId
+          url: '/pages/activity/detail/assistance?id=' + targetId
         })
         return;
 
       // 拼团
       case 'group':
         Taro.navigateTo({
-          url: '/pages/activity/detail/assemble?id=' + contentId
+          url: '/pages/activity/detail/assemble?id=' + targetId
         })
         return;
 
       // 资讯
       case 'news':
         Taro.navigateTo({
-          url: 'pages/news/detail/index?id=' + contentId
+          url: 'pages/news/detail/index?id=' + targetId
         })
         return;
 

src/pages/shop/index.js

@@ -12,7 +12,7 @@ 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'
+import { queryUserInfo, doUserSignin } from '@services/user'
 
 // import getUserPhone from '@utils/getUserPhone'
 import Authorize from '@components/authorize'
@@ -32,20 +32,21 @@ export default class Shop extends Component {
       'https://estateagents.oss-cn-shanghai.aliyuncs.com/images/banner/4.jpg',
       'https://estateagents.oss-cn-shanghai.aliyuncs.com/images/banner/5.jpg'
     ],
-    user: {},
     cityName: '',
     goodsBuilding: [],
     goodsList: [],
+    user: {},
   }
 
   componentDidShow() {
+
     Taro.showLoading()
     ready.queue(() => {
       this.loadBannerList()
       this.loadGoodsBuilding()
 
       //    this.loadCity()
-      // this.loadUserInfo()
+      this.loadUserInfo()
     })
     Taro.hideLoading()
   }
@@ -63,14 +64,15 @@ export default class Shop extends Component {
 
   loadList() {
 
+
     Taro.showLoading()
     const params = {
       pageNum: '1',
       pageSize: '9999',
-      buildingId: this.state.goodsBuilding[0].buildingId
+      buildingId: this.state.goodsBuilding[0].buildingId,
+      cityId: this.props.curCity.id
     }
 
-    console.log(params, "params")
     getGoodsList(params).then(res => {
       this.setState({
         goodsList: res.records || []
@@ -83,7 +85,13 @@ export default class Shop extends Component {
   }
 
   loadGoodsBuilding() {
-    getGoodsBuilding().then(res => {
+    const payload = {
+
+      cityId: this.props.curCity.id
+    }
+
+    console.log(payload, "999999999999")
+    getGoodsBuilding(payload).then(res => {
       res.map(item => {
         item.title = item.buildingName
       })
@@ -108,10 +116,10 @@ export default class Shop extends Component {
     const payload = {
       pageNum: '1',
       pageSize: '9999',
-      buildingId: this.state.goodsBuilding[value].buildingId
+      buildingId: this.state.goodsBuilding[value].buildingId,
+      cityId: this.props.curCity.id
     }
     getGoodsList(payload).then(res => {
-      console.log(res.records, "22222222222222222222222222222222")
       this.setState({
         goodsList: res.records || []
       })
@@ -144,13 +152,10 @@ export default class Shop extends Component {
       url: `/pages/city/index`
     })
   }
+
   doSign() {
     const { user: { id, havaSigned } } = this.state
     if (havaSigned) {
-      Taro.showToast({
-        title: '你已经签到过了',
-        icon: 'none'
-      })
       return
     }
 
@@ -161,9 +166,17 @@ export default class Shop extends Component {
 
       this.loadUserInfo()
 
+      // App.zhuge.track('签到成功')
+    })
+  }
+  
+  loadUserInfo() {
+    // debugger
+    queryUserInfo().then(user => {
+      // debugger
+      this.setState({ user })
     })
   }
-
 
   renderLogin() {
     return <Authorize></Authorize>
@@ -242,8 +255,9 @@ export default class Shop extends Component {
   }
 
   renderDetail() {
-    // const { user } = this.state
+    const { user } = this.state
     const { userInfo: { person }, curCity } = this.props
+    const { bannerList = [] } = this.state
     return (
       <View className="page">
         {/* <Search placeholder="请输入要搜索的商品名称" onSearch={this.onSearch} /> */}
@@ -260,7 +274,11 @@ export default class Shop extends Component {
               <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>
+              {
+                user.havaSigned ?
+                (<View className="qiandao__btn">已签到</View>) :
+                (<View className="qiandao__btn" onClick={this.doSign}>签到</View>)
+              }
               <View className='message'>
                 <View className='message__left'>
                   <View className='user__jifen'>
@@ -285,8 +303,10 @@ export default class Shop extends Component {
           </View>
 
 
+          {bannerList.length > 0 &&
+            <Banner list={bannerList} indicatorDots={false}></Banner>
+          }
 
-          <Banner list={this.state.bannerList} indicatorDots={false}></Banner>
 
           {this.renderGoods()}
         </ScrollView>