Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.84:8080"',
-    WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://127.0.0.1:8080"',
+    WSS_HOST: '"ws://127.0.0.1:8080"',
   },
   weapp: {},
   h5: {}

src/constants/api.js

@@ -55,6 +55,7 @@ export const API_GOODS_EXCHANGE_RECORDS = resolvePath('taPointsExchange')
 export const API_POINTS_RECORDS = resolvePath('taPointsRecords')
 export const API_POINTS_RULE = resolvePath('tdPointsRules')
 export const API_POINTS_ADRESS = resolvePath('person/city')
+export const API_GOODS_BELONGS = resolvePath('goodsToBuilding')
 
 // client
 export const API_CLIENT_LIST = resolvePath('customer/recommend/mine')

src/pages/activity/activity.js

@@ -1,5 +1,5 @@
 import Taro, { Component } from '@tarojs/taro';
-import ListView from '@components/ListView'
+import Authorize from '@components/authorize'
 import './index.scss'
 import { AtTabs, AtTabsPane } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
@@ -10,10 +10,9 @@ import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 
 
-
 let pageIndex = 1
 
-@connect(state => state.city)
+@connect(({ user, city }) => ({ user, city }))
 export default class active extends Component {
 
   config = {
@@ -29,12 +28,19 @@ export default class active extends Component {
     this.setState({
       current: value
     })
+  }  
+
+  renderLogin() {
+    return <Authorize></Authorize>
   }
 
   render() {
-    const { isEmpty, hasMore, list } = this.state
-    return (
+    const { user } = this.state
+    // if (!user || !user.phone) {
+    //   return this.renderLogin()
+    // }
 
+    return (!user || !user.phone) ? this.renderLogin() : (
       <View style="height:100vh">
         <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >

src/pages/activity/detail/index.js

@@ -7,7 +7,7 @@ import dayjs from 'dayjs'
 import WxParse from '@components/wxParse/wxParse'
 import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
-import { getDownloadURL } from '@utils/tools'
+import { getDownloadURL, times } from '@utils/tools'
 import {
   addActivityShareNum,
   signupActivity,
@@ -38,7 +38,7 @@ export default class Detail extends Component {
     posterShow: false,
     posterData: {},
     posterVisible: false,
-    selector: ['1', '2', '3'],
+    selector: [],
     selectorChecked: '1',
     canChoose: 'none',
     inputName: ''
@@ -68,8 +68,10 @@ export default class Detail extends Component {
         detail: res,
         isSaved,
         isSign,
-        loaded: true
+        loaded: true,
+        selector: times(res.maxEnlistByPerson || 1).map((_, i) => `${i+1}`),
       }, () => {
+        console.log('-----state-->', this.state)
         const { detail } = this.state
         if (detail.posters[0].posterImg) {
           this.setState({

src/pages/auth/index.js

@@ -15,6 +15,7 @@ export default class Index extends Component {
     const sessionKey = Taro.getStorageSync('sessionKey')
     // 获取用户信息
     Taro.getUserInfo({
+      lang: 'zh_CN',
       success: res => {
         const payload = Object.assign(res, { sessionKey })
         // const { userInfo: { nickName, gender, country, city, province } } = payload

src/pages/person/index.js

@@ -8,6 +8,9 @@ import Notice from '@components/Notice'
 
 import * as actions from '@actions/user'
 import Authorize from '@components/authorize'
+
+import { menus } from './menus'
+
 @connect(({ user, city }) => ({ user, city }), { ...actions })
 export default class Person extends Component {
   config = {
@@ -19,7 +22,8 @@ export default class Person extends Component {
     user: {},
     isAgent: false,//经纪人
     consultant: false,//置业顾问
-    tourist: false,//普通用户
+    tourist: false,//普通用户,
+    menus: [],
   }
 
   componentDidShow() {
@@ -32,7 +36,8 @@ export default class Person extends Component {
     queryUserInfo().then(user => {
       this.setState({
         user,
-        phone: user.phone
+        phone: user.phone,
+        menus: menus.map(group => group.filter(x => x.userTypes.indexOf(user.personType) > -1))
       }, () => {
         if (user.personType != ROLE_CODE['CHANNEL_AGENT'] && user.personType != ROLE_CODE['ESTATE_AGENT'] && user.personType != 'Realty Consultant') {
           this.setState({ tourist: true, phone: user.phone })
@@ -87,65 +92,8 @@ export default class Person extends Component {
     })
   }
 
-  toFavor() {
-    Taro.navigateTo({
-      url: '/pages/person/favorite/index'
-    })
-  }
-  toAgentClient() {
-    Taro.navigateTo({
-      url: '/pages/agent/client/index'
-    })
-  }
-  toAssemble() {
-    Taro.navigateTo({
-      url: '/pages/activity/assemblePage'
-    })
-  }
-  toAssistance() {
-    Taro.navigateTo({
-      url: '/pages/activity/assistancePage'
-    })
-  }
-  toProfile() {
-    Taro.navigateTo({
-      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/myActivity?from=mine'
-    })
-  }
-  toRecord() {
-    Taro.navigateTo({
-      url: '/pages/shop/record/index'
-    })
-  }
-  toToolkit() {
-    Taro.navigateTo({
-      url: '/pages/toolKit/index'
-    })
-  }
-  toPolicy() {
-    Taro.navigateTo({
-      url: '/pages/policy/index?from=mine'
-    })
-  }
-  toFeedback() {
-    Taro.navigateTo({
-      url: '/pages/person/feedback/index'
-    })
+  redirectTo(url) {
+    Taro.navigateTo({ url })
   }
 
   getRoleName(type) {
@@ -195,7 +143,7 @@ export default class Person extends Component {
   }
 
   renderDetail() {
-    const { user, isAgent, consultant, tourist } = this.state
+    const { user, menus, isAgent, consultant, tourist } = this.state
     // const isConsultant = user.personType == ROLE_CODE['CONSULTANT']
     // const isConsultant = user.personType
     return (
@@ -234,199 +182,29 @@ export default class Person extends Component {
           </View>
         </View>
         <View>
-          <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>
-
-          </View>
-          <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>
-          </View>
-          <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>
-          </View>
-          <View className='line'></View>
-          <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>
-
-          </View>
-          <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>
-
-          </View>
-          <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>
-
-          </View>
-          <View className='line'></View>
-          <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>
-
-          </View>
-          <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>
-
-          </View>
-          <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>
-
-          </View>
-          <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>
-
-          </View>
-          <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>
-
-          </View>
-          <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>
-
-          </View>
+          {
+            menus.map((group, ginx) => {
+              return (
+                <Block key={`grp-${ginx}`}>
+                  {
+                    group.map((menu, inx) => {
+                      return (
+                        <View onClick={() => this.redirectTo(menu.url)} className="menu-item-con" key={`menu-${inx}`}>
+                          <Image className="left-icon" src={menu.icon} ></Image>
+                          <View className="menu-maintext">
+                            <Text className="menu-name">{menu.name}</Text>
+                            <Text className="right-icon"></Text>
+                          </View>        
+                        </View>
+                      )
+                    })
+                  }
+                  <View className='line'></View>
+                </Block>
+              )
+            })
+          }
         </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`}>
-            <Image src={require('@assets/person/wode.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`}>
-            <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' && (<View className='menu-item' onClick={this.toClientPage}>
-            <Image src={require('@assets/person/kehu.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>我的客户</Text>
-          </View>)} */}
-
-        {/* <Navigator className='menu-item' hover-class="none" url="/pages/person/feedback/index">
-            <Image src={require('@assets/person/fankui.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>意见反馈</Text>
-          </Navigator> */}
-
-        {/* <Navigator className='menu-item' hover-class="none" url="/pages/shop/record/index">
-            <Image src={require('@assets/person/shijian.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>兑换记录</Text>
-          </Navigator> */}
-
-        {/* <Navigator className='menu-item' hover-class="none" url="/pages/activity/index?from=mine">
-            <Image src={require('@assets/person/huodong.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>我的活动</Text>
-          </Navigator> */}
-
-        {/* <View className='menu-item' onClick={this.toFavor}>
-            <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`}>
-            <Image src={require('@assets/person/yaoqing.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'] || user.personType == ROLE_CODE['CONSULTANT']) && (<Navigator className="menu-item" hover-class="none" url={`/pages/person/spread/index`}>
-            <Image src={require('@assets/tui.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>我的推广码</Text>
-          </Navigator>)}
-        </View> */}
-        {/* VIP积分 */}
-        {/* <View className='integral'>
-          <Image src={require('@assets/person/vip.png')} className='integral-img' mode="widthFix" onClick={this.doSign}></Image>
-          <Image src={require('@assets/person/fanhui.png')} className='goto_btn' mode="widthFix"></Image>
-        </View> */}
-        {/* <View className='line'></View>
-        <View className='menu menu2'>
-          <View className='menu-tit'>我的服务</View>
-          <Navigator className='menu-item' hover-class="none" url="/pages/toolKit/index?from=mine">
-            <Image src={require('@assets/person/jisuanqi.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>房贷计算</Text>
-          </Navigator> */}
-        {/* <Navigator className='menu-item' hover-class="none" url="/pages/policy/index?from=mine">
-            <Image src={require('@assets/person/zheng.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>购房政策</Text>
-          </Navigator> */}
-        {/* <View className='menu-item' onClick={this.handleMore}>
-            <Image src={require('@assets/person/more.png')} className='menu-item_img' mode="widthFix"></Image>
-            <Text className='menu-item_txt'>敬请期待</Text>
-          </View>
-        </View> */}
       </View>
     );
   }
@@ -436,7 +214,7 @@ export default class Person extends Component {
     return (
       <View className='wrap'>
         {phone && this.renderDetail()}
-        {!phone && this.renderLogin()}
+        {/* {!phone && this.renderLogin()} */}
       </View>
     )
   }

src/pages/person/menus.js

@@ -0,0 +1,123 @@
+import { ROLE_CODE } from '@constants/user'
+
+export const icons = {
+  homepage: require('@assets/mine/homepage.png'),
+  recommend: require('@assets/mine/recommend.png'),
+  development: require('@assets/mine/development.png'),
+  activities: require('@assets/mine/activities.png'),
+  regiment: require('@assets/mine/regiment.png'),
+  help: require('@assets/mine/help.png'),
+  collection: require('@assets/mine/collection.png'),
+  exchange: require('@assets/mine/exchange.png'),
+  profile: require('@assets/mine/profile.png'),
+  calculator: require('@assets/mine/calculator.png'),
+  encyclopedia: require('@assets/mine/encyclopedia.png'),
+  feedback: require('@assets/mine/feedback.png'),
+}
+
+const DRIFT = ROLE_CODE['DRIFT']
+const CUSTOMER = ROLE_CODE['CUSTOMER']
+const CONSULTANT = ROLE_CODE['CONSULTANT']
+const ESTATE_AGENT = ROLE_CODE['ESTATE_AGENT']
+const CHANNEL_AGENT = ROLE_CODE['CHANNEL_AGENT']
+
+export const menus = [
+  [
+    {
+      name: '我的主页',
+      url: '/pages/agent/index',
+      icon: icons.homepage,
+      extends: undefined,
+      userTypes: [CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '成为经纪人',
+      url: '/pages/agent/become/index',
+      icon: icons.development,
+      extends: undefined,
+      userTypes: [CUSTOMER],
+    },
+    {
+      name: '推荐客户',
+      url: '/pages/agent/client/index',
+      icon: icons.recommend,
+      extends: undefined,
+      userTypes: [ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '发展经纪人',
+      url: '/pages/agent/invitation/index',
+      icon: icons.development,
+      extends: undefined,
+      userTypes: [ESTATE_AGENT, CHANNEL_AGENT],
+    },
+  ],
+  [
+    {
+      name: '我的活动',
+      url: '/pages/activity/index?from=mine',
+      icon: icons.activities,
+      extends: undefined,
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '我的拼团',
+      url: '/pages/activity/assemblePage',
+      icon: icons.regiment,
+      extends: undefined,
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '我的助力',
+      url: '/pages/activity/assistancePage',
+      icon: icons.regiment,
+      extends: undefined,
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+  ],
+  [
+    {
+      name: '我的收藏',
+      url: '/pages/person/favorite/index',
+      icon: icons.collection,
+      extends: undefined,
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '我的资料',
+      url: '/pages/person/profile/index',
+      icon: icons.profile,
+      extends: undefined,
+      userTypes: [CUSTOMER, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '兑换记录',
+      url: '/pages/shop/record/index',
+      icon: icons.exchange,
+      extends: undefined,
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '房贷计算器',
+      url: '/pages/toolKit/index',
+      icon: icons.calculator,
+      extends: undefined,
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '购房百科',
+      url: '/pages/policy/index?from=mine',
+      icon: icons.encyclopedia,
+      extends: undefined,
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+    {
+      name: '意见反馈',
+      url: '/pages/person/feedback/index',
+      icon: icons.feedback,
+      extends: undefined,
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
+  ],
+]
+

src/pages/project/map/index.js

@@ -38,6 +38,8 @@ export default class Index extends Component {
       }, () => {
         const { list } = this.state
         list.forEach(function (val, index) {
+          if (!val.coordinate || val.coordinate.indexOf(',') === -1) return
+
           let coord = val.coordinate.split(',')
           let latitude = parseFloat(coord[0])
           let longitude = parseFloat(coord[1])

src/pages/shop/index.js

@@ -7,7 +7,7 @@ import './index.scss'
 // import Search from '@components/search'
 import Banner from './banner'
 import ready from '@utils/ready'
-// import { ROLE_CODE } from '@constants/user'
+import { ROLE_CODE } from '@constants/user'
 import { queryBanners } from '@services/common'
 import { getGoodsBuilding, getGoodsList } from '@services/item'
 import { connect } from '@tarojs/redux'
@@ -333,11 +333,11 @@ export default class Shop extends Component {
   render() {
     const { person: { personType } } = this.props.userInfo
     //const { person: { phone } } = this.props.userInfo
-    // const isDrift = personType === ROLE_CODE['DRIFT']
+    const isDrift = personType === ROLE_CODE['DRIFT']
 
     return (
       <View className='wrap'>
-        {personType == 'drift' ? this.renderLogin() : this.renderDetail()}
+        {isDrift ? this.renderLogin() : this.renderDetail()}
       </View>
     )
   }

src/utils/tools.js

@@ -23,6 +23,8 @@ export function formateLeftTime(leftTime) {
 }
 
 export function getDownloadURL(url, type) {
+  if (!url) return url
+
   switch (type) {
     case 'avatar':
       return url.replace('https://wx.qlogo.cn/', `${HOST}/qlogo/`);