jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决冲突

This commit is contained in:
cxt 2016-04-01 23:25:19 +08:00
parent 790b452a9b d45604c4a0
commit bc5e455f0f
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/assets/wechat/homework_detail.html
View File

@ -19,7 +19,6 @@
<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 --> <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
<script id="t:homework-detail" type="text/html"> <script id="t:homework-detail" type="text/html">
<div id="check"></div>
<div class="post-container"> <div class="post-container">
<div class="post-wrapper"> <div class="post-wrapper">
<div class="post-main"> <div class="post-main">
@ -58,9 +57,9 @@
</div> </div>
<div class="post-input-wrap"> <div class="post-input-wrap">
<div class="post-reply-row"> <div class="post-reply-row">
<!--<div class="post-reply-avatar fl" id = "100"><img src="images/post-avatar.jpg" width="30" height="30" /></div>--> <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30" /></div>-->
<input type="text" class="post-reply-input" id="postInput" /> <input type="text" class="post-reply-input" id="postInput" />
<input type="submit" value="回复" class="post-reply-submit fr mt10" onclick="replyInsert()" /> <input type="submit" value="回复" class="post-reply-submit fr mt10" />
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>

10
public/assets/wechat/issue_detail.html
View File

@ -38,9 +38,11 @@
<div class="post-interactive border-bottom"> <div class="post-interactive border-bottom">
<div class="post-interactive-column c-grey2">回复 (<!=issues.journals_count!>)</div> <div class="post-interactive-column c-grey2">回复 (<!=issues.journals_count!>)</div>
<div class="post-interactive-column c-grey2">赞 (<!=issues.issue_praise_count!>)</div> <div class="post-interactive-column c-grey2">赞 (<!=issues.issue_praise_count!>)</div>
<div class="post-interactive-column c-grey2">回复 <span class="reply-num">(<!=issues.journals_count!>)</span></div>
<div class="post-interactive-column c-grey2"><span class="paise-text">赞</span> <span class="praise-num">(<!=issues.issue_praise_count!>)</span></div>
</div> </div>
<div id="all_issue_reply"> <div id="all_issue_reply">
<! for(var j =0; j < issues.issue_journals.length; ++j){ !> <! for(var j = (issues.issue_journals.length -1); j >= 0; --j){ !>
<div class="post-reply-wrap border-bottom"> <div class="post-reply-wrap border-bottom">
<div class="post-reply-row"> <div class="post-reply-row">
<div class="post-reply-avatar fl"><img src="<!=issues.issue_journals[j].user.img_url!>" width="45" height="45" class="border-radius" /></div> <div class="post-reply-avatar fl"><img src="<!=issues.issue_journals[j].user.img_url!>" width="45" height="45" class="border-radius" /></div>
@ -57,12 +59,10 @@
</div> </div>
<div class="post-input-wrap"> <div class="post-input-wrap">
<div class="post-reply-row"> <div class="post-reply-row">
<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30" /></div> <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30" /></div>-->
<div class="ml55">
<input type="text" class="post-reply-input" id="postInput" /> <input type="text" class="post-reply-input" id="postInput" />
<input type="submit" value="回复" class="post-reply-submit fr mt10" /> <input type="submit" value="回复" class="post-reply-submit fr mt10" />
<div class="cl"></div> <div class="cl"></div>
</div>
</div> </div>
</div> </div>
</div> </div>

2
public/javascripts/wechat/issue_detail.js
View File

@ -100,7 +100,7 @@ $(document).ready(function(){
var praiseNum = $(".post-interactive-praise").text().match(/\d+/g); var praiseNum = $(".post-interactive-praise").text().match(/\d+/g);
praiseNum++; praiseNum++;
$(".praise-num").text("(" + praiseNum + ")"); $(".praise-num").text("(" + praiseNum + ")");
}*/ };*/
}); });