almost done

Author: chunwei

.idea/encodings.xml

@@ -13,13 +13,16 @@ var CommentHeader = React.createClass({
     var avatar=this.props.author.avatar||defaultAvatar;
     let tag=(this.props.showTag&&this.props.tag)?(<span className="tag">#{this.props.tag}</span>):null;
     return (
+      <div>
+      {tag}
       <div className="commentHeader">
         <div className="commentAuthor">
           <span className="avatar"><img src={avatar}/></span>
-          <span className="author">{this.props.author.name||"游客"} {tag}</span>
+          <span className="author">{this.props.author.name||"游客"}</span>
         </div>
         <LikeButton liked={this.props.liked} count={this.props.likedCount} commentid={this.props.id}/>
       </div>
+      </div>
     );
   }
 });

src/components/comment/Comment.js

@@ -21,13 +21,13 @@ var CommentBox = React.createClass({
       success: function (res) {
         if(res&&res.Status=="Success") {
           var comments=res.Result;
-          if(!comments||comments.length==0){
+          /*if(!comments||comments.length==0){
             comments=[];
             var first=RSVP.createComment();
             first.author.name='景区';
             first.text='欢迎留下您的足迹！';
             comments.push(first);
-          }
+          }*/
           this.setState({data: comments,hasmore:res.Result.length>=RSVP.config.pagesize});
         }
       }.bind(this),
@@ -46,8 +46,8 @@ var CommentBox = React.createClass({
       data:{params:JSON.stringify(params)},
       success: function (res) {
         if(res&&res.Status=="Success") {
-          //var newData=this.state.data.concat(res.Result);//正序，最后位置插入
-          var newData=res.Result.concat(this.state.data);//逆序，最前位置插入
+          var newData=this.state.data.concat(res.Result);//正序，最后位置插入
+          //var newData=res.Result.concat(this.state.data);//逆序，最前位置插入
           this.setState({data: newData,hasmore:res.Result.length>=RSVP.config.pagesize});
           RSVP.config.page=params.page;
         }
@@ -63,8 +63,8 @@ var CommentBox = React.createClass({
     if(pId&&pId!=0){
       var parentComment=RSVP.getCommentById(comments,pId);
       comment.parentId =parentComment.id;
-      var ppid=parentComment.parentId;
-      comment.syncId=(ppid&&ppid!=0&&ppid!="0")?ppid:parentComment.id;
+      var psid=parentComment.syncId;
+      comment.syncId=(psid&&psid!=0&&psid!="0")?psid:parentComment.id;
       comment.toOpenid=parentComment.author.openid;
       comment.toAppid=parentComment.author.appid;
       comment.toWho=parentComment.author.name;
@@ -100,7 +100,7 @@ var CommentBox = React.createClass({
     //var newComments = comments.concat([comment]);
     this.setState({data: comments});
 
-    console.log("insert to local comments Success");
+    //console.log("insert to local comments Success");
     $.ajax({
       url: this.props.inserturl,
       dataType: 'json',
@@ -109,9 +109,9 @@ var CommentBox = React.createClass({
       success: function (res) {//console.log("insert Success");
         if(res&&res.Status=="Success") {//console.log("res&&res.Status==Success");
           //this.setState({data: data});
-          var comment=res.Result[0];console.log(res);//console.log(comment);
-          if (comment && res.tempid) {console.log("comment && res.tempid");
-            var old = RSVP.getCommentById(comments, res.tempid);console.log('old=');//console.log(old);console.log('==old end');
+          var comment=res.Result[0];//console.log(res);//console.log(comment);
+          if (comment && res.tempid) {//console.log("comment && res.tempid");
+            var old = RSVP.getCommentById(comments, res.tempid);//console.log('old=');//console.log(old);console.log('==old end');
             old.id = comment.id;
             old.author = comment.author;
             old.text=comment.text;
@@ -161,13 +161,15 @@ var CommentBox = React.createClass({
       child.props.onCommentSubmit=this.handleCommentSubmit;
       child.props.getCommentById=this.getCommentById;
     },this);
+    var welcome=this.state.data.length==0?<span>欢迎留下您的足迹！</span>:null;
     var loadMoreBtn=this.state.hasmore?<div className="LoadMoreBtn" onClick={this.loadMore}>加载更多</div>:null;
     return (
       <div className="commentBox">
         <div className="BoxHeader">
         <b>驴友评论</b><Link to='/post' className="writeComment">写评论<i className="icon-writeComment"></i></Link>
         </div>
         <CommentList data={this.state.data} sortBy="oldest" showTag={RSVP.config.showCommentTag}/>
+        {welcome}
         {loadMoreBtn}
         <CommentBar/>
         {/*

src/components/comment/CommentBox.js

@@ -50,9 +50,9 @@ button, html input[type="button"], input[type="reset"], input[type="submit"] {
   width: 100%;
   border-radius: 20%;
 }
-.commentHeader .tag {
+.comment .tag {
   font-size: 0.8em;
-  margin-left:10px;
+  margin-left:0px;
   color: #1448aa;
 }
 

src/components/comment/comment.css

@@ -35,11 +35,11 @@ RSVP.urlp=function(key, qstring){
 
 RSVP.createComment=function(){
   var uuid=this.config.uuid;
-  if(uuid.indexOf('_Add'))uuid=uuid.substr(0,uuid.indexOf('_Add'));
+  if(uuid.indexOf('_All')>-1)uuid=uuid.substr(0,uuid.indexOf('_All'));
   return {
     id:"__"+this.uuid(10),
-    uuid:this.config.uuid,
-    targetId:this.config.uuid,
+    uuid:uuid,
+    targetId:uuid,
     tag:this.config.tag,
     author:{id:this.config.openid, appid:this.config.appid,name:"我"},
     time:new Date().getTime()

src/components/utils/common.js

@@ -23,11 +23,17 @@ var App = React.createClass({
 });
 
 /*reply/:id/:towho/:towhoname*/
+var onEnter=function(){
+  console.log("onEnter");
+};
+var onLeave=function(){
+  console.log("onLeave");
+};
 React.render((
     <Router>
       <Route path="/" component={App}>
-        <Route path="post" component={CommentForm}/>
-        <Route path="reply/:id" component={CommentForm}/>
+        <Route path="post" component={CommentForm} onEnter={onEnter} onLeave={onLeave}/>
+        <Route path="reply/:id" component={CommentForm} onEnter={onEnter} onLeave={onLeave}/>
       </Route>
     </Router>
   ), document.getElementById("comments")