Merge branch 'guange_dev' into develop

app/controllers/wechats_controller.rb

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

public/assets/wechat/issue_detail.html

@@ -142,7 +142,7 @@
 <div class="post-container wechat-at" ng-show="showAtDialog">
     <div loading-spinner></div>
     <div class="class-detail-name"><span class="course-name-width hidden inline-block">选择您要@的人</span>
-        <button>取消</button>
+        <button ng-click="cancelAt()">取消</button>
     </div>
     <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>

public/javascripts/wechat/controllers/issue.js

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

public/stylesheets/weui/weixin.css

@@ -283,4 +283,4 @@ a.underline {text-decoration:underline;}
 .weixin-users-all li:hover{ background:#f4f4f4;}
 
 /*弹出@选择对话框 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;}