merge

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行",
-	"appid": "wxd9ee3a9480a4e544",
+	"appid": "wxda1f84b79b3edeb3",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/constants/api.js

@@ -123,9 +123,13 @@ export const API_FEEDBACK_SUBMIT = resolvePath('taCustomerMessage')
 // getCode
 export const API_GET_CODE = resolvePath('captcha')
 
+// /wx/registerConsultantOneClick
 // registerConsultant
 export const API_PUT_REGISTER = resolvePath('registerConsultant')
 
+// registerConsultantOneClick
+export const API_PUT_REGISTERCONSULTANT = resolvePath('registerConsultantOneClick')
+
 // city
 export const API_CITY_LIST = resolvePath('tdCity')
 

src/pages/activity/index.js

@@ -114,7 +114,7 @@ export default class Index extends Component {
       const {records, list, total, current, pages} = res || {}
       const _list = records || list || []
       const newList = current <= 1 ? _list: this.state.list.concat(_list)
-
+console.log(res,'---res-------')
       this.setState({
         list: newList,
         isEmpty: total == 0,

src/pages/activity/item/index.js

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

src/pages/agent/become/index.js

@@ -21,45 +21,52 @@ export default class Index extends Component {
     isChannel: false,
     user: {}
   }
-  componentDidMount() {
+  componentDidMount () {
     this.loadUserInfo()
 
 
   }
-  putMessage() {
+  putMessage () {
     const { recommendAgentCode, channelCode } = this.state
     const payload = {
       recommendAgentCode: recommendAgentCode,
       channelCode: channelCode
     }
-    registerAgent(payload).then(res => {
-      // debugger
-      this.props.dispatchUpdateUserInfoNew(res.personId)
-      Taro.navigateTo({
-        url: '/pages/agent/index'
+    if (payload.channelCode)
+      registerAgent(payload).then(res => {
+        // debugger
+        this.props.dispatchUpdateUserInfoNew(res.personId)
+        Taro.navigateTo({
+          url: '/pages/agent/index'
+        })
       })
-    })
+    else {
+      console.log('11111')
+      Taro.showToast({
+        title: '请输入渠道码'
+      })
+    }
   }
 
-  onChange = e => {
-    this.setState({
-      selectorChecked: this.state.selector[e.detail.value]
-    }, () => {
-      const { selectorChecked } = this.state
-      if (selectorChecked == '渠道经纪人') {
-        this.setState({
-          isChannel: true
-        })
-      } else {
-        this.setState({
-          isChannel: false,
-          channelCode: ''
-        })
-      }
+  // onChange = e => {
+  //   this.setState({
+  //     selectorChecked: this.state.selector[e.detail.value]
+  //   }, () => {
+  //     const { selectorChecked } = this.state
+  //     if (selectorChecked == '渠道经纪人') {
+  //       this.setState({
+  //         isChannel: true
+  //       })
+  //     } else {
+  //       this.setState({
+  //         isChannel: false,
+  //         channelCode: ''
+  //       })
+  //     }
 
-    })
-  }
-  bindInfo(e) {
+  //   })
+  // }
+  bindInfo (e) {
     console.log(e.currentTarget.dataset.id)
     switch (e.currentTarget.dataset.id) {
       case 'recommendAgentCode':
@@ -76,7 +83,7 @@ export default class Index extends Component {
         break;
     }
   }
-  getPhoneNumber(e) {
+  getPhoneNumber (e) {
     getUserPhone(e, (phoneNumber) => {
       if (phoneNumber) {
         this.putMessage()
@@ -88,7 +95,7 @@ export default class Index extends Component {
       }
     })
   }
-  loadUserInfo() {
+  loadUserInfo () {
     queryUserInfo().then(user => {
       this.setState({
         user,
@@ -110,22 +117,22 @@ export default class Index extends Component {
       })
     })
   }
-  render() {
+  render () {
     const { isChannel, recommendAgentCode } = this.state
     const { userInfo: { person: { phone } } } = this.props
     return (
       <View className='page'>
         <Image src={bannerImg} className='banner' mode='widthFix'></Image>
         <View className='become_agent'>
-          <View className='agent_type'>
+          {/* <View className='agent_type'>
             <Text className='agent_title'>经纪人类型</Text>
             <Picker mode='selector' className='selector' range={this.state.selector} onChange={this.onChange}>
               <View className='picker'>
                 {this.state.selectorChecked}
               </View>
             </Picker>
-          </View>
-          {isChannel && (<Input type='number' className='channel_code' placeholder='渠道验证码 (必填)' onInput={this.bindInfo.bind(this)} data-id='channelCode'></Input>)}
+          </View> */}
+          <Input type='number' className='channel_code' placeholder='渠道验证码 (必填)' onInput={this.bindInfo.bind(this)} data-id='channelCode'></Input>
 
           <Input type='number' className='input_code' value={recommendAgentCode} placeholder='输入推荐码 (选填)' onInput={this.bindInfo.bind(this)} data-id='recommendAgentCode'></Input>
           {

src/pages/person/index.js

@@ -5,7 +5,7 @@ import { ROLE_CODE } from '@constants/user'
 import { queryUserInfo, doUserSignin } from '@services/user'
 import { connect } from '@tarojs/redux'
 import Notice from '@components/Notice'
-
+import { getCodeMessage, putRegisterConsultant} from '@services/getCode'
 import * as actions from '@actions/user'
 import Authorize from '@components/authorize'
 
@@ -27,13 +27,13 @@ export default class Person extends Component {
     roleName: '普通用户',
   }
 
-  componentDidShow() {
+  componentDidShow () {
     Taro.showLoading()
     this.loadUserInfo()
     Taro.hideLoading()
   }
 
-  loadUserInfo() {
+  loadUserInfo () {
     queryUserInfo().then(user => {
       const [roleSetting, roleName] = this.getRoleName(user.personType)
 
@@ -42,12 +42,12 @@ export default class Person extends Component {
         phone: user.phone,
         menus: menus.map(group => group.filter(x => x.userTypes.indexOf(user.personType) > -1)),
         roleName,
-        ...roleSetting,        
+        ...roleSetting,
       })
     })
   }
 
-  doSign() {
+  doSign () {
     const { user: { id, havaSigned } } = this.state
     if (havaSigned) {
       return
@@ -69,32 +69,50 @@ export default class Person extends Component {
     })
   }
 
-  toHomePage() {
+  toHomePage () {
     Taro.switchTab({
       url: '/pages/project/index'
     })
   }
 
-  toShopPage() {
+  toShopPage () {
     Taro.switchTab({
       url: '/pages/shop/index'
     })
   }
 
   redirectTo = (url) => {
-    if (typeof url === 'function') {
-      Taro.navigateTo({ url: url(this.state.user) })
-    } else {
-      Taro.navigateTo({ url })
+    if (url) {
+      if (typeof url === 'function') {
+        Taro.navigateTo({ url: url(this.state.user) })
+      } else {
+        Taro.navigateTo({ url })
+      }
+    }
+    else {
+   
+    
+      putRegisterConsultant().then(res => {
+        // console.log("匹配成功，请退出小程序重新登录即可")
+        Taro.showToast({
+          title: "匹配成功，请退出小程序重新登录即可"
+        })
+      }).catch(err => {
+        console.error(err)
+        Taro.showToast({
+          title: "匹配失败，请联系相关管理人员"
+        })
+      })
     }
+
   }
 
-  getRoleName(type) {
+  getRoleName (type) {
     switch (type) {
       case ROLE_CODE['CONSULTANT']:
         return [{ consultant: true }, '置业顾问']
       case ROLE_CODE['ESTATE_AGENT']:
-        return [{ isAgent: true }, '专业经纪人']
+        return [{ isAgent: true }, '普通用户']
       case ROLE_CODE['CHANNEL_AGENT']:
         return [{ isAgent: true }, '专业经纪人']
       default:
@@ -102,19 +120,19 @@ export default class Person extends Component {
     }
   }
 
-  goShop() {
+  goShop () {
     Taro.switchTab({
       url: `/pages/shop/index`
     })
   }
-  handleMore() {
+  handleMore () {
     Taro.showModal({
       title: '温馨提示',
       content: '敬请期待'
     })
   }
 
-  goPersonDetail() {
+  goPersonDetail () {
 
     const { user: { personType } } = this.state
 
@@ -126,11 +144,11 @@ export default class Person extends Component {
 
   }
 
-  renderLogin() {
+  renderLogin () {
     return <Authorize></Authorize>
   }
 
-  renderDetail() {
+  renderDetail () {
     const { user, menus, roleName } = this.state
     // const showQRCode = user.personType === ROLE_CODE['CONSULTANT'] || ROLE_CODE['ESTATE_AGENT'] || ROLE_CODE['CHANNEL_AGENT']
     // const isConsultant = user.personType == ROLE_CODE['CONSULTANT']
@@ -177,7 +195,7 @@ export default class Person extends Component {
         <View>
           {
             menus.map((group, ginx) => {
-              console.log('----------------')
+           
               return (
                 <Block key={`grp-${ginx}`}>
                   {
@@ -203,7 +221,7 @@ export default class Person extends Component {
     );
   }
 
-  render() {
+  render () {
     const { phone, tel } = this.state.user
     return (
       <View className='wrap'>

src/pages/person/menus.js

@@ -25,13 +25,13 @@ const CHANNEL_AGENT = ROLE_CODE['CHANNEL_AGENT']
 
 const menus = [
   [
-    {
-      name: '我的主页',
-      url: '/pages/agent/index',
-      icon: icons.homepage,
-      extends: undefined,
-      userTypes: [ESTATE_AGENT, CHANNEL_AGENT],
-    },
+    // {
+    //   name: '我的主页',
+    //   url: '/pages/agent/index',
+    //   icon: icons.homepage,
+    //   extends: undefined,
+    //   userTypes: [ESTATE_AGENT, CHANNEL_AGENT],
+    // },
     {
       name: '我的主页',
       url: ({ id }) => `/pages/card/index?id=${id}`,
@@ -60,13 +60,13 @@ const menus = [
       extends: undefined,
       userTypes: [CUSTOMER,ESTATE_AGENT, CHANNEL_AGENT],
     },
-    {
-      name: '发展经纪人',
-      url: '/pages/agent/invitation/index',
-      icon: icons.development,
-      extends: undefined,
-      userTypes: [ESTATE_AGENT, CHANNEL_AGENT],
-    },
+    // {
+    //   name: '发展经纪人',
+    //   url: '/pages/agent/invitation/index',
+    //   icon: icons.development,
+    //   extends: undefined,
+    //   userTypes: [ESTATE_AGENT, CHANNEL_AGENT],
+    // },
   ],
   [
     {
@@ -148,14 +148,14 @@ const menus = [
       url: '/pages/agent/become/index',
       icon: icons.development,
       extends: undefined,
-      userTypes: [CUSTOMER],
+      userTypes: [CUSTOMER,ESTATE_AGENT],
     },
     {
       name: '成为置业顾问',
       url: '',
       icon: icons.consultant,
       extends: undefined,
-      userTypes: [CUSTOMER],
+      userTypes: [CUSTOMER,ESTATE_AGENT],
     },
 
   ]

src/pages/project/banner/index.js

@@ -17,11 +17,14 @@ export default class SwiperBanner extends Component {
   }
 
   changeCurrent (event) {
-   
+
+ 
     const current = event.detail.current
    
     this.props.onChange(current)
   
+   
+  
   }
 
   onBannerClick (item) {

src/pages/project/detail/index.js

@@ -169,7 +169,7 @@ export default class Index extends Component {
   }
   // 海报预览图
   previewImage (arr) {
-    console.log('arr:' + arr)
+    // console.log('arr:' + arr)
     if (arr[0].length > 1) {
       Taro.previewImage({
         current: arr,
@@ -575,23 +575,10 @@ export default class Index extends Component {
     const { albumCurrent } = this.state
 
   
-    // console.log(this.props, '2222222222222')
+  
     return (
 
-      //   <View className="around-tab">
-      //   {tabList.map((item, index) => {
-      //     const { key, label, num } = item || {}
-      //     return (
-      //       <View
-      //         key={key}
-      //         className={`around-tab__item ${current === index ? 'active' : ''}`}
-      //         onClick={handleClick(index)}
-      //       >
-      //         {`${label}(${num})`}
-      //       </View>
-      //     )
-      //   })}
-      // </View>    imgList.length > 0 &&
+   
       <Block>
         { list.length > 0 &&
           (
@@ -599,13 +586,13 @@ export default class Index extends Component {
               <View className='photos__type__title'>相册</View>
               <ScrollView scrollX>
                 <View className='photos__type__content' onClick={this.toViewAlbum}>
-                {console.log(list, '2222222222222')}
+          
                   <View className="around-tab">
                     {list.map((item, index) => {
                       const { apartmentName} = item || {}
                       const  buildingImgList = item.buildingImgList
                      
-                      console.log(buildingImgList, '22333333222')
+                    
                       return (
                         <View
                           style={{ marginRight: '8px' }}                  
@@ -877,15 +864,23 @@ export default class Index extends Component {
       <View
         className="pro__banner"
       >
+        {console.log(projectDetail)}
         <Video
           src={projectDetail.videoUrl}
           // src='http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400'
-          // poster='http://misc.aotu.io/booxood/mobile-video/cover_900x500.jpg'  
-          initial-time='0.01'
+          poster={getThumbnail(projectDetail.videoImage)}
+          // poster='http://misc.aotu.io/booxood/mobile-video/cover_900x500.jpg'
           style={{
-            height: '278px',
-            width: '375px'
+            height: '278rpx',
+            width: '375rpx'
           }}
+          controls={true}
+          autoplay={false}
+        
+          initialTime='0'
+          id='video'
+          loop={false}
+          muted={false}
           show-mute-btn='true'
         ></Video>
       </View>

src/pages/project/detail/index.scss

@@ -48,7 +48,7 @@
 
 
   .wrap {
-    padding-top: 500px;
+    padding-top: 556px;
     background: transparent;
   }
 

src/pages/project/index.js

@@ -519,12 +519,16 @@ export default class Index extends Component {
       url: '/pages/project/list/index'
     })
   }
-
+  // CONSULTANT: 'Realty Consultant', // 置业顾问
+  // ESTATE_AGENT: 'estate agent', // 独立经纪人
+  // CHANNEL_AGENT: 'channel agent', // 渠道经纪人
+  // DRIFT: 'drift', // 游客
+  // CUSTOMER: 'customer' // 客户
   toRecomonedPage() {
     const {
       userInfo: { person: { personType } }
     } = this.props
-    if (personType === ROLE_CODE['DRIFT'] || personType === ROLE_CODE['CUSTOMER'] || !personType) {
+    if (personType === ROLE_CODE['DRIFT'] ||  !personType) {
       // 游客或者客户 区别是否有电话
       Taro.navigateTo({
         url: `/pages/agent/become/index`
@@ -546,6 +550,7 @@ export default class Index extends Component {
   renderProjectList() {
     const { proList: { records } } = this.props
     const { helpGroupList } = this.state
+    console.log(records,'proList')
     return (
       <Block>
         {
@@ -574,6 +579,8 @@ export default class Index extends Component {
             </View >
           )
         }
+
+        {console.log(helpGroupList,'helpGroupList')}
         {
           helpGroupList.length > 0 &&
           <View
@@ -603,6 +610,7 @@ export default class Index extends Component {
     return (
       <View className="mask-banner">
         <View className="content">
+          {console.log(maskBanner,'maskBanner')}
           <Image
             mode="widthFix"
             className="img"
@@ -642,7 +650,10 @@ export default class Index extends Component {
                         }}
                         indicatorDots={true}
                         list={this.state.bannerList}
-                        onClick={this.handleBannerClick}>
+                        onClick={this.handleBannerClick}
+                        onChange={()=>(1)}
+                        >
+                    
                       </Banner>
                     )
                   }

src/pages/project/item/index.js

@@ -18,13 +18,14 @@ export default class Index extends Component {
 
   render() {
     const { data, onClick } = this.props
-    const { uvList = {}, buildingTag = [], buildingImg, shareList = {} } = data
+    const { uvList = {}, buildingTag = [], buildingListImg, shareList = {} } = data
     const { records = [], total = 0 } = uvList
-    const imgSrc = (buildingImg && buildingImg[0]) ? buildingImg[0].url : require('@assets/default.jpg')
+    const imgSrc = (buildingListImg && buildingListImg[0]) ? buildingListImg[0].url : require('@assets/default.jpg')
 
     return (
       <View className='item' onClick={onClick.bind(this, data)}>
         <View className='item__top'>
+          {console.log(data,'data')}
           <Image className='item__img' mode="aspectFill" src={getThumbnail(imgSrc)}></Image>
           {data.marketStatus &&
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}

src/pages/project/swiper/index.js

@@ -2,8 +2,8 @@ import Taro, { Component } from '@tarojs/taro'
 import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
 // import { cdn } from '@constants/api'
 import './index.scss'
-import emptyImg  from '@assets/empty.png'
-import { getThumbnail} from '@utils/tools'
+import emptyImg from '@assets/empty.png'
+import { getThumbnail } from '@utils/tools'
 
 export default class SwiperBanner extends Component {
   static defaultProps = {
@@ -15,13 +15,14 @@ export default class SwiperBanner extends Component {
     onClick: function () { }
   }
 
-  onBannerClick(item) {
+  onBannerClick (item) {
     this.props.onClick(item)
   }
-  render() {
+  render () {
     const { list, style, indicatorDots, current } = this.props
     return (
       <View className='home-banner' style={style}>
+        {console.log(this.props, '---list---')}
         <Swiper
           className='home-banner__swiper'
           circular
@@ -30,21 +31,22 @@ export default class SwiperBanner extends Component {
           indicatorActiveColor='rgb(256,256,256)'
         >
           {list.map((item, index) => (
+
             <SwiperItem
               key={index}
               onClick={this.onBannerClick.bind(this, item)}
               className='home-banner__swiper-item'
-            >
+            >  {console.log(item, '---item1111---')}
               <Image
                 mode="aspectFill"
                 style={style}
                 className='home-banner__swiper-item-img'
-                src={getThumbnail(item.image || item.url ||item.img||emptyImg)}
+                src={getThumbnail(item.bannerListImg || item.image || item.url || item.img || emptyImg)}
               />
             </SwiperItem>
           ))}
         </Swiper>
-      </View> 
+      </View>
     )
   }
 }

src/pages/shop/detail/index.js

@@ -19,7 +19,7 @@ export default class Index extends Component {
     visibleExcBtn: true,
   }
 
-  componentWillMount() {
+  componentWillMount () {
     const { id, from } = this.$router.params
     this.setState({
       goodsId: id,
@@ -27,7 +27,7 @@ export default class Index extends Component {
     }, this.loadDetail)
   }
 
-  loadDetail() {
+  loadDetail () {
     const { goodsId } = this.state
     Taro.showLoading()
     this.props.dispatchGoodsDetail(goodsId).then(res => {
@@ -41,7 +41,7 @@ export default class Index extends Component {
     })
   }
 
-  onExchange() {
+  onExchange () {
     const { goodsId } = this.state
     const { goodsDetail: { goodsName } } = this.props
     if (!hasClick) return
@@ -59,7 +59,7 @@ export default class Index extends Component {
     })
   }
 
-  render() {
+  render () {
     const { goodsDetail } = this.props
     return (
       <View className="page">
@@ -73,14 +73,14 @@ export default class Index extends Component {
             paddingBottom: `${this.state.visibleExcBtn ? '100rpx' : ''}`
           }}>
           <View className="detail__head">
-            <Image src={getThumbnail(goodsDetail.imgUrl)} mode="widthFix" className="detail__head-pic"></Image>
+            <Image src={getThumbnail(goodsDetail.detailImgUrl || goodsDetail.imgUrl)} mode="widthFix" className="detail__head-pic"></Image>
             <Image src={require('@assets/shop/hot.png')} className="detail__head-hot" />
           </View>
 
           <View className="detail__intro">
             <View className="detail__title">
               <Text className="detail__title-bold">{goodsDetail.goodsName}</Text>
-              
+
             </View>
             <View className="detail__int">
               {/* <Text>所需积分</Text> */}

src/pages/shop/index.js

@@ -264,7 +264,9 @@ export default class Shop extends Component {
             {
               goodsList.length &&
               goodsList.map(item => (
+                
                 <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
+                  {console.log(item,'--item---')}
                   <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
                   <View className="item__title">{item.goodsName}</View>
                   <View className="item__des">

src/services/getCode.js

@@ -1,7 +1,8 @@
 import { fetch } from '@utils/request'
 import {
   API_GET_CODE,
-  API_PUT_REGISTER
+  API_PUT_REGISTER,
+  API_PUT_REGISTERCONSULTANT
 } from '@constants/api'
 
 /**
@@ -11,3 +12,6 @@ import {
 export const getCodeMessage = tel => fetch({ url: `${API_GET_CODE}?tel=${tel}`, method: 'POST' })
 
 export const putRegister = payload => fetch({ url: `${API_PUT_REGISTER}?phone=${payload.tel}&&code=${payload.code}`, payload, method: 'PUT' })
+
+export const putRegisterConsultant = payload => fetch({ url: `${API_PUT_REGISTERCONSULTANT}`, method: 'PUT' })
+// /wx/registerConsultantOneClick