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

.project

@@ -42,5 +42,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1577260405326</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

src/components/authorizationComponent/index.js

@@ -16,7 +16,7 @@ export default class Index extends Component {
   }
   componentWillMount() {
     const { user = {} } = this.props
-    // this.toggleGrantAvatar()
+    this.toggleGrantAvatar()
   }
 
   toggleGrantAvatar = () => {
@@ -53,7 +53,10 @@ export default class Index extends Component {
         // 用户信息保存至服务器
         dispatchUpdateUserInfo(payload).then(res => {
           console.log('更新信息')
-          this.setState({isLogin:true})
+          this.setState({
+          	isLogin:true,
+          	
+          })
         })
       },
       fail: (err) => {
@@ -70,6 +73,7 @@ export default class Index extends Component {
   }
 
   getPhoneNumber(e) {
+  	const { userInfo: { person: { personId } } } = this.props
     getUserPhone(e, (phoneNumber) => {
       const { dispatchUpdateUserInfoNew } = this.props
       if (!phoneNumber) {
@@ -79,14 +83,14 @@ export default class Index extends Component {
         })
         return
       } else {
-        dispatchUpdateUserInfoNew(this.state.user.id)
+        dispatchUpdateUserInfoNew(personId)
         this.setState({isPhone:true})
       }
     })
   }
 
   render() {
-    const {user}=this.state
+    const { userInfo: { person: { avatarurl,nickname } } } = this.props
     if (!this.state.isLogin) {
       return (
         <View className="avatar-page">
@@ -101,8 +105,8 @@ export default class Index extends Component {
     } else if (!this.state.isPhone) {
       return (
         <View className='auth-page'>
-          <Image className="avatar_img" src={user.avatar} />
-          <View className="user_name">{user.nickname}</View>
+          <Image className="avatar_img" src={avatarurl} />
+          <View className="user_name">{nickname}</View>
           <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
           {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
         </View>

src/pages/news/detail/index.js

@@ -12,6 +12,7 @@ import { getQrCodeParams } from '@utils/qrcode'
 import { getCardDetail } from '@services/card'
 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
+import authorizationComponent from '@components/authorizationComponent'
 import { reportClient } from '@services/report'
 import {
   addNewsUv,
@@ -310,7 +311,7 @@ export default class NewsDetail extends Component {
       console.info('生成资讯详情海报')
     })
   }
-  render() {
+  renderNews() {
     const { detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     return (
@@ -370,4 +371,12 @@ export default class NewsDetail extends Component {
       </Block>
     );
   }
+  
+  render(){
+  	return (
+  		<authorizationComponent>
+  			{this.renderNews()}
+  		</authorizationComponent>
+  	)
+  }
 }