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

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/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/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) {
@@ -138,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 (
@@ -153,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'}`}

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: '兑换记录',