Merge branch 'master' of Hepper/comment into master

lib/components/ContentItem/index.css

@@ -56,7 +56,8 @@
 }
 .comment-item-delete,
 .comment-item-edit,
-.comment-item-like {
+.comment-item-like,
+.comment-item-unlike {
   display: inline-block;
   background: url(../../assert/icon_delete.png);
   width: 18px;
@@ -74,7 +75,13 @@
   /* margin-left: 10px; */
 }
 .comment-item-like {
-  background: url(../../assert/icon_like@2x.png);
+  background: url(../../assert/icon_like_fill.png);
+  background-size: 100% 100%;
+  margin-left: 15px;
+  margin-right: 2px;
+}
+.comment-item-unlike {
+  background: url(../../assert/icon_like_line.png);
   background-size: 100% 100%;
   margin-left: 15px;
   margin-right: 2px;
@@ -83,7 +90,7 @@
   margin-left: 20px;
   cursor: pointer;
   color: red;
-} 
+}
 .comment-item-bottom-left {
   color: #71c135;
   margin-right: 20px;

lib/components/ContentItem/index.js

@@ -351,7 +351,7 @@ var CommentItem = function (_Component) {
                 showReply ? _react2.default.createElement(_icon2.default, { type: "up" }) : _react2.default.createElement(_icon2.default, { type: "down" })
               )
             ) : null,
-            showEdit && _react2.default.createElement("i", {
+            showEdit && app.userId === content.user_id && _react2.default.createElement("i", {
               className: "comment-item-edit",
               onClick: function onClick() {
                 return _this2.props.app.handleEdit({
@@ -396,7 +396,7 @@ var CommentItem = function (_Component) {
                 },
                 style: { color: "" + IconColor }
               },
-              _react2.default.createElement("i", { className: "comment-item-like" })
+              _react2.default.createElement("i", { className: content.favored ? "comment-item-like" : "comment-item-unlike" })
             ),
             _react2.default.createElement(
               "span",

lib/components/EditComment/EditComment.css

@@ -96,4 +96,4 @@
   .editCommetModal .picture-btn-wrap {
     margin-left: 18px;
   }
-}
+}

lib/index.js

@@ -43,7 +43,7 @@ var Index = function (_React$Component) {
         //   uid: "rc-upload-1564206005248-2"
         // }
       ],
-      value: "2"
+      value: ""
     };
     return _this;
   }

lib/version.json

@@ -1,8 +1,8 @@
 {
     "name":       "comment",
-    "buildDate":  1564190100286,
+    "buildDate":  1564281547826,
     "version":    "1.0.4",
-    "numCommits": 173,
-    "hash":       "b9eeb6a",
-    "dirty":      true
+    "numCommits": 174,
+    "hash":       "5200566",
+    "dirty":      false
 }

src/components/ContentItem/index.css

@@ -56,7 +56,8 @@
 }
 .comment-item-delete,
 .comment-item-edit,
-.comment-item-like {
+.comment-item-like,
+.comment-item-unlike {
   display: inline-block;
   background: url(../../assert/icon_delete.png);
   width: 18px;
@@ -74,7 +75,13 @@
   /* margin-left: 10px; */
 }
 .comment-item-like {
-  background: url(../../assert/icon_like@2x.png);
+  background: url(../../assert/icon_like_fill.png);
+  background-size: 100% 100%;
+  margin-left: 15px;
+  margin-right: 2px;
+}
+.comment-item-unlike {
+  background: url(../../assert/icon_like_line.png);
   background-size: 100% 100%;
   margin-left: 15px;
   margin-right: 2px;

src/components/ContentItem/index.js

@@ -261,7 +261,7 @@ class CommentItem extends Component {
                 </a>
               </div>
             ) : null}
-            {showEdit && (
+            {showEdit && app.userId === content.user_id && (
               <i
                 className="comment-item-edit"
                 onClick={() =>
@@ -309,7 +309,11 @@ class CommentItem extends Component {
               }}
               style={{ color: `${IconColor}` }}
             >
-              <i className="comment-item-like" />
+              <i
+                className={
+                  content.favored ? "comment-item-like" : "comment-item-unlike"
+                }
+              />
             </div>
             <span>&nbsp;{content.favor_count}</span>
             <div

src/index.js

@@ -15,7 +15,7 @@ class Index extends React.Component {
         //   uid: "rc-upload-1564206005248-2"
         // }
       ],
-      value: "2"
+      value: ""
     };
   }