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

Merge branch 'guange_dev' into develop

This commit is contained in:
huang 2016-12-09 16:53:18 +08:00
parent b8eee2b131 34b14b4e51
commit 41b6c64af3
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/wechats_controller.rb
View File

@ -286,6 +286,7 @@ class WechatsController < ActionController::Base
logger.info tmpurl logger.info tmpurl
news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "欢迎使用Trustie创新实践服务平台！ news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "欢迎使用Trustie创新实践服务平台！
在这里您可以随时了解您的课程和项目动态，随时点赞和回复。交作业、代码提交等更多功能，请前往 www.trustie.net 在这里您可以随时了解您的课程和项目动态，随时点赞和回复。交作业、代码提交等更多功能，请前往 www.trustie.net
我们将会与微信不断结合，为您提供更有价值的服务。 我们将会与微信不断结合，为您提供更有价值的服务。
您还未绑定确实的用户，请先绑定，谢谢！" } } 您还未绑定确实的用户，请先绑定，谢谢！" } }

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

@ -142,7 +142,7 @@
<div class="post-container wechat-at" ng-show="showAtDialog"> <div class="post-container wechat-at" ng-show="showAtDialog">
<div loading-spinner></div> <div loading-spinner></div>
<div class="class-detail-name"><span class="course-name-width hidden inline-block">选择您要@的人</span> <div class="class-detail-name"><span class="course-name-width hidden inline-block">选择您要@的人</span>
<button>取消</button> <button ng-click="cancelAt()">取消</button>
</div> </div>
<ul class="weixin-users-all"> <ul class="weixin-users-all">
<li ng-repeat="person in at_persons track by $index" ng-click="selectAtPerson($index)"><p class="fl ">{{person.name}}</p><p class="fl ">（{{person.login}}）</p></li> <li ng-repeat="person in at_persons track by $index" ng-click="selectAtPerson($index)"><p class="fl ">{{person.name}}</p><p class="fl ">（{{person.login}}）</p></li>

4
public/javascripts/wechat/controllers/issue.js
View File

@ -50,6 +50,10 @@ app.controller('IssueController', ['$scope', '$http', '$routeParams', 'auth', 'c
vm.issue.comment += person.name + ' '; vm.issue.comment += person.name + ' ';
}; };
vm.cancelAt = function(){
vm.showAtDialog = false;
}
common.init({ common.init({
id: $routeParams.id, id: $routeParams.id,
scope: $scope, scope: $scope,

2
public/stylesheets/weui/weixin.css
View File

@ -283,4 +283,4 @@ a.underline {text-decoration:underline;}
.weixin-users-all li:hover{ background:#f4f4f4;} .weixin-users-all li:hover{ background:#f4f4f4;}
/*弹出@选择对话框 guange*/ /*弹出@选择对话框 guange*/
.wechat-at {position: fixed; top: 0; left:0; width: 100%; height: 100%; background-color: #ffffff;} .wechat-at {position: absolute; z-index: 999; top: 0; left:0; width: 100%; height: 100%; background-color: #ffffff;}