save

army8735 · army8735 · commit cf98e6d9ac2f · 2017-09-26T19:57:53.000+08:00
diff --git a/mock/api/users/GetLikeAuthorList.js b/mock/api/users/GetLikeAuthorList.js
@@ -0,0 +1,15 @@
+/**
+ * Created by army8735 on 2017/9/26.
+ */
+
+export default {
+  "success": true,
+  "message": "",
+  "code": 0,
+  "data": [{
+    "AuthorID": 2017000000000001,
+    "AuthorName": "河图",
+    "Head_url": "http://zhuanquan.xyz/temp/head2017000000000001.jpg",
+    "FansNumber": 396690
+  }]
+};
diff --git a/mock/api/users/GetLikeWorksList.js b/mock/api/users/GetLikeWorksList.js
@@ -0,0 +1,15 @@
+/**
+ * Created by army8735 on 2017/9/26.
+ */
+
+export default {
+  "success": true,
+  "message": "",
+  "code": 0,
+  "data": [{
+    "WorksID": 2015000000000006,
+    "cover_Pic": "http://zhuanquan.xyz/temp/cover2015000000000006.jpg",
+    "Title": "燃尽人间色",
+    "SingerName": null
+  }]
+};
diff --git a/src/component/hotauthor/index.less b/src/component/hotauthor/index.less
@@ -129,6 +129,7 @@
         white-space:nowrap;
         text-overflow:ellipsis;
         overflow:hidden;
+        white-space:nowrap;
       }
     }
   }
diff --git a/src/index/index.html b/src/index/index.html
@@ -18,6 +18,7 @@
 <body>
 <script>
   var $CONFIG = {
+    isLogin: 'True',
     userName: '',
   };
 </script>
diff --git a/src/index/index.jsx b/src/index/index.jsx
@@ -58,6 +58,6 @@ migi.render(
 );
 
 migi.render(
-  <div class="info"></div>,
+  <div class="info"/>,
   document.body
 );
diff --git a/src/my/Favor.jsx b/src/my/Favor.jsx
@@ -11,24 +11,22 @@ class Favor extends migi.Component {
     return <div class="favor">
       <h3>我的收藏</h3>
       <b class="line"/>
-      <div class="fn fn-clear">
+      <div class="fn fn-clear fn-hide">
         <a href="#" class="prev">查看上页</a>
         <a href="#" class="next">查看下页</a>
       </div>
       <ul class="list fn-clear">
         {
           this.list.map(function(item) {
-            return <li></li>;
+            return <li>
+              <a href={ '/works/' + item.WorksID } class="pic">
+                <img src={ item.cover_Pic }/>
+                <div class="ath">{ item.SingerName }</div>
+              </a>
+              <a href="#" class="txt">{ item.Title }</a>
+            </li>;
           })
         }
-        <li>
-          <a href="#" class="pic">
-            <img src="//tva4.sinaimg.cn/crop.7.1.129.129.180/64319a89gw1f62p9lp7hyj203w03wq2x.jpg"/>
-            <div class="num">123</div>
-            <div class="ath">aaa bbb</div>
-          </a>
-          <a href="#" class="txt">{ 123 }</a>
-        </li>
       </ul>
     </div>;
   }
diff --git a/src/my/Follow.jsx b/src/my/Follow.jsx
@@ -11,33 +11,22 @@ class Follow extends migi.Component {
     return <div class="follow">
       <h3>我的关注</h3>
       <b class="line"/>
-      <div class="fn fn-clear">
+      <div class="fn fn-clear fn-hide">
         <a href="#" class="prev">查看上页</a>
         <a href="#" class="next">查看下页</a>
       </div>
       <ul class="list fn-clear">
         {
           this.list.map(function(item) {
             return <li>
-              <a href="#" class="pic">
-                <img src="//tva4.sinaimg.cn/crop.7.1.129.129.180/64319a89gw1f62p9lp7hyj203w03wq2x.jpg"/>
-                <b class={ `cp-author_type` }/>
-                <b class={ `cp-author_type` }/>
+              <a href={ '/author/' + item.AuthorID } class="pic">
+                <img src={ item.Head_url }/>
               </a>
-              <a href="#" class="txt">{ 123 }</a>
-              <div class="info">合作1次</div>
+              <a href="#" class="txt">{ item.AuthorName }</a>
+              <div class="info">{ item.FansNumber }粉丝</div>
             </li>;
           })
         }
-        <li>
-          <a href="#" class="pic">
-            <img src="//tva4.sinaimg.cn/crop.7.1.129.129.180/64319a89gw1f62p9lp7hyj203w03wq2x.jpg"/>
-            <b class={ `cp-author_type` }/>
-            <b class={ `cp-author_type` }/>
-          </a>
-          <a href="#" class="txt">{ 123 }</a>
-          <div class="info">合作1次</div>
-        </li>
       </ul>
     </div>;
   }
