commit

config/dev.js

@@ -9,13 +9,8 @@ module.exports = {
     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"',
-=======
-    HOST: '"http://192.168.2.52:8080"',
-    WSS_HOST: '"ws://192.168.2.52:8080"',
->>>>>>> 6d2db04a857d72bc8504b0f061c8baf8a3c98aba
   },
   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>
               ))
             }

src/pages/project/h5Page.js

@@ -100,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 || ''
@@ -114,6 +115,7 @@ export default class Index extends Component {
       console.log(hFiveId, "hFiveId")
       // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
       getHFiveDetail(hFiveId).then(res => {
+        // debugger
         this.setState({
           pageInfo: res
         })
@@ -125,6 +127,7 @@ export default class Index extends Component {
         this.setState({
           avatarVisible: false,
         })
+        console.log(phone, "phone#########")
         // 头像手机号都有
         if (phone) {
 
@@ -154,6 +157,7 @@ export default class Index extends Component {
       avatarVisible: false,
       phoneVisible: true,
     })
+
     console.log("授权头像成功！")
   }
   // 授权用户信息
@@ -168,9 +172,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) => {