hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决冲突

Browse Source
chenlw_dev
cxt 9 years ago
parent 2898805aa7 efca9c5d17
commit cb7834fa97
11 changed files with 75 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
1234567
Unescape View File

@ -1 +1 @@
{"access_token":"8_uw_0k7gzuGR_jM5OHas7VXxNKScuDVYDAFT0MCXckv53f9QBUtlUxs4baMASygfA-Y45NVaeEFefOcfB8xcyBRdyZjVrEj_A7fr9qxYxWT7RCB8J4whon2_uE5np28JQVcABAFMR","expires_in":7200,"got_token_at":1460444599} {"access_token":"ONE7uqb5MhyuYiOtMkzUMPJs8krCiQeBjWek_Q9glYtfCH-kkQKzv84dgxUv5VLBnb5zdKajWDyHqocvu71UwlVuVFhsXs9MwbVdCu1i4l2L5vKCkhNE5GuyO6WisXfvKOUfAEAYCI","expires_in":7200,"got_token_at":1460441290}

6
public/assets/wechat/activities.html
Unescape View File

@ -9,7 +9,11 @@
<div class="post-main"> <div class="post-main">
<div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div> <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
<div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div> <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
<div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a>to<a herf="javascript:void(0);" class="ml10">{{act.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;{{act.activity_type_name}}</a></div> <div class="post-title hidden">
<a herf="javascript:void(0);" class="mr10">
<span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
<span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
</a>to<a herf="javascript:void(0);" class="ml10">{{act.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;{{act.activity_type_name}}</a></div>
<div class="cl"></div> <div class="cl"></div>
<div class="post-content c-grey2 mt10"> <div class="post-content c-grey2 mt10">
<div class="post-all-content" ng-bind-html="act.description|safeHtml"></div> <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>

7
public/assets/wechat/blog_detail.html
Unescape View File

@ -3,12 +3,11 @@
<div class="post-container"> <div class="post-container">
<div class="post-wrapper"> <div class="post-wrapper">
<div class="post-main"> <div class="post-main">
<div class="post-avatar fl"><img ng-src="{{blog.user.img_url}}" width="45" height="45" class="border-radius" /></div> <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span></div>
<div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span></div> <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
<div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
<div class="cl"></div> <div class="cl"></div>
<div class="post-content" style="height:auto;"> <div class="post-content" style="height:auto;">
<div class="post-all-content c-grey2 mt10" ng-bind-html="blog.content|safeHtml"></div> <div class="post-all-content c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<span class="c-grey f13 mt10 fl">{{blog.created_at}}</span> <span class="c-grey f13 mt10 fl">{{blog.created_at}}</span>

15
public/assets/wechat/course_discussion.html
Unescape View File

@ -3,11 +3,16 @@
<div class="post-container"> <div class="post-container">
<div class="post-wrapper"> <div class="post-wrapper">
<div class="post-main"> <div class="post-main">
<div class="post-avatar fl"><img ng-src="{{discussion.user.img_url}}" width="45" height="45" class="border-radius" /></div> <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
<div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div> <table class="post-detail-info"><tr>
<div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{discussion.user.realname}}</a>to<a herf="javascript:void(0);" class="ml10">{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</a></div> <td class="text-nowrap v-top">发布者：</td>
<div class="cl"></div> <td>{{discussion.user.realname}}</td>
<div class="post-content c-grey2 mt10" style="height:auto;"> </tr>
<tr>
<td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
<td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</td>
</tr></table>
<div class="post-content c-grey3 mt10" style="height:auto;">
<div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div> <div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>

15
public/assets/wechat/course_notice.html
Unescape View File

@ -3,11 +3,16 @@
<div class="post-container"> <div class="post-container">
<div class="post-wrapper"> <div class="post-wrapper">
<div class="post-main"> <div class="post-main">
<div class="post-avatar fl"><img ng-src="{{news.author.img_url}}" width="45" height="45" class="border-radius" /></div> <div class="post-title mb5"><span class="c-grey3 f15 fb">{{news.title}}</span></div>
<div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{news.title}}</span></div> <table class="post-detail-info"><tr>
<div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{news.author.realname}}</a>to<a herf="javascript:void(0);" class="ml10">{{news.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程通知</a></div> <td class="text-nowrap v-top">发布者：</td>
<div class="cl"></div> <td>{{news.author.realname}}</td>
<div class="post-content c-grey2 mt10" style="height:auto;"> </tr>
<tr>
<td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
<td>{{news.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程通知</td>
</tr></table>
<div class="post-content c-grey3 mt10" style="height:auto;">
<div class="post-all-content" ng-bind-html="news.description|safeHtml"></div> <div class="post-all-content" ng-bind-html="news.description|safeHtml"></div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>

23
public/assets/wechat/homework_detail.html
Unescape View File

@ -3,14 +3,21 @@
<div class="post-container"> <div class="post-container">
<div class="post-wrapper"> <div class="post-wrapper">
<div class="post-main"> <div class="post-main">
<div class="post-avatar fl"><img ng-src="{{homework.author.img_url}}" width="45" height="45" class="border-radius" /></div> <div class="post-title mb5"><span class="c-grey3 f15 fb">{{homework.name}}</span></div>
<div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{homework.name}}</span></div> <table class="post-detail-info"><tr>
<div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{homework.author.realname}}</a>to<a herf="javascript:void(0);" class="ml10">{{homework.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程作业</a></div> <td class="text-nowrap v-top">发布者：</td>
<div class="cl"></div> <td>{{homework.author.realname}}</td>
<div class="post-content c-grey2 mt10" style="height:auto;"> </tr>
<div class="post-all-content" ng-bind-html="homework.description|safeHtml"></div> <tr>
<span class="mr15">迟交扣分：{{homework.late_penalty}}分</span> 匿评开启时间：{{homework.evaluation_start}}<br /> <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
<span class="mr15">缺评扣分：{{homework.absence_penalty}}分/作品</span> 匿评关闭时间：{{homework.evaluation_end}} <td>{{homework.course_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程作业</td>
</tr></table>
<div class="post-content c-grey3 mt10" style="height:auto;">
<div class="post-all-content mb10" ng-bind-html="homework.description|safeHtml"></div>
<span class="c-grey">迟交扣分：{{homework.late_penalty}}分<br/>
缺评扣分：{{homework.absence_penalty}}分/作品<br />
匿评开启时间：{{homework.evaluation_start}}<br />
匿评关闭时间：{{homework.evaluation_end}}</span>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<span class="c-grey f13 mt10 fl">{{homework.publish_time}}</span> <span class="c-grey f13 mt10 fl">{{homework.publish_time}}</span>

21
public/assets/wechat/issue_detail.html
Unescape View File

@ -3,14 +3,21 @@
<div class="post-container"> <div class="post-container">
<div class="post-wrapper"> <div class="post-wrapper">
<div class="post-main"> <div class="post-main">
<div class="post-avatar fl"><img ng-src="{{issue.author.img_url}}" width="45" height="45" class="border-radius" /></div> <div class="post-title mb5"><span class="c-grey3 f15 fb">{{issue.subject}}</span></div>
<div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{issue.subject}}</span></div> <table class="post-detail-info"><tr>
<div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{issue.author.realname}}</a>to<span class="ml10">{{issue.project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目缺陷</span></div> <td class="text-nowrap v-top">发布者：</td>
<div class="cl"></div> <td>{{issue.author.realname}}</td>
</tr>
<tr>
<td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
<td>{{issue.project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目缺陷</td>
</tr></table>
<div class="post-content" style="height:auto;"> <div class="post-content" style="height:auto;">
<div class="post-all-content c-grey2 mt10" ng-bind-html="issue.description|safeHtml"></div> <div class="post-all-content c-grey3 mt10 mb10" ng-bind-html="issue.description|safeHtml"></div>
<span class="mr15">状态：{{issue.issue_status}}</span> <span class="mr15">优先级：{{issue.issue_priority}}</span> <br /> <span class="c-grey">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}<br>
<span class="mr15">指派给：{{issue.issue_assigned_to}}</span> <span class="mr15">完成度：{{issue.done_ratio}}%</span> 优先级：{{issue.issue_priority}}<br />
指派给：{{issue.issue_assigned_to}}<br />
完成度：{{issue.done_ratio}}%</span>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<span class="c-grey f13 mt10 fl">{{issue.created_on}}</span> <span class="c-grey f13 mt10 fl">{{issue.created_on}}</span>

5
public/assets/wechat/jour_message_detail.html
Unescape View File

@ -2,9 +2,8 @@
<div class="post-container"> <div class="post-container">
<div class="post-wrapper"> <div class="post-wrapper">
<div class="post-main"> <div class="post-main">
<div class="post-avatar fl"><img ng-src="{{message.user.img_url}}" width="45" height="45" class="border-radius" /></div> <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
<div class="post-title mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div> <div class="post-title">{{message.created_on}}</div>
<div class="post-title hidden">{{message.created_on}}</div>
<div class="cl"></div> <div class="cl"></div>
<div class="post-content c-grey2 mt10" style="height:auto;"> <div class="post-content c-grey2 mt10" style="height:auto;">
<div class="post-all-content" ng-bind-html="message.notes|safeHtml"></div> <div class="post-all-content" ng-bind-html="message.notes|safeHtml"></div>

15
public/assets/wechat/project_discussion.html
Unescape View File

@ -3,11 +3,16 @@
<div class="post-container"> <div class="post-container">
<div class="post-wrapper"> <div class="post-wrapper">
<div class="post-main"> <div class="post-main">
<div class="post-avatar fl"><img ng-src="{{discussion.user.img_url}}" width="45" height="45" class="border-radius" /></div> <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
<div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div> <table class="post-detail-info"><tr>
<div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{discussion.user.realname}}</a>to<a herf="javascript:void(0);" class="ml10">{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目讨论区</a></div> <td class="text-nowrap v-top">发布者：</td>
<div class="cl"></div> <td>{{discussion.user.realname}}</td>
<div class="post-content c-grey2 mt10" style="height:auto;"> </tr>
<tr>
<td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
<td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;项目讨论区</td>
</tr></table>
<div class="post-content c-grey3 mt10" style="height:auto;">
<div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div> <div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>

4
public/javascripts/wechat/app.js
Unescape View File

@ -1,6 +1,6 @@
var app = angular.module('wechat', ['ngRoute','ngCookies']); var app = angular.module('wechat', ['ngRoute','ngCookies']);
var apiUrl = '/api/v1/'; var apiUrl = '/api/v1/';
var debug = false; //调试标志,如果在本地请置为true var debug = true; //调试标志,如果在本地请置为true
if(debug===true){ if(debug===true){
apiUrl = 'http://localhost:3000/api/v1/'; apiUrl = 'http://localhost:3000/api/v1/';
@ -10,7 +10,7 @@ app.factory('auth', function($http,$routeParams, $cookies, $q){
var _openid = ''; var _openid = '';
if(debug===true){ if(debug===true){
_openid = "oCnvgvz8R7QheXE-R9Kkr39j8Ndg"; _openid = "1";
} }
var getOpenId = function() { var getOpenId = function() {

3
public/stylesheets/weui/weixin.css
Unescape View File

@ -33,6 +33,8 @@ a.underline {text-decoration:underline;}
.hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} .hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
.inline-block {display:inline-block;} .inline-block {display:inline-block;}
.undis {display:none;} .undis {display:none;}
.text-nowrap {white-space:nowrap;}
.v-top {vertical-align:top;}
/*动态样式*/ /*动态样式*/
.post-container {width:100%;} .post-container {width:100%;}
@ -40,6 +42,7 @@ a.underline {text-decoration:underline;}
.post-main {padding:10px; color:#9a9a9a;} .post-main {padding:10px; color:#9a9a9a;}
.post-avatar {width:45px; height:45px; margin-right:10px;} .post-avatar {width:45px; height:45px; margin-right:10px;}
.post-title {font-size:13px; text-align:left;} .post-title {font-size:13px; text-align:left;}
.post-detail-info {font-size:13px; text-align:left; color:#9a9a9a;}
.fl {float:left;} .fl {float:left;}
.fr {float:right;} .fr {float:right;}
.cl {clear:both; overflow:hidden;} .cl {clear:both; overflow:hidden;}

Write Preview
Loading…
Cancel
Save