diff --git a/src/my/My.jsx b/src/my/My.jsx
@@ -5,15 +5,31 @@
 import Profile from './Profile.jsx';
 import Follow from './Follow.jsx';
 import Favor from './Favor.jsx';
-import BotNav from '../component/botnav/BotNav.jsx';
 
 class My extends migi.Component {
   constructor(...data) {
     super(...data);
   }
+  load() {
+    let self = this;
+    util.postJSON('api/users/GetLikeAuthorList', function(res) {
+      if(res.success) {
+        let data = res.data;
+        self.ref.follow.list = data;
+      }
+    });
+    util.postJSON('api/users/GetLikeWorksList', function(res) {
+      if(res.success) {
+        let data = res.data;
+        self.ref.favor.list = data;
+      }
+    });
+  }
   render() {
     return <div class="my">
       <Profile/>
+      <Follow ref="follow"/>
+      <Favor ref="favor"/>
       <a href="#" class="loginout">退出登录</a>
     </div>;
   }
diff --git a/src/my/index.jsx b/src/my/index.jsx
@@ -6,11 +6,13 @@ import './my.html';
 import './index.less';
 
 import My from './My.jsx';
+import BotNav from '../component/botnav/BotNav.jsx';
 
 let my = migi.render(
   <My/>,
   '#page'
 );
+my.load();
 
 migi.render(
   <BotNav/>,
diff --git a/src/my/index.less b/src/my/index.less
@@ -107,9 +107,10 @@
     }
     .list{
       margin-top:0.2rem;
-      padding:0 0.5rem;
+      margin-right:-0.72rem;
       li{
         float:left;
+        margin-right:0.3rem;
         width:0.72rem;
         text-align:center;
         .pic{
@@ -141,6 +142,7 @@
           color:#999;
           text-overflow:ellipsis;
           overflow:hidden;
+          white-space:nowrap;
         }
       }
     }
@@ -211,16 +213,18 @@
     }
     .list{
       margin-top:0.2rem;
-      padding:0 0.3rem;
+      margin-right:-1.44rem;
       li{
         float:left;
-        width:1.92rem;
+        margin-right:0.7rem;
+        margin-bottom:0.2rem;
+        width:1.44rem;
         font-size:0.12rem;
         .pic{
           position:relative;
           display:block;
           width:100%;
-          height:1.92rem;
+          height:1.44rem;
           border-radius:0.1rem;
           color:#fff;
           &:hover{
@@ -235,7 +239,7 @@
             background:linear-gradient(rgba(0,0,0,0) 0%, rgba(0,0,0,0.6) 20%, rgba(0,0,0,0.7) 100%);
             border-bottom-left-radius:0.1rem;
             border-bottom-right-radius:0.1rem;
-            content:' ';
+            //content:' ';
             z-index:2;
           }
           img{
@@ -270,6 +274,7 @@
           padding:0 0.1rem;
           text-overflow:ellipsis;
           overflow:hidden;
+          white-space:nowrap;
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@`
`129`	`129`	`white-space:nowrap;`
`130`	`130`	`text-overflow:ellipsis;`
`131`	`131`	`overflow:hidden;`
	`132`	`+ white-space:nowrap;`
`132`	`133`	`}`
`133`	`134`	`}`
`134`	`135`	`}`