Browse Source

fix(front): 头像

Go 5 years ago
parent
commit
0b93c16b6d

+ 6 - 0
front/project/www/app.less

@@ -525,6 +525,12 @@ body,
     cursor: pointer;
     font-size: 16px;
   }
+
+  .avatar {
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+  }
 }
 
 #root {}

BIN
front/project/www/assets/logo.png


+ 2 - 2
front/project/www/components/Header/index.js

@@ -19,7 +19,7 @@ function Header(props) {
     <div id="header">
       <div className="body">
         <div className="left">
-          <Assets name="logo" className="c-p" svg onClick={() => linkTo('/')} />
+          <Assets name="logo" className="c-p" onClick={() => linkTo('/')} />
         </div>
         <div className="center">
           <div className="tabs">
@@ -89,7 +89,7 @@ function Header(props) {
               }
             >
               <Link to="/my/main" className="info">
-                <Assets src={user.info.avatar} />
+                <Assets className="avatar" src={user.info.avatar} />
                 <span className="t-2 f-s-12">{user.info.nickname || `qx${user.info.mobile}`}</span>
               </Link>
             </Dropdown>

+ 7 - 1
front/project/www/components/Header/index.less

@@ -25,7 +25,11 @@
     position: absolute;
     left: 0;
     top: 0;
-    width: 60px;
+
+    .assets {
+      width: 131px;
+      height: 24px;
+    }
   }
 
   .center {
@@ -117,6 +121,7 @@
 
       .assets {
         margin-right: 5px;
+
         path {
           fill: #303139FF !important;
         }
@@ -126,6 +131,7 @@
     .item.more-message {
       line-height: 16px;
       padding: 20px;
+
       path {
         fill: #4292F0FF !important;
       }

+ 1 - 0
front/project/www/components/Invite/index.less

@@ -16,6 +16,7 @@
   .qrcode {
     text-align: center;
     padding: 30px;
+    padding-top: 5px;
 
     .assets {
       width: 110px;

+ 45 - 4
front/project/www/components/Other/index.js

@@ -18,6 +18,47 @@ export class CommentFalls extends Component {
 
   render() {
     const { list = [] } = this.props;
+
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
+    list.push({
+      nickname: 12312312,
+      content: '123123',
+    });
     return (
       <div className="comment-falls">
         {list.map(row => {
@@ -25,7 +66,7 @@ export class CommentFalls extends Component {
             <div className="grid-item">
               <div className="item">
                 <div className="item-header">
-                  <Assets src={row.user ? row.user.avatar : row.avatar} />
+                  <Assets className="avatar" src={row.user ? row.user.avatar : row.avatar} />
                   <div className="name">{row.user ? row.user.nickname : row.nickname}</div>
                   <div className="date">{formatDate(row.createTime, 'YYYY年MM月DD日')}</div>
                 </div>
@@ -138,9 +179,9 @@ export class Consultation extends Component {
           <div className="item">
             <div className="t-1 t-s-16 m-b-10">微信咨询</div>
             <div className="t-1 t-s-16 t-w-b">
-              <Popover content={<Assets name="qrcode" />}>
+              <Popover content={<Assets src={data.wechatImage} />}>
                 <span>
-                  <Assets src={data.wechatImage} />
+                  <Assets className="m-l-1" name="erweima" />
                 </span>
               </Popover>
             </div>
@@ -195,7 +236,7 @@ export class Comment extends Component {
     const { data } = this.props;
     return (
       <div className="comment-item">
-        <Assets className="m-r-1" src={data.user ? data.user.avatar : data.avatar} />
+        <Assets className="avatar m-r-1" src={data.user ? data.user.avatar : data.avatar} />
         <div className="d-i-b">
           <div className="t-1 t-s-18">{data.user ? data.user.nickname : data.nickname}</div>
           <div className="t-3">{formatDate(data.createTime, 'YYYY-MM-DD')}</div>

+ 6 - 2
front/project/www/components/Other/index.less

@@ -8,6 +8,8 @@
   .grid-item {
     width: 25%;
     padding: 5px;
+    float: left;
+    max-height: 260px;
 
     .item {
       max-height: 260px;
@@ -27,15 +29,17 @@
         .name {
           color: #5E677B;
           font-size: 16px;
+          padding-left: 10px;
           vertical-align: middle;
           display: inline-block;
         }
 
         .date {
+          position: absolute;
           color: #8897A8;
           font-size: 12px;
-          float: right;
-          vertical-align: middle;
+          right: 0px;
+          top: 12px;
         }
       }
 

+ 1 - 0
front/project/www/routes/my/main/page.js

@@ -519,6 +519,7 @@ export default class extends Page {
         <div className="body">
           <div className="info c-p">
             <Assets
+              className="avatar"
               name="sun_blue"
               src={info.avatar}
               onClick={() => {