config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // 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"',
+    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.0.218:8080"',
-    // WSS_HOST: '"ws://192.168.0.218:8080"',
+    HOST: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/components/authorize/index.js

@@ -63,7 +63,7 @@ export default class Index extends Component {
         <Image className="avatar_img" src={user.avatar} />
         <View className="user_name">{user.nickname}</View>
         <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
-        <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View>
+        {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
       </View>
     )
   }

src/pages/agent/recommend/index.js

@@ -66,12 +66,12 @@ export default class Index extends Component {
     const { type } = this.$router.params
 
     this.setState({
-      reType: type,
+      reType: type || "",
 
     }, () => {
       console.log(this.state.sex, "sex")
       console.log('buildingName' + this.props.proList.records[0].buildingName)
-      if (this.state.reType != 'index') {
+      if (this.state.reType == 'projectDeatil') {
         this.setState({
           intention: this.props.projectDetail.buildingName ? this.props.projectDetail.buildingName : this.props.proList.records[0].buildingName,
           floor: this.props.projectDetail.buildingId ? this.props.projectDetail.buildingId : this.props.proList.records[0].buildingId
@@ -422,7 +422,7 @@ export default class Index extends Component {
 
   renderDetail() {
     const { reType, name, phone, floorArray, floorID, floorColor, intention, adviserArray, adviserID, adviserColor, remarks, radioList } = this.state
- 
+
     return (
       <View className='recommend__customers'>
         <View className='submit__infor ani'>
@@ -451,7 +451,7 @@ export default class Index extends Component {
           <View className='info info__4'>
             <Text className='customers__txt'>意向楼盘</Text>
             {
-              reType == 'index' ? (<Picker className='input customers__name' onChange={this.bindFloorChange} value={floorID} range={floorArray} range-key="buildingName">
+              reType != 'projectDeatil' ? (<Picker className='input customers__name' onChange={this.bindFloorChange} value={floorID} range={floorArray} range-key="buildingName">
                 <View class="picker overtext" style={floorColor}>
                   {floorArray[floorID].buildingName}
                 </View>

src/pages/card/index.js

@@ -7,6 +7,7 @@ import BackHomeBtn from '@components/BackHomeBtn'
 import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import AchievePhone from '@components/achievePhone'
+import AchieveAvatar from '@components/achieveAvatar'
 import { sceneInShare } from '@utils/tools'
 import { ROLE_CODE } from '@constants/user'
 import { addCardUv, addCardShareNum, favorCard, cancelFavorCard } from '@services/card'
@@ -38,6 +39,7 @@ export default class Index extends Component {
     bound: false,
     modalStatus: false,
     grantPhoneVisible: false, // 授权手机弹框
+    grantAvatarVisible: false, // 授权头像弹框
   }
 
   componentWillMount() {
@@ -62,6 +64,7 @@ export default class Index extends Component {
       this.initPageData()
     })
   }
+  
   initPageData() {
     const router = Taro.getStorageSync('router')
     const id = this.$router.params.id || router.query.id
@@ -143,12 +146,16 @@ export default class Index extends Component {
   }
 
   getLocation = () => {
-    const { cardInfo: { address, company } } = this.props
+    const { cardInfo: { address, company,coordinate } } = this.props
+    const coord = coordinate.split(',')
+    const latitude = parseFloat(coord[0])
+    const longitude = parseFloat(coord[1])
+    
     Taro.getLocation({ //返回可以用于Taro.openLocation的经纬度，官方提示bug: iOS 6.3.30 type 参数不生效，只会返回 wgs84 类型的坐标信息  
       success: function (res) {
         Taro.openLocation({
-          latitude: 31.979190,
-          longitude: 118.733660,
+          latitude,
+          longitude,
           name: company,
           address
         })
@@ -441,17 +448,30 @@ export default class Index extends Component {
     })
   }
   handleAuthPhoneSuccess = (phone) => {
-    const { person = {} } = this.props.userInfo || {}
-    if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
-      Taro.reLaunch({ url: '/pages/auth/index' })
-      return
-    }
-
-    this.setState({ grantPhoneVisible: false })
+    // const { person = {} } = this.props.userInfo || {}
+    // if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+    //   Taro.reLaunch({ url: '/pages/auth/index' })
+    //   return
+    // }
+
+    // this.setState({ grantPhoneVisible: false })
+    this.toggleGrantAvatar()
     this.initPageData()
     // this.handleModalConfirm(phone)
   }
+ // 调起授权头像
+ toggleGrantAvatar = () => {
+  const { userInfo: { person: { avatarurl } } } = this.props
+
+  if (!avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1) {
+    this.setState({ grantAvatarVisible: true })
+    return false
+  }
 
+  console.log(avatarurl,"avatarurl")
+  console.log(this.props.userInfo,"this.props")
+  return true
+}
   handeAuthPhoneFail = () => {
     Taro.showToast({
       title: '未授权手机号无法成为报备客户',
@@ -459,7 +479,7 @@ export default class Index extends Component {
     })
   }
   render() {
-    const { makePosterStatus, posterData, modalStatus, grantPhoneVisible } = this.state
+    const { makePosterStatus, posterData, modalStatus, grantPhoneVisible,grantAvatarVisible } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
     const { person: { personType, personId, phone, tel } } = userInfo
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
@@ -483,6 +503,10 @@ export default class Index extends Component {
           showAuthPhone &&
           <AchievePhone user={userInfo.person} onCancel={this.handeAuthPhoneFail} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
+        {
+          grantAvatarVisible &&
+          <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
+        }
         {
           // !showAuthPhone && visibleConfirmModal && (
           //   <View className="modal">

src/pages/card/poster.js

@@ -94,7 +94,7 @@ export default class Index extends Component {
         zIndex: 999
       },
       {
-        x: 100,
+        x: 80,
         y: 710,
         text: '长按识别小程序码',
         fontSize: 26,
@@ -105,7 +105,7 @@ export default class Index extends Component {
         zIndex: 100
       },
       {
-        x: 100,
+        x: 80,
         y: 755,
         text: '进入',
         fontSize: 26,
@@ -116,18 +116,18 @@ export default class Index extends Component {
         zIndex: 100
       },
       {
-        x: 170,
+        x: 140,
         y: 755,
         text: data.miniAppName,
         fontSize: 34,
         color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
-        width: (data.miniAppName || '').length * 30 + 60,
+        width: (data.miniAppName || '').length * 30 + 50,
         zIndex: 100
       },
       {
-        x: (data.miniAppName || '').length * 30 + 200,
+        x: (data.miniAppName || '').length * 30 + 156,
         y: 755,
         text: '查看',
         fontSize: 26,
@@ -160,9 +160,9 @@ export default class Index extends Component {
         borderRadius: 40,
       },
       {
-        width: 520,
+        width: 540,
         height: 160,
-        x: 60,
+        x: 50,
         y: 650,
         backgroundColor: '#F8F8F8',
         borderRadius: 10,

src/pages/news/item.scss

@@ -14,7 +14,7 @@
   }
 
   &-con {
-    width:450px;
+    width:430px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;

src/pages/person/authorize/index.js

@@ -48,7 +48,7 @@ export default class Index extends Component {
         <Image className="avatar_img" src={person.avatarurl}/>
         <View className="user_name">{person.nickname}</View>
         <Button  className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
-        <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View>
+        {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
       </View>
     )
   }

src/pages/person/customerAnalysis/index.js

@@ -59,18 +59,11 @@ export default class customer extends Taro.Component {
   }
 
   render() {
-    const tabList = [{ title: '客户分析' }, { title: '我的客户' }]
+    const tabList = [{ title: '我的客户' },{ title: '客户分析' }]
     const { customerNum, current } = this.state
     return (
       <AtTabs  className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
-        <AtTabsPane current={current} index={0} >
-          <View >
-            {
-              current != 1 && <Analysis></Analysis>
-            }
-          </View>
-        </AtTabsPane>
-        <AtTabsPane current={current} index={1}>
+         <AtTabsPane current={current} index={0}>
           <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>
@@ -84,6 +77,14 @@ export default class customer extends Taro.Component {
             </View>
           </View>
         </AtTabsPane>
+        <AtTabsPane current={current} index={1} >
+          <View >
+            {
+              current != 0 && <Analysis></Analysis>
+            }
+          </View>
+        </AtTabsPane>
+       
       </AtTabs>
     )
   }

src/pages/project/detail/index.js

@@ -406,7 +406,7 @@ export default class Index extends Component {
       })
     } else {
       Taro.navigateTo({
-        url: `/pages/agent/recommend/index`
+        url: `/pages/agent/recommend/index?type=projectDeatil` 
       })
     }
   }