Browse Source

Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform

koul 7 years ago
parent
commit
edbf1920c6

+ 4 - 5
frontend/wechat-web/src/modules/accountBind/AccountBind.jsx

@@ -40,12 +40,11 @@ class AccountBind extends Component {
             phone: '',
             code: '',
             obtainText: '获取验证码',
-            userHead: 'http://d.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=1be47219c1fdfc03e52debbce10faba2/b8389b504fc2d562562d540ae51190ef76c66c34.jpg'
         }
     }
 
     render() {
-        const {account, phone, code, obtainText, userHead} = this.state
+        const {account, phone, code, obtainText} = this.state
 
         const idClear = account ?
             <Icon type="close-circle" onClick={this.accountEmpty} style={{color: 'white'}}/>
@@ -65,9 +64,9 @@ class AccountBind extends Component {
         return (
             <div className='bindParent' style={{height: this.bodyHeight + 'px'}}>
                 <div className='bindHeadLayout'>
-                    {isObjEmpty(userHead) ?
+                    {isObjEmpty(this.props.userInfo.userAvatar) ?
                         <Avatar icon='user' size={65}/> :
-                        <Avatar src={userHead} size={65}/>}
+                        <Avatar src={this.props.userInfo.userAvatar} size={65}/>}
                 </div>
                 {/*<Input placeholder={mType == 'parents' ? '学号' : '工号'}
                        prefix={idIcon} suffix={idClear}
@@ -191,7 +190,7 @@ class AccountBind extends Component {
 
     bindEvent = () => {
         Toast.loading('信息绑定中...')
-        const {phone, code, userHead} = this.state
+        const {phone, code} = this.state
         if (isObjEmpty(phone, code)) {
             Toast.fail('请完善所有输入项!')
             return

+ 1 - 0
frontend/wechat-web/src/modules/home/HomePage.jsx

@@ -44,6 +44,7 @@ class HomePage extends Component {
         clearClassData()()
 
         document.title = "智慧校园";
+        // document.domain = ''
 
         this.mySwiper = new Swiper('.home-swiper-container', {
             autoplay: {