lf

config/dev.js

@@ -5,13 +5,18 @@ 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"',
+<<<<<<< HEAD
     HOST: '"http://192.168.2.52:8080"',
     WSS_HOST: '"ws://192.168.2.52:8080"',
     Version:'V3.5.2.2_1210'
+=======
+    // HOST: '"http://192.168.2.52:8080"',
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
+>>>>>>> 7a04f681842a549f9f6b650f1bf35926f30961d7
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -5,11 +5,18 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.0.218:8080"',
     // WSS_HOST: '"ws://192.168.0.218:8080"',
+<<<<<<< HEAD
     // HOST: '"https://dev.jinchengjiaye.com"',
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     HOST: '"https://lt.pawoma.cn"',
     WSS_HOST: '"wss://lt.pawoma.cn"',
     Version:'V3.5.2.2_1210'
+=======
+    HOST: '"https://dev.jinchengjiaye.com"',
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST: '"https://lt.pawoma.cn"',
+    // WSS_HOST: '"wss://lt.pawoma.cn"',
+>>>>>>> 7a04f681842a549f9f6b650f1bf35926f30961d7
   },
   weapp: {},
   h5: {}

src/pages/activity/activity.js

@@ -38,19 +38,32 @@ export default class active extends Component {
       console.log('活动列表')
     })
   }
-  componentWillMount() {
-    if (Taro.getApp().props.projectIndex) {
-      this.setState({
-        current: 1
-      })
-    }
-    else {
-      this.setState({
-        current: 0
-      })
-    }
-  }
-
+  // componentWillMount() {
+  //   console.log(Taro.getApp().props, "Taro.getApp()")
+  //   if (Taro.getApp().props.projectIndex) {
+  //     this.setState({
+  //       current: 1
+  //     })
+  //   }
+  //   else {
+  //     this.setState({
+  //       current: 0
+  //     })
+  //   }
+  // }
+  // componentDidShow() {
+  //   if (Taro.getApp().props.projectIndex == 1) {
+  //     this.setState({
+  //       current: 1
+  //     })
+  //     Taro.getApp().props.projectIndex = 2
+  //   }
+  //   else {
+  //     this.setState({
+  //       current: 0
+  //     })
+  //   }
+  // }
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)

src/pages/person/accessRecord.js

