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

src/pages/agent/recommend/index.js

@@ -69,12 +69,16 @@ export default class Index extends Component {
       reType: type || "",
 
     }, () => {
-      console.log(this.state.sex, "sex")
-      console.log('buildingName' + this.props.proList.records[0].buildingName)
+      console.log(this.props.projectDetail.buildingName, "this.props.projectDetail.buildingName")
+
+      if (this.props.proLis) {
+        console.log('buildingName' + this.props.proList.records[0].buildingName)
+      }
+
       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
+          intention: this.props.projectDetail.buildingName || this.props.proList.records[0].buildingName,
+          floor: this.props.projectDetail.buildingId || this.props.proList.records[0].buildingId
         }, () => {
           if (this.state.floorID != 0 || this.state.intention) {
             this.loadCardList()
@@ -217,7 +221,7 @@ export default class Index extends Component {
     })
   }
   Alert(content, title) {
-    title = title ? title : "温馨提示";
+    title = title || "温馨提示";
     content = content.toString();
     Taro.showModal({
       title: title,

src/pages/project/h5Page.js

@@ -267,10 +267,12 @@ export default class Index extends Component {
 
   // 授权用户信息
   getUserInfo() {
+    console.log('好哈哈')
     const { dispatchUpdateUserInfo } = this.props
     const sessionKey = Taro.getStorageSync('sessionKey')
 
     Taro.showLoading()
+
     Taro.getUserInfo({
       lang: 'zh_CN',
       success: res => {
@@ -286,7 +288,9 @@ export default class Index extends Component {
       fail: (err) => {
         Taro.hideLoading()
         console.error(err)
-
+        this.setState({
+          avatarVisible: true,
+        })
         Taro.showToast({
           title: '获取用户信息失败',
           icon: 'none'
@@ -295,7 +299,12 @@ export default class Index extends Component {
       }
     })
   }
-
+  userInfoClick() {
+    console.log('userInfoClick')
+    this.setState({
+      avatarVisible: false,
+    })
+  }
   // 授权手机号
   getPhoneNumber(e) {
     getUserPhone(e, (phoneNumber) => {
@@ -350,7 +359,7 @@ export default class Index extends Component {
               <View className="title">授权头像，围观活动</View>
               <View className="touxiang"><open-data type="userAvatarUrl"></open-data></View>
               <View className="name"><open-data type="userNickName"></open-data></View>
-              <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
+              <Button className="btn" open-type="getUserInfo" lang="zh_CN" onClick={this.userInfoClick} onGetUserInfo={this.getUserInfo}>好</Button>
             </View>
           }
           {phoneVisible && h5Id &&