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

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.84:8080"',
-    WSS_HOST: '"ws://192.168.0.84:8080"',
+    // HOST: '"http://192.168.0.84:8080"',
+    // WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/components/achievePhone/index.js

@@ -12,6 +12,7 @@ export default class Index extends Component {
 
   componentDidMount() {
     const { user = {}} = this.props
+    console.log('111')
     if (user.phone && typeof this.props.onSuccess === 'function') {
       this.props.onSuccess();
     }

src/components/authorize/index.js

@@ -11,7 +11,7 @@ export default class Index extends Component {
     navigationBarTitleText: '我的'
   }
   state = {
-    user:{}
+    user: {}
   }
   componentWillMount() {
     this.loadUserInfo()
@@ -25,11 +25,18 @@ export default class Index extends Component {
           icon: 'none'
         })
         return
-      }else{
+      } else {
         this.props.dispatchUpdateUserInfoNew(this.state.user.id)
-        Taro.reLaunch({
+        if (this.props.from) {
+          Taro.reLaunch({
+            url: this.props.from
+          })
+        } else {
+          Taro.reLaunch({
             url: '/pages/person/index'
-         })
+          })
+        }
+
       }
     })
   }
@@ -49,12 +56,12 @@ export default class Index extends Component {
   }
 
   render() {
-    const {user}=this.state
+    const { user } = this.state
     return (
       <View className='auth-page'>
-        <Image className="avatar_img" src={user.avatar}/>
+        <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>
+        <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
         <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View>
       </View>
     )

src/pages/activity/activity.js

@@ -52,7 +52,7 @@ export default class active extends Component {
   }
 
   renderLogin() {
-    return <Authorize></Authorize>
+    return <Authorize from="/pages/activity/activity"></Authorize>
   }
 
   render() {

src/pages/agent/recommend/index.js

@@ -5,6 +5,8 @@ import { getItemList } from '@services/item'
 import { getCardList } from '@services/card'
 import { savePoint, updatePoint } from '@services/common'
 
+import Authorize from '@components/authorize'
+
 import { connect } from '@tarojs/redux'
 @connect(({ user, card, project }) => ({ ...user, ...card, ...project }))
 export default class Index extends Component {
@@ -414,7 +416,11 @@ export default class Index extends Component {
       sex: e.detail.value
     })
   }
-  render() {
+  renderLogin () {
+    return <Authorize from="/pages/agent/recommend/index"></Authorize>
+  }
+
+  renderDetail() {
     const { reType } = this.state
     return (
       <View className='recommend__customers'>
@@ -473,4 +479,13 @@ export default class Index extends Component {
       </View>
     );
   }
+  render() {
+    const { person: { phone, tel } } = this.props.userInfo
+    return (
+      <View style="width:100%;height:100%">
+    {console.log(this.props.userInfo,'this.props.userInfo')}
+      {(!phone && !tel) ? this.renderLogin() : this.renderDetail()}
+    </View>
+    );
+  }
 }

src/pages/person/index.js

@@ -160,7 +160,7 @@ export default class Person extends Component {
   }
 
   renderLogin () {
-    return <Authorize></Authorize>
+    return <Authorize from="/pages/person/index"></Authorize>
   }
 
   renderDetail () {

src/pages/project/detail/index.js

@@ -946,7 +946,11 @@ export default class Index extends Component {
     // })
     videoContext.play()
   }
-
+  bindended(){
+    let videoContext = wx.createVideoContext('myVideo')
+    console.log()
+    videoContext.seek(1)
+  }
   // onPlay () {
   //   console.log()
   //   this.setState({
@@ -983,6 +987,7 @@ export default class Index extends Component {
           }}
           id='myVideo'
           controls={true}
+          bindended={this.bindended}
           // autoplay={false}
           // initialTime='0'
           // loop={true}

src/pages/project/detail/index.scss

@@ -399,6 +399,8 @@
       .bold {
         font-size: 40px;
         font-weight: bold;
+        max-width: 560px;
+        white-space: normal;
       }
 
       .favor-btn {

src/pages/project/index.js

@@ -20,6 +20,7 @@ import * as actions from '@actions/project'
 import { getThumbnail } from '@utils/tools'
 import QQMapWX from '@lib/qqmap-wx-jssdk.min'
 import Notice from '@components/Notice'
+import Authorize from '@components/authorize'
 
 const accountInfo = wx.getAccountInfoSync();
 
@@ -27,7 +28,6 @@ const accountInfo = wx.getAccountInfoSync();
   state => ({ ...state.project, ...state.city, ...state.user }),
   { ...actions, dispatchCitySelected }
 )
-
 export default class Index extends Component {
   config = {
     navigationBarTitleText: '橙蕉'
@@ -46,7 +46,8 @@ export default class Index extends Component {
     recordId: null,
     visBanner: false,
     indicatorDots: false,
-    vertical: true
+    vertical: true,
+    achieve: false
   }
 
   componentWillMount () {
@@ -101,9 +102,9 @@ export default class Index extends Component {
       const payload = { location: `${location.longitude},${location.latitude}` }
 
       getLocationCity(payload).then(res => {
-        console.log(res,"!!!!!!!!!!!!!!!!!11res=========")
+      
         let curCity = cityList.filter(item => {
-          return item.name == res.name
+          return item.name == res.name || ''
         })
 
         console.log('-----curCity-->', curCity)
@@ -132,37 +133,8 @@ export default class Index extends Component {
       this.updateCity(defaultCity)
     })
   }
-  updateCity(payload) {
-    const NanJing = {
-      citycode: "025",
-      id: 320100,
-      initial: "N",
-      lat: "32.041544",
-      leveltype: 2,
-      lng: "118.767413",
-      name: "南京市",
-      parentid: 320000,
-      pinyin: "Nanjing",
-      shortname: "南京",
-      status: 1,
-      zipcode: "320100"
-    }
-
-    const appId = accountInfo.miniProgram.appId;
-    let params;
-
-    switch (appId) {
-      // 知与行联调
-      case 'wxd9ee3a9480a4e544':
-        params = NanJing;
-        break;
-
-      default:
-        params = payload;
-        break;
-    }
-
-    this.props.dispatchCitySelected(params).then(res => {
+  updateCity (payload) {
+    this.props.dispatchCitySelected(payload).then(res => {
       this.loadData()
     })
   }
@@ -284,9 +256,9 @@ export default class Index extends Component {
           title: '当前城市暂无楼盘',
           icon: 'none'
         })
-     
+
       }
-    
+
       Taro.hideLoading()
       this.setState({
         loaded: true
@@ -438,12 +410,17 @@ export default class Index extends Component {
     const {
       userInfo: { person: { personType } }
     } = this.props
+
     if (personType === ROLE_CODE['DRIFT'] || !personType) {
       // 游客或者客户 区别是否有电话
+      // this.setState({
+      //   achieve: true
+      // })
       Taro.navigateTo({
-        url: `/pages/agent/become/index`
+        url: `/pages/agent/recommend/index?type=index&cityId=` + this.props.curCity.id
       })
     } else {
+
       Taro.navigateTo({
         url: `/pages/agent/recommend/index?type=index&cityId=` + this.props.curCity.id
       })
@@ -456,9 +433,18 @@ export default class Index extends Component {
     })
   }
 
+  handleAuthPhoneSuccess (curCity) {
+
+    console.log(curCity, 'curCity')
+
+    Taro.navigateTo({
+      url: `/pages/agent/recommend/index?type=index&cityId=` + curCity.id
+    })
+  }
+
 
   renderProjectList () {
-    const { proList: { records } } = this.props
+    const { proList: { records = [] } } = this.props
     const { helpGroupList } = this.state
     const list = records.filter(item => item.isMain === 1)
     console.log(records, 'proList')
@@ -537,15 +523,15 @@ export default class Index extends Component {
 
   render () {
     const { curCity } = this.props
-    const { newsList } = this.state
-    const { userInfo: { person: { personType } } } = this.props
-
+    const { newsList, achieve } = this.state
+    const { userInfo: { person: { personType, phone } } } = this.props
+    const { userInfo: { person } } = this.props
     return (
       <Block>
         {this.state.loaded && (
           <View className="page">
             <Notice></Notice>
-            <ScrollView
+            {!achieve && <ScrollView
               scrollY
               className='home'>
               <View className="section section-top" style={{ marginTop: 0, paddingTop: 0 }}>
@@ -602,8 +588,9 @@ export default class Index extends Component {
               {/* 推荐楼盘 */}
               {this.renderProjectList()}
 
-            </ScrollView>
-
+            </ScrollView>}
+            {/* user={person} onSuccess={()=>this.handleAuthPhoneSuccess(curCity) */}
+            {/* {achieve && <View style="width:100%;height:100%"><Authorize ></Authorize>  </View>} */}
             {this.state.maskVisible && this.renderMaskBanner()}
           </View >
         )}

src/pages/project/index.scss

@@ -3,7 +3,7 @@
 
 .page {
   width: 100vw;
-  // height: 100vh;
+  height: 100vh;
   background: #fff;
 }
 

src/pages/project/item/index.scss

@@ -51,6 +51,8 @@
       &__title {
         font-size: 32px;
         font-weight: bold;
+        max-width: 500px;
+        @include text-ellipsis;
       }
 
       &__price {

src/pages/shop/index.js

@@ -197,7 +197,7 @@ export default class Shop extends Component {
   }
 
   renderLogin () {
-    return <Authorize></Authorize>
+    return <Authorize from="/pages/shop/index"></Authorize>
   }
   handleBannerClick = (item) => {
     console.log(this, "this")