@@ -127,7 +127,7 @@ export default class Person extends Component {
               moreRecord.map(item => (
                 <View className="activity-item">
                   <View className="name">{item.activityName || '　'}</View>
-                  <View className="time">{`${dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</View>
+                  <View className="time">{`${dayjs(item.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}</View>
                 </View>
               ))
             }
@@ -157,9 +157,9 @@ export default class Person extends Component {
               recordList.map(item => (
                 <View className='item' key={item + 'more'}>
                   {item.myCustomer == 1 && <View className="tag">我的客户</View>}
-                  <Image className="touxiang" src={require('@assets/default-avatar.png')}></Image>
+                  <Image className="touxiang" src={item.avatarurl || require('@assets/default-avatar.png')}></Image>
                   <View className="info-top">
-                    <View className="name">{item.userName || '　'}</View>
+                    <View className="name">{item.userName || item.nickname || '　'}</View>
                     <View style="display: flex;align-items: center;" onClick={this.handleChatClick.bind(this, item)}><Image className="goutong-icon" src={require('@assets/person/zixun.png')}></Image><Text className="goutong">在线沟通</Text></View>
                   </View>
                   <View className="activity-name" onClick={this.showActivityList.bind(this, item)}>
@@ -167,7 +167,7 @@ export default class Person extends Component {
                   </View>
                   <Text className="right-icon"></Text>
                   <View className="activity-time">
-                    {`${dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}`}
+                    {`${dayjs(item.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}
                   </View>
                 </View>
               ))

src/pages/project/detail/index.scss

@@ -612,12 +612,12 @@
 
       .top__txt {
         font-size: 26px;
-        width: 30%;
+        width: 27%;
         color: rgba(0, 0, 0, 0.37);
       }
 
       .bottom__img {
-        width: 70%;
+        width: 73%;
         display: flex;
         align-items: center;
         margin-left: 5px;
@@ -634,7 +634,7 @@
             width: 52px;
             height: 52px;
             margin-left: -10px;
-            border-radius: 50%;
+            border-radius: 200%;
             box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.14);
             border: 2px solid rgba(255, 255, 255, 1);
           }
@@ -674,7 +674,7 @@
       .avatar {
         width: 70px;
         height: 70px;
-        border-radius: 50%;
+        border-radius: 200%;
         margin-right: 30px;
       }
 

src/pages/project/h5Page.js

@@ -34,12 +34,15 @@ export default class Index extends Component {
     const firstShare = this.$router.params.firstShare || router.query.firstShare || ""
     const consultant = this.$router.params.consultant || router.query.consultant || ""
     const sharePersonId = this.$router.params.sharePersonId || router.query.sharePersonId || ""
+    const { pageInfo } = this.state
+    const targetId = pageInfo.drainageId || this.$router.params.id || router.query.id || ""
     savePoint({
       event: 'detail',
       eventType: 'h5',
       propertyName: 'h5活动',
       consultantId: consultant,
       sharePersonId: sharePersonId,
+      targetId: targetId,
       data: '{"firstShare":"' + firstShare + '"}'
     }).then(res => {
       this.setState({
@@ -72,14 +75,17 @@ export default class Index extends Component {
 
   currentPageAndParams() {
     const { userInfo: { person } } = this.props
+    const router = Taro.getStorageSync('router')
+
     const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
     const firstShare = this.$router.params.firstShare || person.personId
+    const id = this.$router.params.id || router.query.id || ""
 
     let queryParams = [
       `sharePersonId=${person.personId}`,
       `consultant=${consultant}`,
       `firstShare=${firstShare}`,
-      `id=${this.$router.params.id}`
+      `id=${id}`
     ]
 
 
@@ -94,6 +100,7 @@ export default class Index extends Component {
     ready.queue(() => {
 
       if (this.$router.params.scene) {
+
         getQrCodeParams(this.$router.params.scene).then((_, codeParams) => {
           this.setState({
             codeParams: codeParams || ''
@@ -101,6 +108,7 @@ export default class Index extends Component {
           console.log(res, "解析二维码返回值")
         })
       }
+<<<<<<< HEAD
       // h5id 、第一个分享人ID、置业顾问ID、分享人ID
       getHFiveDetail(this.$router.params.id).then(res => {
         if(res.status==1){
@@ -118,6 +126,19 @@ export default class Index extends Component {
             })
           })
         }
+=======
+      console.log(this.$router, "this.$router")
+      const router = Taro.getStorageSync('router')
+      console.log(router, "router")
+      const hFiveId = this.$router.params.id || router.query.id || ""
+      console.log(hFiveId, "hFiveId")
+      // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
+      getHFiveDetail(hFiveId).then(res => {
+        // debugger
+        this.setState({
+          pageInfo: res
+        })
+>>>>>>> 7a04f681842a549f9f6b650f1bf35926f30961d7
       })
       const { userInfo: { person: { avatarurl, phone } } } = this.props
       console.log(this.props, "this.propsthis.propsthis.props")
@@ -126,6 +147,7 @@ export default class Index extends Component {
         this.setState({
           avatarVisible: false,
         })
+        console.log(phone, "phone#########")
         // 头像手机号都有
         if (phone) {
 
@@ -155,6 +177,7 @@ export default class Index extends Component {
       avatarVisible: false,
       phoneVisible: true,
     })
+
     console.log("授权头像成功！")
   }
   // 授权用户信息
@@ -169,9 +192,15 @@ export default class Index extends Component {
         const payload = Object.assign(res, { sessionKey })
         // 用户信息保存至服务器
         dispatchUpdateUserInfo(payload).then(res => {
-          console.log('获取用户信息成功')
           this.onAvatarSuccess();
+          console.log('获取用户信息成功')
           Taro.hideLoading()
+          const { userInfo: { person: { phone } } } = this.props
+          if (phone) {
+            this.setState({
+              phoneVisible: false,
+            })
+          }
         })
       },
       fail: (err) => {

src/pages/project/index.js

@@ -153,7 +153,7 @@ export default class Index extends Component {
     this.loadBannerList()
     this.loadHelpGroupList()
     this.loadNewsList()
-    this.loadActivityList()
+    // this.loadActivityList()
     this.loadList()
 
   }
@@ -191,7 +191,6 @@ export default class Index extends Component {
   }
   loadBannerList() {
     const { curCity } = this.props
-    console.log(this.props, 'this.props')
     // 获取首页banner
     const payload = {
       showPosition: 'index'
@@ -214,7 +213,6 @@ export default class Index extends Component {
 
   loadHelpGroupList() {
     queryHelpGroup({ cityId: this.props.curCity.id, buildingId: '' }).then(res => {
-      console.log(res, "res")
       this.setState({
         helpGroupList: res || []
       })
@@ -239,30 +237,31 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityList() {
-    const { curCity } = this.props
-    const payload = {
-      pageNumber: 1,
-      pageSize: 1
-    }
-    if (curCity.id) {
-      payload.cityId = curCity.id
-    }
-    queryActivityList(payload).then(res => {
-      this.setState({
-        activityList: res.list || []
-      }, () => {
-        console.log(this.state.activityList)
-      })
-    })
-  }
+  // loadActivityList() {
+  //   const { curCity } = this.props
+  //   const payload = {
+  //     pageNumber: 1,
+  //     pageSize: 1
+  //   }
+  //   if (curCity.id) {
+  //     payload.cityId = curCity.id
+  //   }
+  //   queryActivityList(payload).then(res => {
+  //     this.setState({
+  //       activityList: res.list || []
+  //     }, () => {
+  //       console.log(this.state.activityList)
+  //     })
+  //   })
+  // }
 
   loadList() {
     const { keywords } = this.state
     const { curCity } = this.props
 
     const payload = {
-      name: keywords
+      name: keywords,
+      pageSize: 999
     }
     if (curCity.id) {
       payload.cityId = curCity.id
@@ -318,9 +317,8 @@ export default class Index extends Component {
   }
 
   handleBannerClick = (item) => {
-    if (item.contentType != "nothing") {
+    if (item.contentType && item.contentType != "nothing") {
       this.redirectTo(item)
-      console.log(item.targetId, "item.targetId")
     } else {
       console.log(item, "item")
     }
@@ -415,9 +413,8 @@ export default class Index extends Component {
   }
 
   handleMaskBannerClick(data) {
-    console.log(data, "data")
-    this.redirectTo(data)
 
+    this.redirectTo(data)
 
   }
 
@@ -651,7 +648,7 @@ export default class Index extends Component {
                         {
                           newsList.map((list, inx) => {
                             return (
-                              <SwiperItem key={`img-${inx}`}>
+                              <SwiperItem key={`news-${inx}`}>
                                 <View className="notice-text" onClick={this.handleNoticeClick.bind(this, list)}>
                                   {list.newsName}
                                 </View>