From 7fe3f9fe716aa3509ccf2eac9a65eb1252a1ca76 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 15 Jul 2016 20:30:50 +0800
Subject: [PATCH 01/26] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/wechat.yml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/config/wechat.yml b/config/wechat.yml
index d839f1606..6b3799706 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -20,26 +20,26 @@ default: &default
   encrypt_mode: false # if true must fill encoding_aes_key
 
   #production
-  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
-  jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
-
-  #template
-  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
-  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
-  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
-  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
-  create_class_notice: "2GtJJGzzNlNy2i0UrsjEDlvfSVIUXQfSo47stpcQAVw"
-
-  #test
-#  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
+#  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
 #  jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 #
 #  #template
-#  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
-#  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
-#  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
-#  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
-#  create_class_notice: "9CDIvHIKiGwPEQWRw_-wieec1o50tMXQPPZIfECKu0I"
+#  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
+#  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
+#  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
+#  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
+#  create_class_notice: "2GtJJGzzNlNy2i0UrsjEDlvfSVIUXQfSo47stpcQAVw"
+
+  #test
+  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
+  jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
+
+  #template
+  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
+  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
+  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
+  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
+  create_class_notice: "9CDIvHIKiGwPEQWRw_-wieec1o50tMXQPPZIfECKu0I"
 
 production:
   <<: *default

From 51692eadd619f6ffbd5ebab9890916c425134806 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sun, 17 Jul 2016 00:49:35 +0800
Subject: [PATCH 02/26] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E4=B8=8A=E7=BA=BF?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/wechats_helper.rb              | 20 +++++++++
 app/views/wechats/user_activities.html.erb | 28 +-----------
 config/application.rb                      |  5 ++-
 lib/tasks/wechat.rake                      | 31 +++++++++++++
 public/javascripts/wechat/build/app.min.js | 51 ++++++++++++++++------
 5 files changed, 95 insertions(+), 40 deletions(-)
 create mode 100644 app/helpers/wechats_helper.rb
 create mode 100644 lib/tasks/wechat.rake

diff --git a/app/helpers/wechats_helper.rb b/app/helpers/wechats_helper.rb
new file mode 100644
index 000000000..5c6b3da8c
--- /dev/null
+++ b/app/helpers/wechats_helper.rb
@@ -0,0 +1,20 @@
+#coding=utf-8
+#
+
+module WechatsHelper
+  def include_wechat_jsfile
+    if Rails.env.production?
+       javascript_include_tag '/javascripts/wechat/build/app.min.js'
+    else
+       wechat_path = File.join(Rails.root, "public", "javascripts", "wechat")
+       srcs = Rails.application.config.wechat_srcs
+       paths = []
+       srcs.each do |src|
+         Dir.glob(wechat_path+ "/#{src}"  ) do |path|
+           paths << path[File.join(Rails.root, "public").to_s.size, path.size]
+         end
+       end
+       javascript_include_tag *paths
+    end
+  end
+end
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 6c3da9cf4..d21449648 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -10,7 +10,7 @@
   <meta content='True' name='HandheldFriendly' />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
-  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
+  <%= stylesheet_link_tag '/stylesheets/weui/weixin.css' %>
 
   <script type="text/javascript">
     window.g_debug = false; //调试标志,如果在本地请置为true
@@ -28,31 +28,7 @@
 
 <!--<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>-->
 <script src="/javascripts/wechat/build/angular.all.min.js"></script>
-<script src="/javascripts/wechat/build/app.min.js?version=20160715-1953"></script>
-  <!-- <script src ="/javascripts/wechat/app.js"></script> -->
-  <!-- <script src="/javascripts/wechat/others/factory.js"></script> -->
-  <!-- <script src="/javascripts/wechat/others/filter.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/alert.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/form_validate.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/input_auto.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/loading_spinner.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/reg.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/invite_code.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/login.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/activity.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/new_class.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/edit_class.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/blog.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/course_notice.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/discussion.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/homework.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/issue.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/journals.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/class.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/class_list.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/myresource.js?version=20160715&#45;1737"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/send_class_list.js"></script> -->
-  <!-- <script src="/javascripts/wechat/others/routes.js"></script> -->
+<%=  include_wechat_jsfile %>
 </body>
 
 </html>
diff --git a/config/application.rb b/config/application.rb
index 6f5542a1e..3885751f7 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -66,6 +66,7 @@ module RedmineApp
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+    config.assets.digest = true
 
     config.action_mailer.perform_deliveries = false
 
@@ -82,6 +83,8 @@ module RedmineApp
       end
     end
 
+    config.wechat_srcs = ['app.js','others/factory.js','others/filter.js', 'controllers/*.js', 'directives/*.js', 'others/routes.js']
+
     config.before_initialize do
     end
 
@@ -93,4 +96,4 @@ module RedmineApp
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/lib/tasks/wechat.rake b/lib/tasks/wechat.rake
new file mode 100644
index 000000000..bbba9994c
--- /dev/null
+++ b/lib/tasks/wechat.rake
@@ -0,0 +1,31 @@
+#coding=utf-8
+#
+
+def compress(srcs, outfile)
+  wechat_path = File.join(Rails.root, "public", "javascripts", "wechat")
+  out_buffer = ''
+
+  srcs.each do |src|
+    Dir.glob("#{wechat_path}/#{src}").each do |path|
+      puts "assets #{path}"
+      out_buffer = out_buffer + "\n//#{File.basename(path)}\n" + Uglifier.compile(File.read(path))
+    end
+  end
+
+  File.open(File.join(wechat_path, "build/#{outfile}"), 'w+') {|f| f.write(out_buffer)}
+end
+
+
+namespace :wechat do
+  desc "assets javascript file"
+  task :assets => :environment do
+    srcs = Rails.application.config.wechat_srcs
+    compress(srcs, 'app.min.js')
+  end
+
+  desc "minify angularjs"
+  task :minify => :environment do
+    srcs = ['../jquery-1.3.2.js','angular.js', 'angular-route.js', 'angular-sanitize.min.js']
+    compress(srcs, 'angular.all.min.js')
+  end
+end
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js
index b704dfb6e..f7838e901 100644
--- a/public/javascripts/wechat/build/app.min.js
+++ b/public/javascripts/wechat/build/app.min.js
@@ -1,24 +1,49 @@
-var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location","$routeParams",function(t,a,e,r){g_redirect_path&&g_redirect_path.length>1&&(e.path(g_redirect_path),g_redirect_path=null),t.$on("$routeChangeError",function(t,a,r){a&&a.templateUrl&&(a.templateUrl.endsWith("login.html")||a.templateUrl.endsWith("reg.html")||e.path("/login"))}),t.$on("$routeChangeStart",function(t,a,e){})}]);
-app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,i,e){this.message=i,this.title=t,this.visible=!0,this.cb=e},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,i,e,a,c){var s=function(){var c=e.defer(),s=o();if(s&&s.length>10)c.resolve(s);else{window.g_code||i.code||a.get("code");t.post("/wechat/get_bind",{}).then(function(t){0!=t.data.status?c.reject(t.data.message):(a.save("token",t.data.token),c.resolve(t.data.token))})["catch"](function(t){c.reject(t)})}return c.promise},o=function(){return a.get("token")};return{get_bind:s,token:o}}]),app.factory("session",function(){return{save:function(t,i){sessionStorage.setItem(t,i)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},i=function(i,e){t[i]=e},e=function(i){return t[i]};return{save:i,get:e}}),app.factory("common",["$http","auth","$routeParams","rms",function(t,i,e,a){var c=function(e,a,c,s){if(c.comment&&!(c.comment.length<=0)){var o=c.comment.replace(/\n/g,"<br/>"),n={type:a,content:o,token:i.token()};c.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+e,data:n}).then(function(t){c.disabled=!1,"function"==typeof s&&s()},function(t){})}},s=function(e,a){return t({method:"GET",url:apiUrl+a+"/"+e+"?token="+i.token()})},o=function(e){t({method:"POST",url:apiUrl+"praise/"+e.act_id,data:{token:i.token(),type:e.act_type}}).then(function(t){console.log(t.data)},function(t){})},n=function(e){t({method:"POST",url:apiUrl+"praise/"+e.act_id,data:{token:i.token(),type:e.act_type}}).then(function(t){console.log(t.data)},function(t){})},r=function(t){t.scope.formData={comment:""};var i=function(i){s(i,t.type).then(function(i){t.loadCallback(i.data)},function(t){})};i(t.id),t.scope.addReply=function(e){console.log(e.comment),c(t.id,t.replyType,e,function(){t.scope.formData={comment:""},i(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=function(t){activities=a.get("activities")||[],course_activities=a.get("course_activities")||[],project_activities=a.get("project_activities")||[];for(var i in activities)if(activities[i].act_id==t.act_id){activities[i].praise_count+=1,activities[i].has_praise=!0;break}for(var i in course_activities)if(course_activities[i].act_id==t.act_id){course_activities[i].praise_count+=1,course_activities[i].has_praise=!0;break}for(var i in project_activities)if(project_activities[i].act_id==t.act_id){project_activities[i].praise_count+=1,project_activities[i].has_praise=!0;break}a.save("activities",activities),a.save("course_activities",course_activities),a.save("project_activities",project_activities),t.praise_count+=1,t.has_praise=!0,o(t)},t.scope.decreasePraise=function(t){activities=a.get("activities")||[],course_activities=a.get("course_activities")||[],project_activities=a.get("project_activities")||[];for(var i in activities)if(activities[i].act_id==t.act_id){activities[i].praise_count-=1,activities[i].has_praise=!1;break}for(var i in course_activities)if(course_activities[i].act_id==t.act_id){course_activities[i].praise_count-=1,course_activities[i].has_praise=!1;break}for(var i in project_activities)if(project_activities[i].act_id==t.act_id){project_activities[i].praise_count-=1,project_activities[i].has_praise=!1;break}a.save("activities",activities),a.save("course_activities",course_activities),a.save("project_activities",project_activities),t.praise_count-=1,t.has_praise=!1,n(t)}};return{init:r,addCommonReply:c,loadCommonData:s,addCommonPraise:o,decreaseCommonPraise:n}}]);
-app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]),app.filter("identify",function(){return function(t){return"TeachingAsistant"==t?"教辅":""}});
-app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(a,e,t,i,c,s,o,r,_){t.replaceUrl=function(a){return a},t.menus=["所有动态","课程动态","项目动态"],t.alertService=_.create(),console.log("ActivityController load"),t.page=o.get("page")||0,t.activities=o.get("activities")||[],t.has_more=o.get("has_more"),t.course_page=o.get("course_page")||0,t.course_activities=o.get("course_activities")||[],t.course_has_more=o.get("course_has_more"),t.project_page=o.get("project_page")||0,t.project_activities=o.get("project_activities")||[],t.project_has_more=o.get("project_has_more"),t.loadActData=function(a,e){switch(container_type="All",a){case 1:container_type="All",t.page=e;break;case 2:container_type="Course",t.course_page=e;break;case 3:container_type="Project",t.project_page=e}i({method:"POST",url:apiUrl+"activities",data:{token:s.token(),page:e,container_type:container_type}}).then(function(a){if(a.data.page>0)switch(a.data.container_type){case"All":t.activities=t.activities.concat(a.data.data);break;case"Course":t.course_activities=t.course_activities.concat(a.data.data);break;case"Project":t.project_activities=t.project_activities.concat(a.data.data);break;case 3:}else switch(a.data.container_type){case"All":t.activities=a.data.data;break;case"Course":t.course_activities=a.data.data;break;case"Project":t.project_activities=a.data.data;break;case 3:}switch(a.data.container_type){case"All":o.save("activities",t.activities),t.has_more=a.data.count+10*a.data.page<a.data.all_count,o.save("has_more",t.has_more),o.save("page",a.data.page);break;case"Course":o.save("course_activities",t.course_activities),t.course_has_more=a.data.count+10*a.data.page<a.data.all_count,o.save("course_has_more",t.course_has_more),o.save("course_page",a.data.page);break;case"Project":o.save("project_activities",t.project_activities),t.project_has_more=a.data.count+10*a.data.page<a.data.all_count,o.save("project_has_more",t.project_has_more),o.save("project_page",a.data.page);break;case 3:}console.log(a.data)},function(a){})},t.tab=function(a){switch(t.currentTab=a,a){case 1:t.activities.length<=0&&t.loadActData(a,0);break;case 2:t.course_activities.length<=0&&t.loadActData(a,0);break;case 3:t.project_activities.length<=0&&t.loadActData(a,0)}},t.currentTab=1,t.activities.length<=0?t.loadActData(1,0):c(function(){window.scrollTo(0,o.get("yoffset"))}),t.goDetail=function(a,i,c){o.save("yoffset",window.document.body.scrollTop),o.save("activities",t.activities),o.save("course_activities",t.course_activities),o.save("project_activities",t.project_activities),e.path("/"+a+"/"+i)},t.addPraise=function(a){for(var e in t.activities)if(t.activities[e].act_id==a.act_id){t.activities[e].praise_count+=1,t.activities[e].has_praise=!0;break}for(var e in t.course_activities)if(t.course_activities[e].act_id==a.act_id){t.course_activities[e].praise_count+=1,t.course_activities[e].has_praise=!0;break}for(var e in t.project_activities)if(t.project_activities[e].act_id==a.act_id){t.project_activities[e].praise_count+=1,t.project_activities[e].has_praise=!0;break}r.addCommonPraise(a)},t.decreasePraise=function(a){for(var e in t.activities)if(t.activities[e].act_id==a.act_id){t.activities[e].praise_count-=1,t.activities[e].has_praise=!1;break}for(var e in t.course_activities)if(t.course_activities[e].act_id==a.act_id){t.course_activities[e].praise_count-=1,t.course_activities[e].has_praise=!1;break}for(var e in t.project_activities)if(t.project_activities[e].act_id==a.act_id){t.project_activities[e].praise_count-=1,t.project_activities[e].has_praise=!1;break}r.decreaseCommonPraise(a)}}]);
+
+//app.js
+var app=angular.module("wechat",["ngRoute"]);app.constant("config",{rootPath:"/assets/wechat/",rootUrl:"/",apiUrl:"/api/v1/"}),app.run(["$rootScope","auth","$location","$routeParams",function(t,a,e){g_redirect_path&&g_redirect_path.length>1&&(e.path(g_redirect_path),g_redirect_path=null),t.$on("$routeChangeError",function(t,a){a&&a.templateUrl&&(a.templateUrl.endsWith("login.html")||a.templateUrl.endsWith("reg.html")||e.path("/login"))}),t.$on("$routeChangeStart",function(){})}]);
+//factory.js
+app.factory("alertService",function(){function t(){this.title=null,this.message=null,this.visible=null,this.cb=null}return t.prototype.showMessage=function(t,i,e){this.message=i,this.title=t,this.visible=!0,this.cb=e},t.prototype.dismiss=function(){this.message=null,this.title=null,this.visible=!1,this.cb&&this.cb()},{create:function(){return new t}}}),app.factory("auth",["$http","$routeParams","$q","session","config",function(t,i,e,a){var c=function(){var c=e.defer(),o=s();if(o&&o.length>10)c.resolve(o);else{{window.g_code||i.code||a.get("code")}t.post("/wechat/get_bind",{}).then(function(t){0!=t.data.status?c.reject(t.data.message):(a.save("token",t.data.token),c.resolve(t.data.token))})["catch"](function(t){c.reject(t)})}return c.promise},s=function(){return a.get("token")};return{get_bind:c,token:s}}]),app.factory("session",function(){return{save:function(t,i){sessionStorage.setItem(t,i)},get:function(t){return sessionStorage.getItem(t)}}}),app.factory("rms",function(){var t={},i=function(i,e){t[i]=e},e=function(i){return t[i]};return{save:i,get:e}}),app.factory("common",["$http","auth","$routeParams","rms",function(t,i,e,a){var c=function(e,a,c,s){if(c.comment&&!(c.comment.length<=0)){var o=c.comment.replace(/\n/g,"<br/>"),n={type:a,content:o,token:i.token()};c.disabled=!0,t({method:"POST",url:apiUrl+"new_comment/"+e,data:n}).then(function(){c.disabled=!1,"function"==typeof s&&s()},function(){})}},s=function(e,a){return t({method:"GET",url:apiUrl+a+"/"+e+"?token="+i.token()})},o=function(e){t({method:"POST",url:apiUrl+"praise/"+e.act_id,data:{token:i.token(),type:e.act_type}}).then(function(t){console.log(t.data)},function(){})},n=function(e){t({method:"POST",url:apiUrl+"praise/"+e.act_id,data:{token:i.token(),type:e.act_type}}).then(function(t){console.log(t.data)},function(){})},r=function(t){t.scope.formData={comment:""};var i=function(i){s(i,t.type).then(function(i){t.loadCallback(i.data)},function(){})};i(t.id),t.scope.addReply=function(e){console.log(e.comment),c(t.id,t.replyType,e,function(){t.scope.formData={comment:""},i(t.id),"function"==typeof t.replyCallback&&t.replyCallback()})},t.scope.addPraise=function(t){activities=a.get("activities")||[],course_activities=a.get("course_activities")||[],project_activities=a.get("project_activities")||[];for(var i in activities)if(activities[i].act_id==t.act_id){activities[i].praise_count+=1,activities[i].has_praise=!0;break}for(var i in course_activities)if(course_activities[i].act_id==t.act_id){course_activities[i].praise_count+=1,course_activities[i].has_praise=!0;break}for(var i in project_activities)if(project_activities[i].act_id==t.act_id){project_activities[i].praise_count+=1,project_activities[i].has_praise=!0;break}a.save("activities",activities),a.save("course_activities",course_activities),a.save("project_activities",project_activities),t.praise_count+=1,t.has_praise=!0,o(t)},t.scope.decreasePraise=function(t){activities=a.get("activities")||[],course_activities=a.get("course_activities")||[],project_activities=a.get("project_activities")||[];for(var i in activities)if(activities[i].act_id==t.act_id){activities[i].praise_count-=1,activities[i].has_praise=!1;break}for(var i in course_activities)if(course_activities[i].act_id==t.act_id){course_activities[i].praise_count-=1,course_activities[i].has_praise=!1;break}for(var i in project_activities)if(project_activities[i].act_id==t.act_id){project_activities[i].praise_count-=1,project_activities[i].has_praise=!1;break}a.save("activities",activities),a.save("course_activities",course_activities),a.save("project_activities",project_activities),t.praise_count-=1,t.has_praise=!1,n(t)}};return{init:r,addCommonReply:c,loadCommonData:s,addCommonPraise:o,decreaseCommonPraise:n}}]);
+//filter.js
+app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]),app.filter("identify",function(){return function(t){return"TeachingAsistant"==t?"\u6559\u8f85":""}});
+//activity.js
+app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(a,e,t,i,c,s,o,r,_){t.replaceUrl=function(a){return a},t.menus=["\u6240\u6709\u52a8\u6001","\u8bfe\u7a0b\u52a8\u6001","\u9879\u76ee\u52a8\u6001"],t.alertService=_.create(),console.log("ActivityController load"),t.page=o.get("page")||0,t.activities=o.get("activities")||[],t.has_more=o.get("has_more"),t.course_page=o.get("course_page")||0,t.course_activities=o.get("course_activities")||[],t.course_has_more=o.get("course_has_more"),t.project_page=o.get("project_page")||0,t.project_activities=o.get("project_activities")||[],t.project_has_more=o.get("project_has_more"),t.loadActData=function(a,e){switch(container_type="All",a){case 1:container_type="All",t.page=e;break;case 2:container_type="Course",t.course_page=e;break;case 3:container_type="Project",t.project_page=e}i({method:"POST",url:apiUrl+"activities",data:{token:s.token(),page:e,container_type:container_type}}).then(function(a){if(a.data.page>0)switch(a.data.container_type){case"All":t.activities=t.activities.concat(a.data.data);break;case"Course":t.course_activities=t.course_activities.concat(a.data.data);break;case"Project":t.project_activities=t.project_activities.concat(a.data.data);break;case 3:}else switch(a.data.container_type){case"All":t.activities=a.data.data;break;case"Course":t.course_activities=a.data.data;break;case"Project":t.project_activities=a.data.data;break;case 3:}switch(a.data.container_type){case"All":o.save("activities",t.activities),t.has_more=a.data.count+10*a.data.page<a.data.all_count,o.save("has_more",t.has_more),o.save("page",a.data.page);break;case"Course":o.save("course_activities",t.course_activities),t.course_has_more=a.data.count+10*a.data.page<a.data.all_count,o.save("course_has_more",t.course_has_more),o.save("course_page",a.data.page);break;case"Project":o.save("project_activities",t.project_activities),t.project_has_more=a.data.count+10*a.data.page<a.data.all_count,o.save("project_has_more",t.project_has_more),o.save("project_page",a.data.page);break;case 3:}console.log(a.data)},function(){})},t.tab=function(a){switch(t.currentTab=a,a){case 1:t.activities.length<=0&&t.loadActData(a,0);break;case 2:t.course_activities.length<=0&&t.loadActData(a,0);break;case 3:t.project_activities.length<=0&&t.loadActData(a,0)}},t.currentTab=1,t.activities.length<=0?t.loadActData(1,0):c(function(){window.scrollTo(0,o.get("yoffset"))}),t.goDetail=function(a,i){o.save("yoffset",window.document.body.scrollTop),o.save("activities",t.activities),o.save("course_activities",t.course_activities),o.save("project_activities",t.project_activities),e.path("/"+a+"/"+i)},t.addPraise=function(a){for(var e in t.activities)if(t.activities[e].act_id==a.act_id){t.activities[e].praise_count+=1,t.activities[e].has_praise=!0;break}for(var e in t.course_activities)if(t.course_activities[e].act_id==a.act_id){t.course_activities[e].praise_count+=1,t.course_activities[e].has_praise=!0;break}for(var e in t.project_activities)if(t.project_activities[e].act_id==a.act_id){t.project_activities[e].praise_count+=1,t.project_activities[e].has_praise=!0;break}r.addCommonPraise(a)},t.decreasePraise=function(a){for(var e in t.activities)if(t.activities[e].act_id==a.act_id){t.activities[e].praise_count-=1,t.activities[e].has_praise=!1;break}for(var e in t.course_activities)if(t.course_activities[e].act_id==a.act_id){t.course_activities[e].praise_count-=1,t.course_activities[e].has_praise=!1;break}for(var e in t.project_activities)if(t.project_activities[e].act_id==a.act_id){t.project_activities[e].praise_count-=1,t.project_activities[e].has_praise=!1;break}r.decreaseCommonPraise(a)}}]);
+//blog.js
 app.controller("BlogController",["$scope","$http","$routeParams","auth","common",function(o,l,t,n,a){a.init({id:t.id,scope:o,type:"blog_comments",replyType:"BlogComment",loadCallback:function(l){o.blog=l.data},replyCallback:function(){}})}]);
-app.controller("ClassController",["$scope","config","$http","auth","$location","$routeParams",function(e,s,t,o,a,n){var r=e,c=n.id,u=function(){r.teachers.length<=0&&t.get(s.apiUrl+"courses/teachers?token="+o.token()+"&course_id="+c).then(function(e){console.log(e.data),r.teachers=e.data.data}),r.students.length<=0&&t.get(s.apiUrl+"courses/students?token="+o.token()+"&course_id="+c).then(function(e){console.log(e.data),r.students=e.data.data})},i=function(){r.resources.length<=0&&t.post(s.apiUrl+"courses/"+c+"/attachments",{token:o.token(),name:""}).then(function(e){r.resources=e.data.data,r.resources_tag=!0})},h=function(){r.homeworks.length<=0&&t.get(s.apiUrl+"courses/homeworks/"+c+"?token="+o.token()).then(function(e){r.homeworks=e.data.data,console.log(e.data),r.homeworks_tag=!0})},l=function(){r.exercises.length<=0&&t.get(s.apiUrl+"courses/"+c+"/exercises?token="+o.token()).then(function(e){r.exercises=e.data.data,console.log(e.data),r.exercises_tag=!0})};r.isTeacher=!1,r.currentTab=1,r.tab=function(e){r.currentTab=e,r.searchText="",r.showClassMate=!1,r.showResources=!1,r.showHomework=!1,r.showTestcase=!1,r.resources_tag=!1,r.homeworks_tag=!1,r.exercises_tag=!1,r.isTeacher?1==e?(i(),r.showResources=!0):2==e?(h(),r.showHomework=!0):3==e?(l(),r.showTestcase=!0):4==e&&(u(),r.showClassMate=!0):2==e?(u(),r.showClassMate=!0):1==e&&(i(),r.showResources=!0)},r.course={},r.students=[],r.teachers=[],r.resources=[],r.homeworks=[],r.exercises=[],r.invite=function(){a.path("/invite_code").search({id:c})},r.sendFile=function(e){a.path("/send_class_list").search({id:e.id})},t.get(s.apiUrl+"courses/"+c+"?token="+o.token()).then(function(e){console.log(e.data),r.course=e.data.data,d(r.course.current_user_is_teacher),r.tab(1)});var d=function(e){r.isTeacher=e,e?r.menus=["课件","作业","小测验","学生管理"]:r.menus=["课件","我的同学"]}}]);
-app.controller("ClassListController",["$scope","config","auth","$http","$location","alertService","rms",function(e,s,a,t,o,l,n){var c=e;c.syllabuses=n.get("syllabuses")||[],c.alertService=l.create();var i=function(){t.get(s.apiUrl+"syllabuses?token="+a.token()).then(function(e){console.log(e.data),c.syllabuses=e.data.data,n.save("syllabuses",c.syllabuses)})};c.syllabuses.length<=0&&i(),c.goClass=function(e){console.log(e),o.path("/class").search({id:e})},c.newClass=function(){t.post(s.apiUrl+"syllabuses/auth",{token:a.token()}).then(function(e){console.log(e.data),0==e.data.auth?c.alertService.showMessage("提示","非教师身份不能创建课程哦~"):o.path("/new_class")})},c.goResource=function(){o.path("/myresource")},c.joinClass=function(){var e=window.prompt("请输入5位班级邀请码(不区分大小写)");e&&5==e.length?t.post(s.apiUrl+"courses/join",{token:a.token(),invite_code:e}).then(function(e){console.log(e.data),0!=e.data.status?c.alertService.showMessage("错误",e.data.message):(c.alertService.showMessage("提示","加入课程成功"),i())}):e&&c.alertService.showMessage("错误","邀请码格式不正确")},c.onSetting=function(e){console.log(e),n.save("current_edit_syllobus",e),o.path("/edit_class").search({id:e.id})}}]);
+//class.js
+app.controller("ClassController",["$scope","config","$http","auth","$location","$routeParams",function(e,s,t,o,a,n){var r=e,c=n.id,i=function(){r.teachers.length<=0&&t.get(s.apiUrl+"courses/teachers?token="+o.token()+"&course_id="+c).then(function(e){console.log(e.data),r.teachers=e.data.data}),r.students.length<=0&&t.get(s.apiUrl+"courses/students?token="+o.token()+"&course_id="+c).then(function(e){console.log(e.data),r.students=e.data.data})},u=function(){r.resources.length<=0&&t.post(s.apiUrl+"courses/"+c+"/attachments",{token:o.token(),name:""}).then(function(e){r.resources=e.data.data,r.resources_tag=!0})},h=function(){r.homeworks.length<=0&&t.get(s.apiUrl+"courses/homeworks/"+c+"?token="+o.token()).then(function(e){r.homeworks=e.data.data,console.log(e.data),r.homeworks_tag=!0})},l=function(){r.exercises.length<=0&&t.get(s.apiUrl+"courses/"+c+"/exercises?token="+o.token()).then(function(e){r.exercises=e.data.data,console.log(e.data),r.exercises_tag=!0})};r.isTeacher=!1,r.currentTab=1,r.tab=function(e){r.currentTab=e,r.searchText="",r.showClassMate=!1,r.showResources=!1,r.showHomework=!1,r.showTestcase=!1,r.resources_tag=!1,r.homeworks_tag=!1,r.exercises_tag=!1,r.isTeacher?1==e?(u(),r.showResources=!0):2==e?(h(),r.showHomework=!0):3==e?(l(),r.showTestcase=!0):4==e&&(i(),r.showClassMate=!0):2==e?(i(),r.showClassMate=!0):1==e&&(u(),r.showResources=!0)},r.course={},r.students=[],r.teachers=[],r.resources=[],r.homeworks=[],r.exercises=[],r.invite=function(){a.path("/invite_code").search({id:c})},r.sendFile=function(e){a.path("/send_class_list").search({id:e.id})},t.get(s.apiUrl+"courses/"+c+"?token="+o.token()).then(function(e){console.log(e.data),r.course=e.data.data,d(r.course.current_user_is_teacher),r.tab(1)});var d=function(e){r.isTeacher=e,r.menus=e?["\u8bfe\u4ef6","\u4f5c\u4e1a","\u5c0f\u6d4b\u9a8c","\u5b66\u751f\u7ba1\u7406"]:["\u8bfe\u4ef6","\u6211\u7684\u540c\u5b66"]}}]);
+//class_list.js
+app.controller("ClassListController",["$scope","config","auth","$http","$location","alertService","rms",function(e,s,a,t,o,l,n){var c=e;c.syllabuses=n.get("syllabuses")||[],c.alertService=l.create();var i=function(){t.get(s.apiUrl+"syllabuses?token="+a.token()).then(function(e){console.log(e.data),c.syllabuses=e.data.data,n.save("syllabuses",c.syllabuses)})};c.syllabuses.length<=0&&i(),c.goClass=function(e){console.log(e),o.path("/class").search({id:e})},c.newClass=function(){t.post(s.apiUrl+"syllabuses/auth",{token:a.token()}).then(function(e){console.log(e.data),0==e.data.auth?c.alertService.showMessage("\u63d0\u793a","\u975e\u6559\u5e08\u8eab\u4efd\u4e0d\u80fd\u521b\u5efa\u8bfe\u7a0b\u54e6~"):o.path("/new_class")})},c.goResource=function(){o.path("/myresource")},c.joinClass=function(){var e=window.prompt("\u8bf7\u8f93\u51655\u4f4d\u73ed\u7ea7\u9080\u8bf7\u7801(\u4e0d\u533a\u5206\u5927\u5c0f\u5199)");e&&5==e.length?t.post(s.apiUrl+"courses/join",{token:a.token(),invite_code:e}).then(function(e){console.log(e.data),0!=e.data.status?c.alertService.showMessage("\u9519\u8bef",e.data.message):(c.alertService.showMessage("\u63d0\u793a","\u52a0\u5165\u8bfe\u7a0b\u6210\u529f"),i())}):e&&c.alertService.showMessage("\u9519\u8bef","\u9080\u8bf7\u7801\u683c\u5f0f\u4e0d\u6b63\u786e")},c.onSetting=function(e){console.log(e),n.save("current_edit_syllobus",e),o.path("/edit_class").search({id:e.id})}}]);
+//course_notice.js
 app.controller("CourseNoticeController",["$scope","$http","$routeParams","auth","common",function(o,e,t,n,a){a.init({id:t.id,scope:o,type:"newss",replyType:"News",loadCallback:function(e){o.news=e.data},replyCallback:function(){}})}]);
+//discussion.js
 app.controller("DiscussionController",["$scope","$http","$routeParams","auth","common",function(o,s,a,e,n){n.init({id:a.id,scope:o,type:"messages",replyType:"Message",loadCallback:function(s){o.discussion=s.data},replyCallback:function(){}})}]);
-app.controller("EditClassController",["$scope","$http","auth","config","alertService","$location","$routeParams","rms",function(s,e,a,l,t,o,r,n){var u=s;u.syllabus=n.get("current_edit_syllobus");var i=r.id;if(u.syllabus||e.get(l.apiUrl+"syllabuses/"+i+"?token="+a.token()).then(function(s){if(console.log(s.data),u.syllabus=s.data.data,u.syllabus){for(var e in u.syllabus.courses){var a=u.syllabus.courses[e];a.tmpname=a.name}u.syllabus.tmptitle=u.syllabus.title}}),console.log(u.syllabus),u.syllabus){for(var c in u.syllabus.courses){var d=u.syllabus.courses[c];d.tmpname=d.name}u.syllabus.tmptitle=u.syllabus.title}u.alertService_1=t.create(),u.alertService_2=t.create(),u.addClass=function(){u.syllabus.courses.push({can_setting:!0})},u.deleteClass=function(s){var t=u.syllabus.courses[s];t.id>0?u.alertService_2.showMessage("提示","您确定要删除该班级吗？",function(){e.post(l.apiUrl+"courses/"+t.id+"/del",{token:a.token()}).then(function(e){0!=e.data.status?u.alertService_1.showMessage("出错了",e.data.message):u.alertService_1.showMessage("提示","删除班级成功",function(){u.syllabus.courses.splice(s,1)}),console.log(e.data.data)})}):u.syllabus.courses.splice(s,1)},u.newClass=function(s,t){if(s.$setSubmitted(),console.log(t),!s.$valid)return void console.log(s.$error);var r=[],c=[];for(var d in u.syllabus.courses){var b=u.syllabus.courses[d];b.id?b.tmpname!=b.name&&c.push({id:b.id,name:b.tmpname}):r.push(b.tmpname)}e.post(l.apiUrl+"syllabuses/"+i+"/edit",{token:a.token(),id:i,title:u.syllabus.tmptitle,add_courses:r,modify_courses:c}).then(function(s){0!=s.data.status?u.alertService_1.showMessage("出错了",s.data.message):u.alertService_1.showMessage("提示","保存课程成功",function(){n.save("syllabuses",[]),o.path("/class_list")}),console.log(s.data.data)})},u.fadeText=function(){s.change=!0}}]);
+//edit_class.js
+app.controller("EditClassController",["$scope","$http","auth","config","alertService","$location","$routeParams","rms",function(s,e,a,l,t,o,r,n){var u=s;u.syllabus=n.get("current_edit_syllobus");var i=r.id;if(u.syllabus||e.get(l.apiUrl+"syllabuses/"+i+"?token="+a.token()).then(function(s){if(console.log(s.data),u.syllabus=s.data.data,u.syllabus){for(var e in u.syllabus.courses){var a=u.syllabus.courses[e];a.tmpname=a.name}u.syllabus.tmptitle=u.syllabus.title}}),console.log(u.syllabus),u.syllabus){for(var c in u.syllabus.courses){var d=u.syllabus.courses[c];d.tmpname=d.name}u.syllabus.tmptitle=u.syllabus.title}u.alertService_1=t.create(),u.alertService_2=t.create(),u.addClass=function(){u.syllabus.courses.push({can_setting:!0})},u.deleteClass=function(s){var t=u.syllabus.courses[s];t.id>0?u.alertService_2.showMessage("\u63d0\u793a","\u60a8\u786e\u5b9a\u8981\u5220\u9664\u8be5\u73ed\u7ea7\u5417\uff1f",function(){e.post(l.apiUrl+"courses/"+t.id+"/del",{token:a.token()}).then(function(e){0!=e.data.status?u.alertService_1.showMessage("\u51fa\u9519\u4e86",e.data.message):u.alertService_1.showMessage("\u63d0\u793a","\u5220\u9664\u73ed\u7ea7\u6210\u529f",function(){u.syllabus.courses.splice(s,1)}),console.log(e.data.data)})}):u.syllabus.courses.splice(s,1)},u.newClass=function(s,t){if(s.$setSubmitted(),console.log(t),!s.$valid)return void console.log(s.$error);var r=[],c=[];for(var d in u.syllabus.courses){var b=u.syllabus.courses[d];b.id?b.tmpname!=b.name&&c.push({id:b.id,name:b.tmpname}):r.push(b.tmpname)}e.post(l.apiUrl+"syllabuses/"+i+"/edit",{token:a.token(),id:i,title:u.syllabus.tmptitle,add_courses:r,modify_courses:c}).then(function(s){0!=s.data.status?u.alertService_1.showMessage("\u51fa\u9519\u4e86",s.data.message):u.alertService_1.showMessage("\u63d0\u793a","\u4fdd\u5b58\u8bfe\u7a0b\u6210\u529f",function(){n.save("syllabuses",[]),o.path("/class_list")}),console.log(s.data.data)})},u.fadeText=function(){s.change=!0}}]);
+//homework.js
 app.controller("HomeworkController",["$scope","$http","$routeParams","auth","common",function(o,e,l,n,r){r.init({id:l.id,scope:o,type:"whomeworks",replyType:"HomeworkCommon",loadCallback:function(e){console.log(e),o.homework=e.data},replyCallback:function(){}})}]);
-app.controller("InviteCodeController",["$scope","$http","$routeParams","config","auth",function(t,e,i,n,o){var a=t;a.course={};var c=i.id;e.get(n.apiUrl+"courses/"+c+"?token="+o.token()).then(function(t){console.log(t.data),a.course=t.data.data}),a.share=function(){window.WeixinJSBridge.invoke("sendAppMessage",{appid:"wxf694495398c7d470",type:"link",data_url:"",img_url:"http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640",img_height:370,img_width:550,link:"http://view.inews.qq.com/a/WXN2013101101385701",desc:"desc",title:"title"},function(t){})}}]);
+//invite_code.js
+app.controller("InviteCodeController",["$scope","$http","$routeParams","config","auth",function(t,e,i,n,o){var a=t;a.course={};var c=i.id;e.get(n.apiUrl+"courses/"+c+"?token="+o.token()).then(function(t){console.log(t.data),a.course=t.data.data}),a.share=function(){window.WeixinJSBridge.invoke("sendAppMessage",{appid:"wxf694495398c7d470",type:"link",data_url:"",img_url:"http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640",img_height:370,img_width:550,link:"http://view.inews.qq.com/a/WXN2013101101385701",desc:"desc",title:"title"},function(){})}}]);
+//issue.js
 app.controller("IssueController",["$scope","$http","$routeParams","auth","common",function(o,e,l,s,t){t.init({id:l.id,scope:o,type:"issues",replyType:"Issue",loadCallback:function(e){console.log(e),o.issue=e.data},replyCallback:function(){}})}]);
+//journals.js
 app.controller("JournalsController",["$scope","$http","$routeParams","auth","common",function(o,a,e,l,n){n.init({id:e.id,scope:o,type:"journal_for_messages",replyType:"JournalsForMessage",loadCallback:function(a){o.message=a.data},replyCallback:function(){}})}]);
-app.controller("LoginController",["$scope","$http","$location","$routeParams","alertService","config","auth","session",function(e,o,t,a,i,n,s,l){s.get_bind().then(function(){t.path("/activities")}),a.code&&l.save("code",a.code);var r=e;r.loginFailed=!1,r.alertService=i.create(),r.findPwdDialog=i.create(),r.login=function(a,i){return a.$setSubmitted(),console.log(i),a.$valid?(console.log(apiUrl+"auth"),void o.post(n.apiUrl+"users/wxbind",{login:i.login,password:i.password}).then(function(o){console.log(o.data),r.loginFailed=0!=o.data.status,e.loginFailed?r.alertService.showMessage("出错了",o.data.message):r.alertService.showMessage("提示",o.data.message,function(){t.path("/activities")})})["catch"](function(e){r.alertService.showMessage("出错了",e)})):void console.log(a.$error)},r.showBox=function(){r.findPwdDialog.showMessage("提示","请访问www.trustie.net获取密码，谢谢！")},r.goReg=function(){t.path("/reg")}}]);
-app.controller("MyResourceController",["$scope","$http","auth","config","$location","rms",function(e,a,o,s,r,t){var c=e;c.menus=["课件","作业","测验"],c.resources=[],c.homeworks=[],c.exercise=[],c.resources_tag=!1,c.homeworks_tag=!1,c.exercises_tag=!1,c.page=t.get("page")||0,c.resources=t.get("resources")||[],c.has_more=t.get("has_more"),c.homework_page=t.get("homework_page")||0,c.homeworks=t.get("homeworks")||[],c.homework_has_more=t.get("homework_has_more"),c.exercise_page=t.get("exercise_page")||0,c.exercise=t.get("exercise")||[],c.exercise_has_more=t.get("exercise_has_more"),c.searchText="",c.sendFile=function(e){r.path("/send_class_list").search({id:e.id})},c.loadResourceData=function(e,s){1==e?(c.page=s,a({method:"POST",url:apiUrl+"resources",data:{token:o.token(),page:s}}).then(function(e){c.resources_tag=!0,e.data.page>0?c.resources=c.resources.concat(e.data.data):c.resources=e.data.data,t.save("resources",c.resources),c.has_more=e.data.count+10*e.data.page<e.data.all_count,t.save("has_more",c.has_more),t.save("page",e.data.page),console.log(e.data)},function(e){})):2==e?(c.homework_page=s,a({method:"POST",url:apiUrl+"resources/homeworks",data:{token:o.token(),page:s}}).then(function(e){c.homeworks_tag=!0,e.data.page>0?c.homeworks=c.homeworks.concat(e.data.data):c.homeworks=e.data.data,t.save("homeworks",c.homeworks),c.homework_has_more=e.data.count+10*e.data.page<e.data.all_count,t.save("homework_has_more",c.has_more),t.save("homework_page",e.data.page),console.log(e.data)},function(e){})):3==e&&(c.exercise_page=s,a({method:"POST",url:apiUrl+"resources/exercises",data:{token:o.token(),page:s}}).then(function(e){c.exercises_tag=!0,e.data.page>0?c.exercise=c.exercise.concat(e.data.data):c.exercise=e.data.data,t.save("exercise",c.exercise),c.exercise_has_more=e.data.count+10*e.data.page<e.data.all_count,t.save("exercise_has_more",c.exercise_has_more),t.save("exercise_page",e.data.page),console.log(e.data)},function(e){}))},c.tab=function(e){switch(c.currentTab=e,c.searchText="",e){case 1:c.resources.length<=0&&c.loadResourceData(e,0);break;case 2:c.homeworks.length<=0&&c.loadResourceData(e,0);break;case 3:c.exercise.length<=0&&c.loadResourceData(e,0)}},c.tab(1)}]);
-app.controller("NewClassController",["$scope","$http","auth","config","alertService","$location","rms",function(s,e,a,l,t,o,r){var n=s;n.alertService=t.create(),n.syllabus={courses:[{name:""}]},n.addClass=function(){n.syllabus.courses.push({})},n.deleteClass=function(s){n.syllabus.courses.splice(s,1)},n.newClass=function(s,t){if(s.$setSubmitted(),console.log(t),!s.$valid)return void console.log(s.$error);var c=[];for(var u in n.syllabus.courses)c.push(n.syllabus.courses[u].name);e.post(l.apiUrl+"syllabuses",{token:a.token(),title:t.title,courses:c}).then(function(s){0!=s.data.status?n.alertService.showMessage("出错了",s.data.message):n.alertService.showMessage("提示","新建课程成功",function(){r.save("syllabuses",[]),o.path("/class_list")}),console.log(s.data.data)})}}]);
-app.controller("RegController",["$scope","$http","$location","alertService","$location",function(e,o,a,s,a){var t=e;t.errDialog=s.create(),t.successDialog=s.create(),t.goLogin=function(){a.path("/login")},t.isagreed=!0,t.agreed=function(e){t.isagreed=!e},t.reg=function(e,s){return e.$setSubmitted(),console.log(e),e.$valid?(console.log(s),void o.post(apiUrl+"users",{login:s.username,password:s.password,mail:s.email}).then(function(e){0!=e.data.status?t.errDialog.showMessage("出错了",e.data.message):t.successDialog.showMessage("提示","注册且绑定微信成功",function(){a.path("/activities")})},function(e){t.errDialog.showMessage("出错了",e.data)})):void console.log(e.$error)}}]);
-app.controller("SendClassListController",["$scope","$http","$routeParams","config","auth","alertService","rms",function(e,s,o,a,t,r,c){var n=e,l=o.id;n.alertService=r.create(),n.syllabuses=[];var i=function(){s.get(a.apiUrl+"syllabuses?token="+t.token()).then(function(e){console.log(e.data),n.syllabuses=e.data.data})};i(),n.selectCourse=function(e){"boolean"!=typeof e.checked&&(e.checked=!1),e.checked=!e.checked},n.sendToCourses=function(){var e=[];for(var o in n.syllabuses)for(var r in n.syllabuses[o].courses)n.syllabuses[o].courses[r].checked&&e.push(n.syllabuses[o].courses[r].id);return e.length<=0?void n.alertService.showMessage("提醒","请先选择班级"):void s.post(a.apiUrl+"resources/send",{token:t.token(),course_ids:e,send_id:l}).then(function(e){console.log(e.data),0==e.data.status?n.alertService.showMessage("提示","发送成功",function(){window.history.back()}):n.alertService.showMessage("发送出错",e.data.message)})}}]);
+//login.js
+app.controller("LoginController",["$scope","$http","$location","$routeParams","alertService","config","auth","session",function(e,o,t,a,i,n,s,l){s.get_bind().then(function(){t.path("/activities")}),a.code&&l.save("code",a.code);var r=e;r.loginFailed=!1,r.alertService=i.create(),r.findPwdDialog=i.create(),r.login=function(a,i){return a.$setSubmitted(),console.log(i),a.$valid?(console.log(apiUrl+"auth"),void o.post(n.apiUrl+"users/wxbind",{login:i.login,password:i.password}).then(function(o){console.log(o.data),r.loginFailed=0!=o.data.status,e.loginFailed?r.alertService.showMessage("\u51fa\u9519\u4e86",o.data.message):r.alertService.showMessage("\u63d0\u793a",o.data.message,function(){t.path("/activities")})})["catch"](function(e){r.alertService.showMessage("\u51fa\u9519\u4e86",e)})):void console.log(a.$error)},r.showBox=function(){r.findPwdDialog.showMessage("\u63d0\u793a","\u8bf7\u8bbf\u95eewww.trustie.net\u83b7\u53d6\u5bc6\u7801\uff0c\u8c22\u8c22\uff01")},r.goReg=function(){t.path("/reg")}}]);
+//myresource.js
+app.controller("MyResourceController",["$scope","$http","auth","config","$location","rms",function(e,a,o,s,r,t){var c=e;c.menus=["\u8bfe\u4ef6","\u4f5c\u4e1a","\u6d4b\u9a8c"],c.resources=[],c.homeworks=[],c.exercise=[],c.resources_tag=!1,c.homeworks_tag=!1,c.exercises_tag=!1,c.page=t.get("page")||0,c.resources=t.get("resources")||[],c.has_more=t.get("has_more"),c.homework_page=t.get("homework_page")||0,c.homeworks=t.get("homeworks")||[],c.homework_has_more=t.get("homework_has_more"),c.exercise_page=t.get("exercise_page")||0,c.exercise=t.get("exercise")||[],c.exercise_has_more=t.get("exercise_has_more"),c.searchText="",c.sendFile=function(e){r.path("/send_class_list").search({id:e.id})},c.loadResourceData=function(e,s){1==e?(c.page=s,a({method:"POST",url:apiUrl+"resources",data:{token:o.token(),page:s}}).then(function(e){c.resources_tag=!0,c.resources=e.data.page>0?c.resources.concat(e.data.data):e.data.data,t.save("resources",c.resources),c.has_more=e.data.count+10*e.data.page<e.data.all_count,t.save("has_more",c.has_more),t.save("page",e.data.page),console.log(e.data)},function(){})):2==e?(c.homework_page=s,a({method:"POST",url:apiUrl+"resources/homeworks",data:{token:o.token(),page:s}}).then(function(e){c.homeworks_tag=!0,c.homeworks=e.data.page>0?c.homeworks.concat(e.data.data):e.data.data,t.save("homeworks",c.homeworks),c.homework_has_more=e.data.count+10*e.data.page<e.data.all_count,t.save("homework_has_more",c.has_more),t.save("homework_page",e.data.page),console.log(e.data)},function(){})):3==e&&(c.exercise_page=s,a({method:"POST",url:apiUrl+"resources/exercises",data:{token:o.token(),page:s}}).then(function(e){c.exercises_tag=!0,c.exercise=e.data.page>0?c.exercise.concat(e.data.data):e.data.data,t.save("exercise",c.exercise),c.exercise_has_more=e.data.count+10*e.data.page<e.data.all_count,t.save("exercise_has_more",c.exercise_has_more),t.save("exercise_page",e.data.page),console.log(e.data)},function(){}))},c.tab=function(e){switch(c.currentTab=e,c.searchText="",e){case 1:c.resources.length<=0&&c.loadResourceData(e,0);break;case 2:c.homeworks.length<=0&&c.loadResourceData(e,0);break;case 3:c.exercise.length<=0&&c.loadResourceData(e,0)}},c.tab(1)}]);
+//new_class.js
+app.controller("NewClassController",["$scope","$http","auth","config","alertService","$location","rms",function(s,e,a,l,t,o,r){var n=s;n.alertService=t.create(),n.syllabus={courses:[{name:""}]},n.addClass=function(){n.syllabus.courses.push({})},n.deleteClass=function(s){n.syllabus.courses.splice(s,1)},n.newClass=function(s,t){if(s.$setSubmitted(),console.log(t),!s.$valid)return void console.log(s.$error);var c=[];for(var u in n.syllabus.courses)c.push(n.syllabus.courses[u].name);e.post(l.apiUrl+"syllabuses",{token:a.token(),title:t.title,courses:c}).then(function(s){0!=s.data.status?n.alertService.showMessage("\u51fa\u9519\u4e86",s.data.message):n.alertService.showMessage("\u63d0\u793a","\u65b0\u5efa\u8bfe\u7a0b\u6210\u529f",function(){r.save("syllabuses",[]),o.path("/class_list")}),console.log(s.data.data)})}}]);
+//reg.js
+app.controller("RegController",["$scope","$http","$location","alertService","$location",function(e,o,a,s,a){var t=e;t.errDialog=s.create(),t.successDialog=s.create(),t.goLogin=function(){a.path("/login")},t.isagreed=!0,t.agreed=function(e){t.isagreed=!e},t.reg=function(e,s){return e.$setSubmitted(),console.log(e),e.$valid?(console.log(s),void o.post(apiUrl+"users",{login:s.username,password:s.password,mail:s.email}).then(function(e){0!=e.data.status?t.errDialog.showMessage("\u51fa\u9519\u4e86",e.data.message):t.successDialog.showMessage("\u63d0\u793a","\u6ce8\u518c\u4e14\u7ed1\u5b9a\u5fae\u4fe1\u6210\u529f",function(){a.path("/activities")})},function(e){t.errDialog.showMessage("\u51fa\u9519\u4e86",e.data)})):void console.log(e.$error)}}]);
+//send_class_list.js
+app.controller("SendClassListController",["$scope","$http","$routeParams","config","auth","alertService","rms",function(e,s,o,a,t,r){var c=e,n=o.id;c.alertService=r.create(),c.syllabuses=[];var l=function(){s.get(a.apiUrl+"syllabuses?token="+t.token()).then(function(e){console.log(e.data),c.syllabuses=e.data.data})};l(),c.selectCourse=function(e){"boolean"!=typeof e.checked&&(e.checked=!1),e.checked=!e.checked},c.sendToCourses=function(){var e=[];for(var o in c.syllabuses)for(var r in c.syllabuses[o].courses)c.syllabuses[o].courses[r].checked&&e.push(c.syllabuses[o].courses[r].id);return e.length<=0?void c.alertService.showMessage("\u63d0\u9192","\u8bf7\u5148\u9009\u62e9\u73ed\u7ea7"):void s.post(a.apiUrl+"resources/send",{token:t.token(),course_ids:e,send_id:n}).then(function(e){console.log(e.data),0==e.data.status?c.alertService.showMessage("\u63d0\u793a","\u53d1\u9001\u6210\u529f",function(){window.history.back()}):c.alertService.showMessage("\u53d1\u9001\u51fa\u9519",e.data.message)})}}]);
+//alert.js
 app.directive("myAlert",["config",function(t){return{templateUrl:t.rootPath+"templates/alert.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){t.visible=!1,"function"==typeof t.cb&&t.cb()}}}}]),app.directive("myAlert2",["config",function(t){return{templateUrl:t.rootPath+"templates/alert2.html",scope:{title:"=",message:"=",visible:"=",cb:"="},link:function(t){t.dismiss=function(){t.visible=!1},t.confirm=function(){t.visible=!1,"function"==typeof t.cb&&t.cb()}}}}]);
+//form_validate.js
 app.directive("pwdconfirm",function(){return{require:"ngModel",link:function(r,n,i,e){e.$validators.pwdconfirm=function(n,i){return r.user&&r.user.password==i}}}});
+//input_auto.js
 app.directive("inputAuto",function(){return{restrict:"A",scope:{},link:function(n,t){var i=t.parent().children().children().eq(0),c=t.next();t.on("input",function(){console.log(c),i.html(t[0].value);var n=i[0].scrollHeight;t.css("height",n+"px")}),c.on("click",function(){t.css("height","28px")})}}});
+//loading_spinner.js
 app.directive("loadingSpinner",["$http","config",function(t,e){return{templateUrl:e.rootPath+"templates/loading.html"}}]);
+//routes.js
 app.config(["$routeProvider","$httpProvider","$locationProvider","config",function(e,l,t,o){var r=o.rootPath,s={delay:["auth",function(e){return e.get_bind()}]},n=function(e,l){return{templateUrl:r+e,controller:l,resolve:s}};e.when("/login",{templateUrl:r+"login.html",controller:"LoginController"}).when("/reg",{templateUrl:r+"reg.html",controller:"RegController"}).when("/activites",n("activities.html","ActivityController")).when("/issues/:id",n("issue_detail.html","IssueController")).when("/project_discussion/:id",n("project_discussion.html","DiscussionController")).when("/homework/:id",n("homework_detail.html","HomeworkController")).when("/course_notice/:id",n("course_notice.html","CourseNoticeController")).when("/course_discussion/:id",n("course_discussion.html","DiscussionController")).when("/journal_for_message/:id",n("jour_message_detail.html","JournalsController")).when("/blog_comment/:id",n("blog_detail.html","BlogController")).when("/class",n("class.html","ClassController")).when("/new_class",n("new_class.html","NewClassController")).when("/edit_class",n("edit_class.html","EditClassController")).when("/class_list",n("class_list.html","ClassListController")).when("/myresource",n("myresource.html","MyResourceController")).when("/invite_code",{templateUrl:r+"invite_code.html",controller:"InviteCodeController"}).when("/send_class_list",n("send_class_list.html","SendClassListController")).otherwise({redirectTo:"/activites"}),l.interceptors.push(["$q","$rootScope",function(e,l){return void 0==l.activeCalls&&(l.activeCalls=0),{request:function(e){return l.activeCalls+=1,e},requestError:function(e){return l.activeCalls-=1,e},response:function(e){return l.activeCalls-=1,e},responseError:function(e){return l.activeCalls-=1,e}}}])}]);
\ No newline at end of file

From 8968c991ff26bfb3f4a1ed5d15a9de1e7405c97c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 18 Jul 2016 11:08:02 +0800
Subject: [PATCH 03/26] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=EF=BC=9A=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=A2=9E=E5=8A=A0=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb                |   9 +-
 app/api/mobile/apis/resources.rb              |  16 ++-
 app/services/resources_service.rb             | 119 ++++++++++++++++++
 public/assets/wechat/class.html               |   2 +-
 public/assets/wechat/myresource.html          |   6 +-
 .../javascripts/wechat/controllers/class.js   |  20 +--
 .../wechat/controllers/myresource.js          |  11 +-
 .../wechat/controllers/send_class_list.js     |   5 +-
 8 files changed, 172 insertions(+), 16 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index caabad198..aa1e573ed 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -200,8 +200,13 @@ module Mobile
             # course = Course.find(params[:id])
             cs = CoursesService.new
             course = cs.show_course(params,current_user)
-            present :data, course, with: Mobile::Entities::Course,user: current_user
-           { status: 0}
+
+            if course[:course][:is_delete] == 1
+              {status:-1, message: '该班级不存在或已被删除啦' }
+            else
+              present :data, course, with: Mobile::Entities::Course,user: current_user
+              present :status, 0
+            end
           end
         end
 
diff --git a/app/api/mobile/apis/resources.rb b/app/api/mobile/apis/resources.rb
index d5823d5b4..ebfef7f2d 100644
--- a/app/api/mobile/apis/resources.rb
+++ b/app/api/mobile/apis/resources.rb
@@ -85,12 +85,26 @@ module Mobile
           requires :token, type: String
           requires :course_ids, type: Array[Integer]
           requires :send_id, type: Integer
+          requires :send_type, type: Integer
         end
         post 'send' do
           authenticate!
 
           rs = ResourcesService.new
-          ori, flag, save_message = rs.send_resource_to_course(current_user,params)
+
+          ori = nil
+          flag = false
+          save_message = nil
+
+          case params[:send_type]
+            when 1
+              ori, flag, save_message = rs.send_resource_to_course(current_user,params)
+            when 2
+              ori, flag, save_message = rs.send_homework_to_course(current_user,params)
+            when 3
+              ori, flag, save_message = rs.send_exercise_to_course(current_user,params)
+          end
+
           if flag
             present :status, 0
           else
diff --git a/app/services/resources_service.rb b/app/services/resources_service.rb
index bc97437e4..b56da8ad3 100644
--- a/app/services/resources_service.rb
+++ b/app/services/resources_service.rb
@@ -49,6 +49,125 @@ class ResourcesService
     [@ori, @flag, @save_message]
   end
 
+  def send_homework_to_course user,params
+    homework = HomeworkCommon.find params[:send_id].to_i
+    @ori = homework
+    course_ids = params[:course_ids]
+    @flag = false
+    unless course_ids.nil?
+      course_ids.each do |course_id|
+        course = Course.find course_id.to_i
+        new_homework = HomeworkCommon.new
+        new_homework.name = homework.name
+        new_homework.user_id = user.id
+        new_homework.description = homework.description
+        new_homework.homework_type = homework.homework_type
+        new_homework.late_penalty = homework.late_penalty
+        new_homework.course_id = course.id
+        new_homework.teacher_priority = homework.teacher_priority
+        new_homework.anonymous_comment = homework.anonymous_comment
+        new_homework.quotes = 0
+        new_homework.is_open = homework.is_open
+        homework.attachments.each do |attachment|
+          att = attachment.copy
+          att.container_id = nil
+          att.container_type = nil
+          att.copy_from = attachment.id
+          att.save
+          new_homework.attachments << att
+        end
+        homework_detail_manual = homework.homework_detail_manual
+        homework_detail_programing = homework.homework_detail_programing
+        homework_detail_group = homework.homework_detail_group
+        if homework_detail_manual
+          new_homework.homework_detail_manual = HomeworkDetailManual.new
+          new_homework_detail_manual =  new_homework.homework_detail_manual
+          new_homework_detail_manual.ta_proportion = homework_detail_manual.ta_proportion
+          new_homework_detail_manual.comment_status = 0
+          new_homework_detail_manual.evaluation_num = homework_detail_manual.evaluation_num
+          new_homework_detail_manual.absence_penalty = homework_detail_manual.absence_penalty
+        end
+        if homework_detail_programing
+          new_homework.homework_detail_programing = HomeworkDetailPrograming.new
+          new_homework.homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+          new_homework.homework_detail_programing.language = homework_detail_programing.language
+          homework.homework_tests.each_with_index do |homework_test|
+            new_homework.homework_tests << HomeworkTest.new(
+                input: homework_test.input,
+                output: homework_test.output
+            )
+          end
+        end
+
+        if homework_detail_group
+          new_homework.homework_detail_group = HomeworkDetailGroup.new
+          new_homework.homework_detail_group.min_num = homework_detail_group.min_num
+          new_homework.homework_detail_group.max_num = homework_detail_group.max_num
+          new_homework.homework_detail_group.base_on_project = homework_detail_group.base_on_project
+        end
+        if new_homework.save
+          new_homework_detail_manual.save if new_homework_detail_manual
+          new_homework.homework_detail_programing.save if new_homework.homework_detail_programing
+          new_homework.homework_detail_group.save if new_homework.homework_detail_group
+          @flag = true
+        else
+          @flag = false
+          @save_message = new_homework.errors.full_messages
+          break
+        end
+        homework.update_column(:quotes, homework.quotes+1)
+      end
+    end
+    [@ori, @flag, @save_message]
+  end
+
+  def send_exercise_to_course user,params
+    # send_id  = params[:send_id]
+    # @ori = Attachment.find_by_id(send_id)
+    # course_ids = params[:course_ids]
+    # @flag = false
+    # unless course_ids.nil?
+    #   course_ids.each do |id|
+    #     next if @ori.blank?
+    #     @exist = false
+    #     Course.find(id).attachments.each do |att|  #如果课程中包含该资源
+    #       if att.id == @ori.id || (!att.copy_from.nil? && !@ori.copy_from.nil? && att.copy_from == @ori.copy_from) || att.copy_from == @ori.id || att.id == @ori.copy_from
+    #         att.created_on = Time.now
+    #         att.save
+    #         @exist = true
+    #         @flag = true
+    #         break
+    #       end
+    #     end
+    #     next if @exist
+    #     attach_copied_obj = @ori.copy
+    #     attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联
+    #     attach_copied_obj.container = Course.find(id)
+    #     attach_copied_obj.created_on = Time.now
+    #     attach_copied_obj.author_id = user.id
+    #     attach_copied_obj.is_public = 0
+    #     attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from
+    #     if attach_copied_obj.attachtype == nil
+    #       attach_copied_obj.attachtype = 4
+    #     end
+    #     if attach_copied_obj.save
+    #       # 更新引用次数
+    #       quotes = @ori.quotes.to_i + 1
+    #       @ori.update_attribute(:quotes, quotes) unless @ori.nil?
+    #       @ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
+    #       @flag = true
+    #     else
+    #       @flag = false
+    #       @save_message = attach_copied_obj.errors.full_messages
+    #       break
+    #     end
+    #
+    #   end
+    # end
+
+    [@ori, @flag, @save_message]
+  end
+
   # 我的资源-课件 已发布的
   def all_course_attachments user
 
diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html
index c328ed226..2f9af6554 100644
--- a/public/assets/wechat/class.html
+++ b/public/assets/wechat/class.html
@@ -56,5 +56,5 @@
 
 
 
-
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
 </div>
diff --git a/public/assets/wechat/myresource.html b/public/assets/wechat/myresource.html
index c89f39684..28fc69cc3 100644
--- a/public/assets/wechat/myresource.html
+++ b/public/assets/wechat/myresource.html
@@ -12,7 +12,7 @@
 
     <div ng-class="{'undis': currentTab!=1}">
         <div ng-repeat="r in resources|filter:{filename:searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]">
-            <img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <span class="fl ml10 resource-width">{{r.filename}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
+            <img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <span class="fl ml10 resource-width">{{r.filename}}</span><a ng-click="sendFile(r,1)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
             <span class="f12 mt5 ml35 c-grey4 fl courseware-from-width hidden">课件来源：{{r.coursename}}</span><span class="f12 ml10 mt5 c-grey4 fl">大小：{{r.attafile_size}}</span><div class="cl"></div>
         </div>
         <div ng-if="has_more">
@@ -22,7 +22,7 @@
             请登录Trustie网站，在PC浏览器中上传课件。</p>
     </div>
     <div ng-class="{'undis': currentTab!=2}">
-        <div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
+        <div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-click="sendFile(r,2)" class="fr mr10 link-blue2 ">发送</a><div class="cl"></div>
             <span class="f12 mt5 ml35 c-grey4 fl other-from-width hidden">作业来源：{{r.coursename}}</span><div class="cl"></div>
         </div>
         <div ng-if="homework_has_more">
@@ -32,7 +32,7 @@
             请登录Trustie网站，在PC浏览器中创建作业。</p>
     </div>
     <div ng-class="{'undis': currentTab!=3}">
-        <div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
+        <div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-click="sendFile(r,3)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
             <span class="f12 mt5 ml35 c-grey4 other-from-width hidden">题目来源：{{r.coursename}}</span><div class="cl"></div>
         </div>
         <div ng-if="exercise_has_more">
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index 87703b681..cf2a3ee88 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -1,4 +1,4 @@
-app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams', function($scope, config, $http, auth, $location, $routeParams){
+app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService', function($scope, config, $http, auth, $location, $routeParams,alertService){
 
     var vm = $scope;
     var courseid = $routeParams.id;
@@ -97,15 +97,14 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
         }
     }
 
-
-
-
     vm.course = {};
     vm.students = [];
     vm.teachers = [];
     vm.resources = [];
     vm.homeworks = [];
     vm.exercises = [];
+
+    vm.alertService = alertService.create();
     
     vm.invite = function(){
        $location.path("/invite_code").search({id: courseid}); 
@@ -118,9 +117,16 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
     $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
         function(response) {
             console.log(response.data);
-            vm.course = response.data.data;
-            resetMenu(vm.course.current_user_is_teacher);
-            vm.tab(1);
+
+            if (response.data.status == 0){
+                vm.course = response.data.data;
+                resetMenu(vm.course.current_user_is_teacher);
+                vm.tab(1);
+            }
+            else{
+                vm.alertService.showMessage('提示', response.data.message);
+            }
+
         }
     );
 
diff --git a/public/javascripts/wechat/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
index fb564cde8..15428bb34 100644
--- a/public/javascripts/wechat/controllers/myresource.js
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -10,21 +10,30 @@ app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$l
     vm.homeworks_tag = false;
     vm.exercises_tag = false;
 
+    //课件
     vm.page = rms.get('page') || 0;
     vm.resources = rms.get("resources") || [];
     vm.has_more = rms.get("has_more");
 
+    //作业
     vm.homework_page = rms.get('homework_page') || 0;
     vm.homeworks = rms.get("homeworks") || [];
     vm.homework_has_more = rms.get("homework_has_more");
 
+    //测验
     vm.exercise_page = rms.get('exercise_page') || 0;
     vm.exercise = rms.get("exercise") || [];
     vm.exercise_has_more = rms.get("exercise_has_more");
 
     vm.searchText = "";
 
-    vm.sendFile = function(r){
+    //发送类别 1课件 2作业 3测验
+    vm.myresource_sendIndex = rms.get('myresource_sendIndex') || 1;
+
+    vm.sendFile = function(r,index){
+        vm.myresource_sendIndex = index;
+        rms.save('myresource_sendIndex',index);
+
         $location.path("/send_class_list").search({id: r.id});
     }
 
diff --git a/public/javascripts/wechat/controllers/send_class_list.js b/public/javascripts/wechat/controllers/send_class_list.js
index 16875af9f..c80943e39 100644
--- a/public/javascripts/wechat/controllers/send_class_list.js
+++ b/public/javascripts/wechat/controllers/send_class_list.js
@@ -2,6 +2,9 @@ app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'co
     var vm = $scope;
     var send_id = $routeParams.id;
 
+    //发送类别 1课件 2作业 3测验
+    vm.myresource_sendIndex = rms.get('myresource_sendIndex') || 1;
+
     vm.alertService = alertService.create();
     vm.syllabuses = [];
 
@@ -39,7 +42,7 @@ app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'co
         }
         
         $http.post(config.apiUrl + "resources/send", {
-            token: auth.token(), course_ids: course_ids, send_id: send_id
+            token: auth.token(), course_ids: course_ids, send_id: send_id,send_type:vm.myresource_sendIndex
         }).then(function(response){
             console.log(response.data);
             if(response.data.status == 0){

From ff13d2e572045bd6af626ae58f699e96e7462de2 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 18 Jul 2016 14:24:59 +0800
Subject: [PATCH 04/26] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8F=91=E9=80=81=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9A=84=E6=9D=83=E9=99=90=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb                |  6 +++---
 app/api/mobile/entities/attachment.rb         |  8 ++++++++
 app/api/mobile/entities/exercise.rb           |  8 ++++++++
 app/api/mobile/entities/homework.rb           |  7 +++++++
 app/controllers/wechats_controller.rb         | 15 ++++++++------
 config/menu.yml.test                          | 20 +++++++++++++------
 public/assets/wechat/class.html               |  6 +++---
 public/assets/wechat/myresource.html          |  6 +++---
 .../javascripts/wechat/controllers/class.js   |  9 +++++++--
 .../wechat/controllers/send_class_list.js     |  2 +-
 10 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index aa1e573ed..1c6fd7008 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -217,7 +217,7 @@ module Mobile
         get "homeworks/:id" do
           cs = CoursesService.new
           homeworks = cs.homework_list params,current_user
-          present :data, homeworks, with: Mobile::Entities::Homework
+          present :data, homeworks, with: Mobile::Entities::Homework,user: current_user
           present :status, 0
         end
 
@@ -264,7 +264,7 @@ module Mobile
         post ":course_id/attachments" do
           cs = CoursesService.new
           count = cs.course_attachments params
-          present :data, count, with: Mobile::Entities::Attachment
+          present :data, count, with: Mobile::Entities::Attachment,user: current_user
           present :status, 0
         end
 
@@ -398,7 +398,7 @@ module Mobile
 
           course = Course.find(params[:course_id])
           exercises = course.exercises.where("exercise_status <> 1").order("created_at desc")
-          present :data,exercises,with:Mobile::Entities::Exercise
+          present :data,exercises,with:Mobile::Entities::Exercise,user: current_user
           present :status,0
         end
 
diff --git a/app/api/mobile/entities/attachment.rb b/app/api/mobile/entities/attachment.rb
index 49cb6bd2b..028ad633d 100644
--- a/app/api/mobile/entities/attachment.rb
+++ b/app/api/mobile/entities/attachment.rb
@@ -3,6 +3,7 @@ module Mobile
     class Attachment  < Grape::Entity
       include Redmine::I18n
       include ActionView::Helpers::NumberHelper
+      include ApplicationHelper
       def self.attachment_expose(field)
         expose field do |f,opt|
           if f.is_a?(Hash) && f.key?(field)
@@ -22,6 +23,7 @@ module Mobile
                   (number_to_human_size(f.filesize)).gsub("ytes", "").to_s
                 when :coursename
                   f.course.nil? ? "" : f.course.name
+
               end
             end
           end
@@ -36,6 +38,12 @@ module Mobile
       attachment_expose :file_dir
       attachment_expose :attafile_size
       attachment_expose :coursename   #所属班级名
+      expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options|
+        current_user = options[:user]
+        current_user_is_teacher = false
+        current_user_is_teacher = is_course_teacher(current_user,instance.course)
+        current_user_is_teacher
+      end
     end
   end
 end
\ No newline at end of file
diff --git a/app/api/mobile/entities/exercise.rb b/app/api/mobile/entities/exercise.rb
index 05066f8a4..ce6a2fb39 100644
--- a/app/api/mobile/entities/exercise.rb
+++ b/app/api/mobile/entities/exercise.rb
@@ -27,6 +27,14 @@ module Mobile
       expose :exercise_name
       expose :exercise_description
       exercise_expose :coursename #所属班级名
+
+      expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options|
+        current_user = options[:user]
+        current_user_is_teacher = false
+        current_user_is_teacher = is_course_teacher(current_user,instance.course)
+        current_user_is_teacher
+      end
+
     end
   end
 end
diff --git a/app/api/mobile/entities/homework.rb b/app/api/mobile/entities/homework.rb
index 3f1631c96..cea15ece9 100644
--- a/app/api/mobile/entities/homework.rb
+++ b/app/api/mobile/entities/homework.rb
@@ -98,6 +98,13 @@ module Mobile
 
       homework_expose :coursename #所属班级名
 
+      expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options|
+        current_user = options[:user]
+        current_user_is_teacher = false
+        current_user_is_teacher = is_course_teacher(current_user,instance.course)
+        current_user_is_teacher
+      end
+
     end
   end
 end
\ No newline at end of file
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index ea305d967..c72e04e14 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -78,12 +78,7 @@ class WechatsController < ActionController::Base
   end
   # When user view URL in the menu button
   on :view, with: 'http://wechat.somewhere.com/view_url' do |request, view|
-    uw = user_binded?(request[:FromUserName])
-    unless uw
-      sendBind(request)
-    else
-      request.reply.text "#{request[:FromUserName]} view #{view}"
-    end
+    request.reply.text "#{request[:FromUserName]} view #{view}"
   end
 
   # When user sent the imsage
@@ -147,6 +142,14 @@ class WechatsController < ActionController::Base
     default_msg(request)
   end
 
+  on :click, with: 'PROJECT' do |request, key|
+    request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
+  end
+
+  on :click, with: 'JOIN_PROJECT' do |request, key|
+    request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
+  end
+
   on :click, with: 'JOIN_CLASS' do |request, key|
     uw = user_binded?(request[:FromUserName])
       unless uw
diff --git a/config/menu.yml.test b/config/menu.yml.test
index a43d72816..521ff290a 100644
--- a/config/menu.yml.test
+++ b/config/menu.yml.test
@@ -2,18 +2,22 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://ucloudtest.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=activities#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=activities#wechat_redirect"
  -
-  name: "我的课程"
+  name: "我的群组"
   sub_button:
   -
     type: "view"
-    name: "课程"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://ucloudtest.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
+    name: "我的课程"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
+  -
+    type: "click"
+    name: "我的项目"
+    key:  "PROJECT"
   -
     type: "view"
-    name: "资源"
-    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://ucloudtest.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=myresource#wechat_redirect"
+    name: "我的宝库"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=myresource#wechat_redirect"
 
  -
   name: "更多"
@@ -22,6 +26,10 @@ button:
     type: "click"
     name: "加入班级"
     key:  "JOIN_CLASS"
+  -
+    type: "click"
+    name: "加入项目"
+    key:  "JOIN_PROJECT"
   -
     type: "click"
     name: "反馈"
diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html
index 2f9af6554..01628c2f4 100644
--- a/public/assets/wechat/class.html
+++ b/public/assets/wechat/class.html
@@ -23,7 +23,7 @@
     </div>
 
     <div ng-class="{'undis': !showResources}">
-        <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.filename}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2" ng-click="sendFile(r)">发送</a><div class="cl"></div></div>
+        <div ng-repeat="r in resources|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.filename}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2" ng-click="sendFile(r,1)">发送</a><div class="cl"></div></div>
         <p ng-show="resources_tag == true && resources.length<=0" class="class-test-tip">暂无课件，<br />
             请登录Trustie网站，在PC浏览器中上传课件。</p>
     </div>
@@ -42,14 +42,14 @@
     </div>
 
     <div ng-class="{'undis': !showHomework}">
-        <div ng-repeat="r in homeworks|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2 undis" ng-click="sendFile(r)">发送</a><div class="cl"></div></div>
+        <div ng-repeat="r in homeworks|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2 " ng-click="sendFile(r,2)">发送</a><div class="cl"></div></div>
         <p ng-show="homeworks_tag == true && homeworks.length<=0" class="class-test-tip">暂无作业，<br />
             请登录Trustie网站，在PC浏览器中上传作业。</p>
 
     </div>
 
     <div ng-class="{'undis': !showTestcase}">
-        <div ng-repeat="r in exercises|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2 undis" ng-click="sendFile(r)">发送</a><div class="cl"></div></div>
+        <div ng-repeat="r in exercises|filter:searchText" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-show="isTeacher" herf="javascript:void(0);" class="fr mr10 link-blue2 undis" ng-click="sendFile(r,3)">发送</a><div class="cl"></div></div>
         <p ng-show="exercises_tag == true && exercises.length<=0" class="class-test-tip">暂无小测验，<br />
             请登录Trustie网站，在PC浏览器中上传小测验。</p>
     </div>
diff --git a/public/assets/wechat/myresource.html b/public/assets/wechat/myresource.html
index 28fc69cc3..c06c57238 100644
--- a/public/assets/wechat/myresource.html
+++ b/public/assets/wechat/myresource.html
@@ -12,7 +12,7 @@
 
     <div ng-class="{'undis': currentTab!=1}">
         <div ng-repeat="r in resources|filter:{filename:searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]">
-            <img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <span class="fl ml10 resource-width">{{r.filename}}</span><a ng-click="sendFile(r,1)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
+            <img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <span class="fl ml10 resource-width">{{r.filename}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,1)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
             <span class="f12 mt5 ml35 c-grey4 fl courseware-from-width hidden">课件来源：{{r.coursename}}</span><span class="f12 ml10 mt5 c-grey4 fl">大小：{{r.attafile_size}}</span><div class="cl"></div>
         </div>
         <div ng-if="has_more">
@@ -22,7 +22,7 @@
             请登录Trustie网站，在PC浏览器中上传课件。</p>
     </div>
     <div ng-class="{'undis': currentTab!=2}">
-        <div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-click="sendFile(r,2)" class="fr mr10 link-blue2 ">发送</a><div class="cl"></div>
+        <div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,2)" class="fr mr10 link-blue2 ">发送</a><div class="cl"></div>
             <span class="f12 mt5 ml35 c-grey4 fl other-from-width hidden">作业来源：{{r.coursename}}</span><div class="cl"></div>
         </div>
         <div ng-if="homework_has_more">
@@ -32,7 +32,7 @@
             请登录Trustie网站，在PC浏览器中创建作业。</p>
     </div>
     <div ng-class="{'undis': currentTab!=3}">
-        <div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-click="sendFile(r,3)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
+        <div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,3)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
             <span class="f12 mt5 ml35 c-grey4 other-from-width hidden">题目来源：{{r.coursename}}</span><div class="cl"></div>
         </div>
         <div ng-if="exercise_has_more">
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index cf2a3ee88..75e1709cc 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -1,4 +1,4 @@
-app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService', function($scope, config, $http, auth, $location, $routeParams,alertService){
+app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService','rms', function($scope, config, $http, auth, $location, $routeParams,alertService,rms){
 
     var vm = $scope;
     var courseid = $routeParams.id;
@@ -104,13 +104,18 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
     vm.homeworks = [];
     vm.exercises = [];
 
+    //发送类别 1课件 2作业 3测验
+    vm.myresource_sendIndex = rms.get('myresource_sendIndex') || 1;
+
     vm.alertService = alertService.create();
     
     vm.invite = function(){
        $location.path("/invite_code").search({id: courseid}); 
     };
 
-    vm.sendFile = function(r){
+    vm.sendFile = function(r,index){
+        vm.myresource_sendIndex = index;
+        rms.save('myresource_sendIndex',index);
         $location.path("/send_class_list").search({id: r.id});
     }
 
diff --git a/public/javascripts/wechat/controllers/send_class_list.js b/public/javascripts/wechat/controllers/send_class_list.js
index c80943e39..1eabfa94c 100644
--- a/public/javascripts/wechat/controllers/send_class_list.js
+++ b/public/javascripts/wechat/controllers/send_class_list.js
@@ -46,7 +46,7 @@ app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'co
         }).then(function(response){
             console.log(response.data);
             if(response.data.status == 0){
-                vm.alertService.showMessage('提示', '发送成功', function () {
+                vm.alertService.showMessage('发送成功', '题目已发送到目标班级的作业列表，但需要您访问Trustie网站设置发布和截止时间，以激活相应作业，谢谢！', function () {
                     window.history.back();
                 });
             } else {

From fea8d56d8d6087eed9e662e10fa02d9348731d45 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 18 Jul 2016 14:28:45 +0800
Subject: [PATCH 05/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=89=88=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/wechat.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/wechat.yml b/config/wechat.yml
index f09cca3d5..8b2caffc8 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -8,12 +8,12 @@ default: &default
   #secret: "743e038392f1d89540e95f8f7645849a"
 
   #production
-  appid: "wx8e1ab05163a28e37"
-  secret: "beb4d3bc4b32b3557811680835357841"
+#  appid: "wx8e1ab05163a28e37"
+#  secret: "beb4d3bc4b32b3557811680835357841"
 
   #test
-#  appid: "wxc09454f171153c2d"
-#  secret: "dff5b606e34dcafe24163ec82c2715f8"
+  appid: "wxc09454f171153c2d"
+  secret: "dff5b606e34dcafe24163ec82c2715f8"
 
   token:    "123456"
   access_token: "1234567"

From b2f9839d1347dbacc0493b607964396d683f53a3 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 18 Jul 2016 14:43:54 +0800
Subject: [PATCH 06/26] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=EF=BC=9A=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=89=88=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/menu.yml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/config/menu.yml b/config/menu.yml
index 1817ab44d..0acb58b96 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,18 +2,22 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=activities#wechat_redirect"
  -
-  name: "我的课程"
+  name: "我的群组"
   sub_button:
   -
-    type: "click"
-    name: "课程"
-    key: "DEV"
+    type: "view"
+    name: "我的课程"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=class_list#wechat_redirect"
   -
     type: "click"
-    name: "资源"
-    key: "DEV"
+    name: "我的项目"
+    key:  "PROJECT"
+  -
+    type: "view"
+    name: "我的宝库"
+    url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=myresource#wechat_redirect"
 
  -
   name: "更多"
@@ -22,6 +26,10 @@ button:
     type: "click"
     name: "加入班级"
     key:  "JOIN_CLASS"
+  -
+    type: "click"
+    name: "加入项目"
+    key:  "JOIN_PROJECT"
   -
     type: "click"
     name: "反馈"

From bc0d8cd299fe8e9772d045ea25eb0d26cee1b4f8 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 19 Jul 2016 10:25:45 +0800
Subject: [PATCH 07/26] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=AD=97=E4=BD=93=E5=8F=98=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/edit_class.html                | 4 ++--
 public/javascripts/wechat/controllers/edit_class.js | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/public/assets/wechat/edit_class.html b/public/assets/wechat/edit_class.html
index 5953e046b..d6bc7e03c 100644
--- a/public/assets/wechat/edit_class.html
+++ b/public/assets/wechat/edit_class.html
@@ -3,9 +3,9 @@
 
     <div class="blue-title">管理课程</div>
     <form novalidate name="classForm">
-        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input ng-change="fadeText()" ng-class="['new-class-input ml25', {'c-grey':change} ]" ng-model="syllabus.tmptitle" required placeholder="请输入课程名" /></div>
+        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input ng-change="syllabus.change = true" ng-class="['new-class-input ml25', {'c-grey':syllabus.change} ]" ng-model="syllabus.tmptitle" required placeholder="请输入课程名" /></div>
 
-        <div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses" ng-show="course.can_setting"><span class="fl ml15 c-grey3">班级</span><input ng-change="fadeText()" required ng-class="['new-class-input ml25', {'c-grey':change} ]" ng-model="course.tmpname" placeholder="请输入班级名" /><a ng-click="deleteClass($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
+        <div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses" ng-show="course.can_setting"><span class="fl ml15 c-grey3">班级</span><input ng-change="course.change = true" required ng-class="['new-class-input ml25', {'c-grey':course.change} ]" ng-model="course.tmpname" placeholder="请输入班级名" /><a ng-click="deleteClass($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
         <div class="tac"><a ng-click="addClass()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增班级</a></div>
         <a ng-click="newClass(classForm, syllabus)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
     </form>
diff --git a/public/javascripts/wechat/controllers/edit_class.js b/public/javascripts/wechat/controllers/edit_class.js
index b5ee1a025..5f377e594 100644
--- a/public/javascripts/wechat/controllers/edit_class.js
+++ b/public/javascripts/wechat/controllers/edit_class.js
@@ -107,8 +107,4 @@ app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'ale
 
     }
 
-    vm.fadeText = function () {
-        $scope.change = true;
-    }
-
 }] );
\ No newline at end of file

From bc1b4c1b85efeb091ab0ec12b8af31ea84fed1d3 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 19 Jul 2016 10:50:36 +0800
Subject: [PATCH 08/26] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E7=A0=81=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8D=E6=95=B0=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/courses.rb                |  2 +-
 app/api/mobile/entities/activity.rb           | 20 +++++----
 app/api/mobile/entities/blog_comment.rb       |  4 +-
 app/api/mobile/entities/issue.rb              |  4 +-
 app/api/mobile/entities/jours.rb              |  4 +-
 app/api/mobile/entities/message.rb            |  3 ++
 app/api/mobile/entities/news.rb               |  3 ++
 app/services/courses_service.rb               |  4 +-
 public/assets/wechat/class_list.html          |  3 +-
 public/assets/wechat/myresource.html          |  1 +
 public/assets/wechat/templates/alert3.html    | 15 +++++++
 .../wechat/controllers/class_list.js          | 43 ++++++++++---------
 public/javascripts/wechat/directives/alert.js | 24 +++++++++++
 public/javascripts/wechat/others/factory.js   |  3 ++
 14 files changed, 97 insertions(+), 36 deletions(-)
 create mode 100644 public/assets/wechat/templates/alert3.html

diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 1c6fd7008..60e00280e 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -397,7 +397,7 @@ module Mobile
           authenticate!
 
           course = Course.find(params[:course_id])
-          exercises = course.exercises.where("exercise_status <> 1").order("created_at desc")
+          exercises = course.exercises.where("exercise_status <> 1").reorder("created_at desc")
           present :data,exercises,with:Mobile::Entities::Exercise,user: current_user
           present :status,0
         end
diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index 9e2a39a5a..bdeff7ae9 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -20,15 +20,17 @@ module Mobile
                     ac.act unless ac.nil? || ac.act.nil?
                   end
                 when :reply_count
-                  if ac.act_type == "HomeworkCommon"
-                    ac.nil? || ac.act.nil? ? 0 : ac.act.journals_for_messages.count
-                  elsif ac.act_type == "News"
-                    ac.nil? || ac.act.nil? ? 0 : ac.act.comments.count
-                  elsif ac.act_type == "Message" || ac.act_type == "BlogComment" || ac.act_type == "JournalsForMessage"
-                    ac.nil? || ac.act.nil? ? 0 : ac.act.children.count
-                  elsif ac.act_type == "Issue"
-                    ac.nil? || ac.act.nil? ? 0 : ac.act.journals.where("notes is not null and notes != ''").count
-                  end
+                  # if ac.act_type == "HomeworkCommon"
+                  #   ac.nil? || ac.act.nil? ? 0 : ac.act.journals_for_messages.count
+                  # elsif ac.act_type == "News"
+                  #   ac.nil? || ac.act.nil? ? 0 : ac.act.comments.count
+                  # elsif ac.act_type == "Message" || ac.act_type == "BlogComment" || ac.act_type == "JournalsForMessage"
+                  #   ac.nil? || ac.act.nil? ? 0 : ac.act.children.count
+                  # elsif ac.act_type == "Issue"
+                  #   ac.nil? || ac.act.nil? ? 0 : ac.act.journals.where("notes is not null and notes != ''").count
+                  # end
+                  all_comments = []
+                  ac.nil? || ac.act.nil? ? 0 : get_all_children(all_comments, ac.act).count
                 when :subject
                   if ac.act_type == "HomeworkCommon"
                     ac.act.name unless ac.nil? || ac.act.nil?
diff --git a/app/api/mobile/entities/blog_comment.rb b/app/api/mobile/entities/blog_comment.rb
index 67904d11e..a61864900 100644
--- a/app/api/mobile/entities/blog_comment.rb
+++ b/app/api/mobile/entities/blog_comment.rb
@@ -25,7 +25,9 @@ module Mobile
                 when :act_id
                   u.id
                 when :comment_count
-                  u.children.count
+                  # u.children.count
+                  all_comments = []
+                  get_all_children(all_comments, u).count
               end
             end
           end
diff --git a/app/api/mobile/entities/issue.rb b/app/api/mobile/entities/issue.rb
index ef3d09450..b99ea03a5 100644
--- a/app/api/mobile/entities/issue.rb
+++ b/app/api/mobile/entities/issue.rb
@@ -23,7 +23,9 @@ module Mobile
                 when :issue_status
                   IssueStatus.find(issue.status_id).name
                 when :journals_count
-                  issue.journals.where("notes is not null and notes != ''").count
+                  # issue.journals.where("notes is not null and notes != ''").count
+                  all_comments = []
+                  get_all_children(all_comments, f).count
                 when :project_name
                   issue.project.name
                 when :praise_count
diff --git a/app/api/mobile/entities/jours.rb b/app/api/mobile/entities/jours.rb
index 15e22174c..f98d7a9ed 100644
--- a/app/api/mobile/entities/jours.rb
+++ b/app/api/mobile/entities/jours.rb
@@ -18,7 +18,9 @@ module Mobile
               when :lasted_comment
                 time_from_now f.created_on
               when :reply_count
-                f.children.count
+                # f.children.count
+                all_comments = []
+                get_all_children(all_comments, f).count
               when :praise_count
                 get_activity_praise_num(f)
               when :act_type
diff --git a/app/api/mobile/entities/message.rb b/app/api/mobile/entities/message.rb
index 051c92886..d58192378 100644
--- a/app/api/mobile/entities/message.rb
+++ b/app/api/mobile/entities/message.rb
@@ -30,6 +30,9 @@ module Mobile
                   'Message'
                 when :act_id
                   u.id
+                when :replies_count
+                  all_comments = []
+                  get_all_children(all_comments, u).count
               end
             end
           end
diff --git a/app/api/mobile/entities/news.rb b/app/api/mobile/entities/news.rb
index 4f973d82e..ff1452b1c 100644
--- a/app/api/mobile/entities/news.rb
+++ b/app/api/mobile/entities/news.rb
@@ -24,6 +24,9 @@ module Mobile
                   'News'
                 when :act_id
                   f.id
+                when :comments_count
+                  all_comments = []
+                  get_all_children(all_comments, f).count
               end
             end
           elsif f.is_a?(Hash) && !f.key?(field)
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 39c77de4b..091e2749e 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -392,7 +392,7 @@ class CoursesService
   def homework_list params,current_user
     course = Course.find(params[:id])
     if course.is_public != 0 || current_user.member_of_course?(course)
-      bids = course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).page(params[:page] || 1).per(20).order('created_at DESC')
+      bids = course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).page(params[:page] || 1).per(20).reorder('created_at DESC')
       bids = bids.like(params[:name]) if params[:name].present?
       homeworks = []
       bids.each do |bid|
@@ -495,7 +495,7 @@ class CoursesService
   def course_attachments params
     result = []
     course = Course.find(params[:course_id])
-    attachments = course.attachments.where("is_publish = 1").order("created_on desc")
+    attachments = course.attachments.where("is_publish = 1").reorder("created_on desc")
     if !params[:name].nil? && params[:name] != ""
       attachments.each do |atta|
         result << atta if atta.filename.include?(params[:name])
diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html
index a3c709cb5..d0074f343 100644
--- a/public/assets/wechat/class_list.html
+++ b/public/assets/wechat/class_list.html
@@ -36,5 +36,6 @@
         <a ng-click="goResource()" href="javascript:void(0);" class="weixin-tab link-blue2 border-top">我的资源</a>
     </div>
 
-    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+    <my-alert message="alertService_1.message" title="alertService_1.title" visible="alertService_1.visible" cb="alertService_1.cb"></my-alert>
+    <my-alert3 message="alertService_3.message" title="alertService_3.title" visible="alertService_3.visible" cb="alertService_3.cb" invite="alertService_3.invite" ></my-alert3>
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/myresource.html b/public/assets/wechat/myresource.html
index c06c57238..90fb13892 100644
--- a/public/assets/wechat/myresource.html
+++ b/public/assets/wechat/myresource.html
@@ -20,6 +20,7 @@
         </div>
         <p ng-show="resources_tag && resources.length<=0" class="class-test-tip">暂无课件，<br />
             请登录Trustie网站，在PC浏览器中上传课件。</p>
+
     </div>
     <div ng-class="{'undis': currentTab!=2}">
         <div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,2)" class="fr mr10 link-blue2 ">发送</a><div class="cl"></div>
diff --git a/public/assets/wechat/templates/alert3.html b/public/assets/wechat/templates/alert3.html
new file mode 100644
index 000000000..11e2c6d28
--- /dev/null
+++ b/public/assets/wechat/templates/alert3.html
@@ -0,0 +1,15 @@
+<div class="post-container" ng-show="visible">
+    <div class="weui_mask">
+        <div class="add-class-box">
+            <p class="tac add-class-tip">{{message}}</p>
+            <form class="mb20">
+                <input type="text" class="class-number-input" ng-model="invite" />
+            </form>
+            <a href="javascript:void(0);" class="c-grey4 fl cancel-btn" ng-click="dismiss()" >取消</a>
+            <div class="slice fl">
+                <div class="slice-line"></div>
+            </div>
+            <a href="javascript:void(0);" class="c-blue fl submit-btn" ng-click="confirm()" >确定</a>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
index b3f8a6ea3..9e0087135 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -8,7 +8,8 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
         var vm = $scope;
         vm.syllabuses = rms.get('syllabuses') || [];
 
-        vm.alertService = alertService.create();
+        vm.alertService_1 = alertService.create();
+        vm.alertService_3 = alertService.create();
 
         var loadClassList = function () {
             $http.get(config.apiUrl + "syllabuses?token=" + auth.token()).then(
@@ -36,7 +37,7 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
                 function (response) {
                     console.log(response.data);
                     if (response.data.auth == 0) {
-                        vm.alertService.showMessage('提示', '非教师身份不能创建课程哦~');
+                        vm.alertService_1.showMessage('提示', '非教师身份不能创建课程哦~');
                     }
                     else{
                         $location.path("/new_class");
@@ -50,26 +51,28 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
         }
 
         vm.joinClass = function () {
-            var code = window.prompt("请输入5位班级邀请码(不区分大小写)");
-            if (code && code.length == 5) {
-                $http.post(config.apiUrl + "courses/join", {
-                    token: auth.token(),
-                    invite_code: code
-                }).then(function (response) {
-                    console.log(response.data);
-                    if (response.data.status != 0) {
-                        vm.alertService.showMessage('错误', response.data.message);
-                    } else {
-                        vm.alertService.showMessage('提示', '加入课程成功');
-                        loadClassList();
+            vm.alertService_3.showMessage('提示', '请输入5位班级邀请码(不区分大小写)', function(){
+                if (vm.alertService_3.invite && vm.alertService_3.invite.length == 5) {
+                    $http.post(config.apiUrl + "courses/join", {
+                        token: auth.token(),
+                        invite_code: vm.alertService_3.invite
+                    }).then(function (response) {
+                        console.log(response.data);
+                        if (response.data.status != 0) {
+                            vm.alertService_1.showMessage('错误', response.data.message);
+                        } else {
+                            vm.alertService_1.showMessage('提示', '加入课程成功');
+                            vm.alertService_3.invite = "";
+                            loadClassList();
+                        }
+                    });
+                } else {
+                    if(vm.alertService_3.invite){
+                        vm.alertService_1.showMessage('错误', '邀请码格式不正确');
                     }
-                });
-            } else {
-                if(code){
-                    vm.alertService.showMessage('错误', '邀请码格式不正确');
-                }
 
-            }
+                }
+            });
         };
 
         vm.onSetting = function (syllabus) {
diff --git a/public/javascripts/wechat/directives/alert.js b/public/javascripts/wechat/directives/alert.js
index 4b703811c..e9401de34 100644
--- a/public/javascripts/wechat/directives/alert.js
+++ b/public/javascripts/wechat/directives/alert.js
@@ -40,3 +40,27 @@ app.directive('myAlert2', ['config', function(config){
         }
     }
 }]);
+
+app.directive('myAlert3', ['config', function(config){
+    return {
+        templateUrl: config.rootPath+ 'templates/alert3.html',
+        scope: {
+            title: "=",
+            message: "=",
+            visible: "=",
+            cb: "=",
+            invite: "="
+        },
+        link: function(scope){
+            scope.dismiss = function(){
+                scope.visible = false;
+            };
+            scope.confirm = function(){
+                scope.visible = false;
+                if(typeof scope.cb === 'function'){
+                    scope.cb();
+                }
+            }
+        }
+    }
+}]);
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 6c7709df3..2b0d4f994 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -4,6 +4,7 @@ app.factory('alertService', function(){
         this.message = null;
         this.visible = null;
         this.cb = null;
+        this.invite = "";
     }
 
     Alert.prototype.showMessage = function(title, msg, cb){
@@ -11,12 +12,14 @@ app.factory('alertService', function(){
         this.title = title;
         this.visible = true;
         this.cb = cb;
+        this.invite = "";
     }
 
     Alert.prototype.dismiss = function(){
         this.message = null;
         this.title = null;
         this.visible = false;
+        this.invite = "";
         if(this.cb) {this.cb();}
     }
 

From ea88c92d31a1e815042d1f82d5ab694a437d2625 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 19 Jul 2016 10:54:04 +0800
Subject: [PATCH 09/26] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/api.rb | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index 9b4bdb5d6..5a0345207 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -1,25 +1,25 @@
 #coding=utf-8
 
 module Mobile
-  require_relative 'middleware/error_handler'
-  require_relative 'apis/auth'
-  require_relative 'apis/users'
-  require_relative 'apis/courses'
-  require_relative 'apis/watches'
-  require_relative 'apis/upgrade'
-  require_relative 'apis/homeworks'
-  require_relative 'apis/comments'
-  require_relative 'apis/issues'
-  require_relative 'apis/activities'
-  require_relative 'apis/whomeworks'
-  require_relative 'apis/newss'
-  require_relative 'apis/journal_for_messages'
-  require_relative 'apis/messages'
-  require_relative 'apis/blog_comments'
-  require_relative 'apis/new_comment'
-  require_relative 'apis/praise'
-  require_relative 'apis/resources'
-  require_relative 'apis/syllabuses'
+  # require_relative 'middleware/error_handler'
+  # require_relative 'apis/auth'
+  # require_relative 'apis/users'
+  # require_relative 'apis/courses'
+  # require_relative 'apis/watches'
+  # require_relative 'apis/upgrade'
+  # require_relative 'apis/homeworks'
+  # require_relative 'apis/comments'
+  # require_relative 'apis/issues'
+  # require_relative 'apis/activities'
+  # require_relative 'apis/whomeworks'
+  # require_relative 'apis/newss'
+  # require_relative 'apis/journal_for_messages'
+  # require_relative 'apis/messages'
+  # require_relative 'apis/blog_comments'
+  # require_relative 'apis/new_comment'
+  # require_relative 'apis/praise'
+  # require_relative 'apis/resources'
+  # require_relative 'apis/syllabuses'
 
   class API < Grape::API
     version 'v1', using: :path

From 27965bee01f71556b32854ed285b8d9093b805c2 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 19 Jul 2016 11:17:46 +0800
Subject: [PATCH 10/26] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/templates/alert3.html | 4 ++--
 public/stylesheets/weui/weixin.css         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/assets/wechat/templates/alert3.html b/public/assets/wechat/templates/alert3.html
index 11e2c6d28..c7516450c 100644
--- a/public/assets/wechat/templates/alert3.html
+++ b/public/assets/wechat/templates/alert3.html
@@ -5,11 +5,11 @@
             <form class="mb20">
                 <input type="text" class="class-number-input" ng-model="invite" />
             </form>
-            <a href="javascript:void(0);" class="c-grey4 fl cancel-btn" ng-click="dismiss()" >取消</a>
+            <a href="javascript:void(0);" class="c-grey3 fl cancel-btn" ng-click="dismiss()" >取消</a>
             <div class="slice fl">
                 <div class="slice-line"></div>
             </div>
-            <a href="javascript:void(0);" class="c-blue fl submit-btn" ng-click="confirm()" >确定</a>
+            <a href="javascript:void(0);" class="c-green fl submit-btn" ng-click="confirm()" >确定</a>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 7082955e3..a81541e39 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -55,6 +55,8 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4e
 a {color:#707070;}
 a.c-grey {color:#707070;}
 a.c-grey2 {color:#9a9a9a;}
+a.c-grey3 {color:#353535;}
+a.c-green {color:#0bb20c;}
 a:link,a:visited{text-decoration:none;}
 a:hover,a:active{cursor:pointer;}
 a.link-blue {color:#269ac9;}
@@ -154,7 +156,7 @@ a.underline {text-decoration:underline;}
 
 /*20150612加入班级样式*/
 .add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; margin:0 auto; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%);}
-.add-class-tip {padding-top:20px; padding-bottom:20px;}
+.add-class-tip {padding-top:1.2em; padding-bottom:.5em; font-weight:400;}
 .class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;}
 .cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
 .submit-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}

From 2af1a5ffb9fd111f8fc299facf688edeea54157a Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 19 Jul 2016 15:07:11 +0800
Subject: [PATCH 11/26] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E5=92=8C=E7=AE=A1=E7=90=86=E7=8F=AD=E7=BA=A7=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E9=AB=98=E5=BA=A6=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/weui/weixin.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index a81541e39..ac3faeec4 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -155,7 +155,7 @@ a.underline {text-decoration:underline;}
 .locked_btn_cir {background: url("/images/wechat/locked.png") 0 0 no-repeat; cursor: default;}
 
 /*20150612加入班级样式*/
-.add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; margin:0 auto; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%);}
+.add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%);}
 .add-class-tip {padding-top:1.2em; padding-bottom:.5em; font-weight:400;}
 .class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;}
 .cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
@@ -211,7 +211,7 @@ a.underline {text-decoration:underline;}
 .students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;}
 .new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
 .join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
-.new-class-input {width:60%; color:#555; height:35px; line-height:35px; vertical-align:middle; border:none; outline:none;}
+.new-class-input {width:60%; color:#555; height:16px; line-height:16px; vertical-align:middle; border:none; outline:none; padding:10px 0;}
 
 /*20160616登录注册*/
 .login-wrap {padding:0 10px;}

From 5b3c6cc012be4e08cc6a04a75a2fe5d272def8d3 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 19 Jul 2016 15:41:40 +0800
Subject: [PATCH 12/26] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/directives/input_auto.js | 4 ++--
 public/stylesheets/weui/weixin.css                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/javascripts/wechat/directives/input_auto.js b/public/javascripts/wechat/directives/input_auto.js
index 28cb792ab..1f2550882 100644
--- a/public/javascripts/wechat/directives/input_auto.js
+++ b/public/javascripts/wechat/directives/input_auto.js
@@ -8,11 +8,11 @@ app.directive('inputAuto',function(){
             element.on('input',function(){
                 console.log(sendButton);
                 copyContainer.html(element[0].value);
-                var textHeight = copyContainer[0].scrollHeight;
+                var textHeight = copyContainer[0].scrollHeight-10;
                 element.css('height', textHeight + 'px');
             });
             sendButton.on('click',function(){
-                element.css('height','28px');
+                element.css('height','18px');
             });
         }
     }
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index ac3faeec4..a5b7d3a7a 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -129,8 +129,8 @@ a.underline {text-decoration:underline;}
 .post-reply-date, .post-reply-trigger {font-size:13px;}
 .post-input-container {position:relative; padding-right:70px;}
 .copy-input-container {position:relative; padding-right:70px;}
-.copy-input {width:100%; height:28px; line-height:28px; padding:0 5px; vertical-align: middle; font-size:12px; border-radius:3px; position:absolute; left:-999em;}
-.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; vertical-align: middle; font-size:13px; border:1px solid #e6e6e6; outline:none; padding:0 5px; margin:0; border-radius:3px; overflow-y:auto; resize:none; background-color:#f0eff4;}
+.copy-input {width:100%; height:18px; line-height:18px; padding:5px; vertical-align: middle; font-size:12px; border-radius:3px; position:absolute; left:-999em;}
+.post-reply-input {width:100%; height:18px; max-height:54px; line-height:18px; vertical-align: middle; font-size:13px; border:1px solid #e6e6e6; outline:none; padding:5px; margin:0; border-radius:3px; overflow-y:auto; resize:none; background-color:#f0eff4;}
 .post-reply-submit {position:absolute; font-size:13px; height:30px; line-height:30px; vertical-align:middle; padding:0 8px; color:#fff; background-color:#269ac9; outline:none; border:none; top:0; right:0;}
 .reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
 .praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}

From 707df88c7f7fa964ae43f3ac745bcc07556d06b2 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Tue, 19 Jul 2016 16:05:39 +0800
Subject: [PATCH 13/26] =?UTF-8?q?tab=E5=AE=B9=E5=99=A8=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E7=99=BE=E5=88=86=E7=99=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/weui/weixin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index a5b7d3a7a..8a755b323 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -86,7 +86,7 @@ a.underline {text-decoration:underline;}
 .btn2 {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; margin:18px auto 20px auto; border-radius:50px; display:block;}
 
 /*tab*/
-.tab-wrap {position:relative; line-height:38px; display:-webkit-box; display:-moz-box; display:-ms-flexbox; display:-webkit-flex; display:flex; font-size:13px; background-color:#fff;}
+.tab-wrap {position:relative; width:100%; line-height:38px; display:-webkit-box; display:-moz-box; display:-ms-flexbox; display:-webkit-flex; display:flex; font-size:13px; background-color:#fff;}
 .tab-wrap a {position:relative; display:block; -webkit-box-flex:1; -moz-box-flex:1; -ms-flex:1; flex:1;}
 .tab-wrap a:first-child:after {display:none;}
 .tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}

From 53feb0bbd4c4690e7c42294f789d5fab8473b8e2 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 20 Jul 2016 09:11:05 +0800
Subject: [PATCH 14/26] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=90=8D=E7=A7=B0=E5=AE=BD=E5=BA=A6=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/class_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html
index d0074f343..063e92861 100644
--- a/public/assets/wechat/class_list.html
+++ b/public/assets/wechat/class_list.html
@@ -4,7 +4,7 @@
     <div>
         <div class="course-diff-row"><span class="c-blue f13 ml10">我创建的课程</span></div>
         <div  ng-show = "syllabus.can_setting" ng-repeat="syllabus in syllabuses">
-            <div ng-click="syllabus.show_plus = !syllabus.show_plus"  class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
+            <div ng-click="syllabus.show_plus = !syllabus.show_plus"  class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10 class-list-name hidden">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
             <ul ng-show="syllabus.show_plus" class="class-list f13 c-grey3">
                 <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
                     <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
@@ -18,7 +18,7 @@
     <div>
         <div class="course-diff-row border-top mt10"><span class="c-blue f13 ml10">我参与的课程</span></div>
         <div  ng-show = "!syllabus.can_setting" ng-repeat="syllabus in syllabuses">
-            <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
+            <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10 class-list-name hidden">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
             <ul ng-show="syllabus.show_plus" class="class-list f13 c-grey3">
                 <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
                     <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />

From 1ce7b22c0eaa78316b62f66c3dd865ac9860d1ac Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 20 Jul 2016 10:09:27 +0800
Subject: [PATCH 15/26] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/api.rb                         | 38 +++++++-------
 app/api/mobile/apis/blog_comments.rb          |  7 ++-
 app/api/mobile/entities/blog_comment.rb       | 49 ++++++++++++++++++-
 public/javascripts/wechat/controllers/blog.js | 14 +++++-
 public/javascripts/wechat/others/factory.js   | 10 ++--
 5 files changed, 90 insertions(+), 28 deletions(-)

diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index 5a0345207..9b4bdb5d6 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -1,25 +1,25 @@
 #coding=utf-8
 
 module Mobile
-  # require_relative 'middleware/error_handler'
-  # require_relative 'apis/auth'
-  # require_relative 'apis/users'
-  # require_relative 'apis/courses'
-  # require_relative 'apis/watches'
-  # require_relative 'apis/upgrade'
-  # require_relative 'apis/homeworks'
-  # require_relative 'apis/comments'
-  # require_relative 'apis/issues'
-  # require_relative 'apis/activities'
-  # require_relative 'apis/whomeworks'
-  # require_relative 'apis/newss'
-  # require_relative 'apis/journal_for_messages'
-  # require_relative 'apis/messages'
-  # require_relative 'apis/blog_comments'
-  # require_relative 'apis/new_comment'
-  # require_relative 'apis/praise'
-  # require_relative 'apis/resources'
-  # require_relative 'apis/syllabuses'
+  require_relative 'middleware/error_handler'
+  require_relative 'apis/auth'
+  require_relative 'apis/users'
+  require_relative 'apis/courses'
+  require_relative 'apis/watches'
+  require_relative 'apis/upgrade'
+  require_relative 'apis/homeworks'
+  require_relative 'apis/comments'
+  require_relative 'apis/issues'
+  require_relative 'apis/activities'
+  require_relative 'apis/whomeworks'
+  require_relative 'apis/newss'
+  require_relative 'apis/journal_for_messages'
+  require_relative 'apis/messages'
+  require_relative 'apis/blog_comments'
+  require_relative 'apis/new_comment'
+  require_relative 'apis/praise'
+  require_relative 'apis/resources'
+  require_relative 'apis/syllabuses'
 
   class API < Grape::API
     version 'v1', using: :path
diff --git a/app/api/mobile/apis/blog_comments.rb b/app/api/mobile/apis/blog_comments.rb
index bb5758e71..5b970e0ba 100644
--- a/app/api/mobile/apis/blog_comments.rb
+++ b/app/api/mobile/apis/blog_comments.rb
@@ -8,8 +8,13 @@ module Mobile
         desc "get special topic"
         get ':id' do
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
+
           blog = BlogComment.find params[:id]
-          present :data, blog, with: Mobile::Entities::BlogComment,user: user
+          present :data, blog, with: Mobile::Entities::BlogComment,user: user,type: type,page: page
           present :status, 0
         end
       end
diff --git a/app/api/mobile/entities/blog_comment.rb b/app/api/mobile/entities/blog_comment.rb
index a61864900..cd7902097 100644
--- a/app/api/mobile/entities/blog_comment.rb
+++ b/app/api/mobile/entities/blog_comment.rb
@@ -53,7 +53,18 @@ module Mobile
       blog_comment_expose :praise_count
       expose :blog_comment_children, using:Mobile::Entities::BlogComment do |c,opt|
         if c.is_a? (::BlogComment)
-          c.children.reverse
+          ##自己的父回复为空  才有子回复
+          if !opt[:children]
+            if c.parent.nil? && opt[:type] == 0
+              opt[:children] = true
+              all_comments = []
+              tStart = opt[:page]*5
+              tEnd = (opt[:page]+1)*5 - 1
+
+              all_comments = get_all_children(all_comments, c)[tStart..tEnd]
+              all_comments
+            end
+          end
         end
       end
       expose :has_praise, if: lambda { |instance, options| options[:user] } do |instance, options|
@@ -63,6 +74,42 @@ module Mobile
         has_praise = obj.empty? ? false : true
         has_praise
       end
+
+      expose :parents_reply_bottom, using:Mobile::Entities::BlogComment do |c,opt|
+        if c.is_a? (::BlogComment)
+          #取二级回复的底楼层
+          if (opt[:type] == 1 && !opt[:bottom])
+            opt[:bottom] = true
+            parents_reply = []
+            parents_reply = c.parent.nil? ? [] : parents_reply << c.parent #get_reply_parents_no_root(parents_reply, c)[0]
+            parents_reply
+          end
+        end
+      end
+
+      expose :parents_reply_top, using:Mobile::Entities::BlogComment do |c,opt|
+        if c.is_a? (::BlogComment)
+          #取二级回复的顶楼层
+          if (opt[:type] == 1 && !opt[:top])
+            opt[:top] = true
+
+            parents_reply = []
+            parents_reply = get_reply_parents_no_root(parents_reply, c)
+
+            tStart = opt[:page]*2
+            tEnd = (opt[:page]+1)*2 - 1
+
+            parents_reply = parents_reply.reverse[tStart,tEnd]
+            parents_reply
+          end
+        end
+      end
+
+      expose :parents_count, if: lambda { |instance, options| options[:user] } do |instance, options|
+        parents_reply = []
+        parents_reply = get_reply_parents_no_root(parents_reply, instance)
+        parents_reply.count
+      end
     end
   end
 end
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/blog.js b/public/javascripts/wechat/controllers/blog.js
index 4c2403944..48bd2863a 100644
--- a/public/javascripts/wechat/controllers/blog.js
+++ b/public/javascripts/wechat/controllers/blog.js
@@ -7,8 +7,18 @@ app.controller('BlogController',
             scope: $scope,
             type: 'blog_comments',
             replyType: 'BlogComment',
-            loadCallback: function(data){
-                $scope.blog = data.data;
+            loadCallback: function(data,replytype,page){
+                console.log(data.data);
+
+                if (replytype == 0 && page == 0 ) {
+                    $scope.blog = data.data;
+                }
+                else{
+
+
+
+
+                }
             },
             replyCallback: function(){
             }
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 2b0d4f994..3e5b4c4f3 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -158,19 +158,19 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
 
     var init = function(args){
         args.scope.formData = {comment: ''};
-        var loadData = function(id){
-            loadCommonData(id, args.type).then(function successCallback(response) {
-                args.loadCallback(response.data);
+        var loadData = function(id,replytype,page){
+            loadCommonData(id, args.type,replytype,page).then(function successCallback(response) {
+                args.loadCallback(response.data,replytype,page);
             }, function errorCallback(response) {
             });
         };
 
-        loadData(args.id);
+        loadData(args.id,0,0);
         args.scope.addReply = function(data){
             console.log(data.comment);
             addCommonReply(args.id, args.replyType, data, function(){
                 args.scope.formData = {comment: ''};
-                loadData(args.id);
+                loadData(args.id,0,0);
                 if(typeof args.replyCallback === 'function'){
                     args.replyCallback();
                 }

From 67e87df4d51f37bd9ca8a28dd57c424f36dfe913 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 20 Jul 2016 13:34:58 +0800
Subject: [PATCH 16/26] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=9B=9E=E5=A4=8D=E6=98=BE=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/blog_comments.rb          |  4 +++-
 app/api/mobile/apis/issues.rb                 | 10 ++++++--
 app/api/mobile/apis/journal_for_messages.rb   | 11 +++++++--
 app/api/mobile/apis/messages.rb               | 10 ++++++--
 app/api/mobile/apis/newss.rb                  | 10 ++++++--
 app/api/mobile/apis/whomeworks.rb             | 10 ++++++--
 app/api/mobile/entities/activity.rb           | 22 ++++++++---------
 public/javascripts/wechat/controllers/blog.js | 18 +++++++++++---
 public/javascripts/wechat/others/factory.js   | 24 +++++++++++++++----
 9 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/app/api/mobile/apis/blog_comments.rb b/app/api/mobile/apis/blog_comments.rb
index 5b970e0ba..39b6a486a 100644
--- a/app/api/mobile/apis/blog_comments.rb
+++ b/app/api/mobile/apis/blog_comments.rb
@@ -6,7 +6,7 @@ module Mobile
       resources :blog_comments do
 
         desc "get special topic"
-        get ':id' do
+        post ':id' do
           user = current_user
 
           #0一级回复的更多  1 二级回复的更多
@@ -15,6 +15,8 @@ module Mobile
 
           blog = BlogComment.find params[:id]
           present :data, blog, with: Mobile::Entities::BlogComment,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end
diff --git a/app/api/mobile/apis/issues.rb b/app/api/mobile/apis/issues.rb
index 4a6417cb4..36b558652 100644
--- a/app/api/mobile/apis/issues.rb
+++ b/app/api/mobile/apis/issues.rb
@@ -7,11 +7,17 @@ module Mobile
         include IssuesHelper
 
         desc "get special issuse"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
           issue = Issue.find params[:id]
-          present :data, issue, with: Mobile::Entities::Issue,user: user
+          present :data, issue, with: Mobile::Entities::Issue,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end
diff --git a/app/api/mobile/apis/journal_for_messages.rb b/app/api/mobile/apis/journal_for_messages.rb
index 5f2d01185..6ac484513 100644
--- a/app/api/mobile/apis/journal_for_messages.rb
+++ b/app/api/mobile/apis/journal_for_messages.rb
@@ -6,11 +6,18 @@ module Mobile
       resources :journal_for_messages do
 
         desc "get special journal"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
+
           jour = JournalsForMessage.find params[:id]
-          present :data, jour, with: Mobile::Entities::Jours,user: user
+          present :data, jour, with: Mobile::Entities::Jours,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end
diff --git a/app/api/mobile/apis/messages.rb b/app/api/mobile/apis/messages.rb
index bab82de8d..ceda5058f 100644
--- a/app/api/mobile/apis/messages.rb
+++ b/app/api/mobile/apis/messages.rb
@@ -6,11 +6,17 @@ module Mobile
       resources :messages do
 
         desc "get special topic"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
           message = Message.find params[:id]
-          present :data, message, with: Mobile::Entities::Message,user: user
+          present :data, message, with: Mobile::Entities::Message,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end
diff --git a/app/api/mobile/apis/newss.rb b/app/api/mobile/apis/newss.rb
index d42177783..6e012ca4b 100644
--- a/app/api/mobile/apis/newss.rb
+++ b/app/api/mobile/apis/newss.rb
@@ -6,11 +6,17 @@ module Mobile
       resources :newss do
 
         desc "get special news"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
           news = News.find params[:id]
-          present :data, news, with: Mobile::Entities::News,user: user
+          present :data, news, with: Mobile::Entities::News,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end
diff --git a/app/api/mobile/apis/whomeworks.rb b/app/api/mobile/apis/whomeworks.rb
index c8377aa0d..db1e7e269 100644
--- a/app/api/mobile/apis/whomeworks.rb
+++ b/app/api/mobile/apis/whomeworks.rb
@@ -6,11 +6,17 @@ module Mobile
       resources :whomeworks do
 
         desc "get one homework"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
           homework = HomeworkCommon.find params[:id]
-          present :data, homework, with: Mobile::Entities::Whomework,user: user
+          present :data, homework, with: Mobile::Entities::Whomework,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end
diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index bdeff7ae9..2856354a1 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -20,17 +20,17 @@ module Mobile
                     ac.act unless ac.nil? || ac.act.nil?
                   end
                 when :reply_count
-                  # if ac.act_type == "HomeworkCommon"
-                  #   ac.nil? || ac.act.nil? ? 0 : ac.act.journals_for_messages.count
-                  # elsif ac.act_type == "News"
-                  #   ac.nil? || ac.act.nil? ? 0 : ac.act.comments.count
-                  # elsif ac.act_type == "Message" || ac.act_type == "BlogComment" || ac.act_type == "JournalsForMessage"
-                  #   ac.nil? || ac.act.nil? ? 0 : ac.act.children.count
-                  # elsif ac.act_type == "Issue"
-                  #   ac.nil? || ac.act.nil? ? 0 : ac.act.journals.where("notes is not null and notes != ''").count
-                  # end
-                  all_comments = []
-                  ac.nil? || ac.act.nil? ? 0 : get_all_children(all_comments, ac.act).count
+                  if ac.act_type == "HomeworkCommon"
+                    ac.nil? || ac.act.nil? ? 0 : ac.act.journals_for_messages.count
+                  elsif ac.act_type == "News"
+                    ac.nil? || ac.act.nil? ? 0 : ac.act.comments.count
+                  elsif ac.act_type == "Message" || ac.act_type == "BlogComment" || ac.act_type == "JournalsForMessage"
+                    all_comments = []
+                    ac.nil? || ac.act.nil? ? 0 : get_all_children(all_comments, ac.act).count
+                  elsif ac.act_type == "Issue"
+                    ac.nil? || ac.act.nil? ? 0 : ac.act.journals.where("notes is not null and notes != ''").count
+                  end
+
                 when :subject
                   if ac.act_type == "HomeworkCommon"
                     ac.act.name unless ac.nil? || ac.act.nil?
diff --git a/public/javascripts/wechat/controllers/blog.js b/public/javascripts/wechat/controllers/blog.js
index 48bd2863a..dc9f4bf39 100644
--- a/public/javascripts/wechat/controllers/blog.js
+++ b/public/javascripts/wechat/controllers/blog.js
@@ -7,17 +7,29 @@ app.controller('BlogController',
             scope: $scope,
             type: 'blog_comments',
             replyType: 'BlogComment',
-            loadCallback: function(data,replytype,page){
+            loadCallback: function(data){
                 console.log(data.data);
+                replytype = data.type;
+                page = data.page;
 
-                if (replytype == 0 && page == 0 ) {
-                    $scope.blog = data.data;
+                if (replytype == 0){
+                    if (page == 0){
+                        $scope.blog = data.data;
+                    }
+                    else{
+                        $scope.blog.blog_comment_children = $scope.blog.blog_comment_children.concat(data.data.blog_comment_children);
+                    }
+                    $scope.has_more = $scope.blog.blog_comment_children.length < $scope.blog.comment_count;
+                    console.log($scope.has_more);
                 }
                 else{
 
 
 
 
+
+
+
                 }
             },
             replyCallback: function(){
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 3e5b4c4f3..dcd78740f 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -121,10 +121,18 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
         });
     };
 
-    var loadCommonData = function(id, type){
+//    var loadCommonData = function(id, type,replytype,page){
+//        return $http({
+//            method: 'GET',
+//            url: apiUrl+ type + "/" + id+"?token="+auth.token(),
+//        })
+//    };
+
+    var loadCommonData = function(id, type,replytype,page){
         return $http({
-            method: 'GET',
-            url: apiUrl+ type + "/" + id+"?token="+auth.token()
+            method: 'POST',
+            url: apiUrl+ type + "/" + id,
+            data:{token:auth.token(),type:replytype,page:page}
         })
     };
 
@@ -160,7 +168,7 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
         args.scope.formData = {comment: ''};
         var loadData = function(id,replytype,page){
             loadCommonData(id, args.type,replytype,page).then(function successCallback(response) {
-                args.loadCallback(response.data,replytype,page);
+                args.loadCallback(response.data);
             }, function errorCallback(response) {
             });
         };
@@ -245,6 +253,14 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
             act.has_praise = false;
             decreaseCommonPraise(act);
         };
+
+        args.scope.morereply = function(data,replytype,page){
+            loadCommonData(data.id, args.type,replytype,page).then(function successCallback(response) {
+                args.loadCallback(response.data);
+            }, function errorCallback(response) {
+            });
+        };
+
     }
 
     return {init: init, addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};

From c56f7732a1c401b6a86d2f63d802bcd17b126fa6 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 20 Jul 2016 14:05:17 +0800
Subject: [PATCH 17/26] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=96=B0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/weui/weixin.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 8a755b323..ed3af75ae 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -222,4 +222,10 @@ a.underline {text-decoration:underline;}
 .login-box.checked{background:#63c360; border:1px solid #63c360;}
 .login-box.checked:after{content:url(/images/wechat/checked.png);}
 .forget-psw-wrap {width:60px; margin:0 auto;}
-.forget-psw {position:fixed; bottom:10px;}
\ No newline at end of file
+.forget-psw {position:fixed; bottom:10px;}
+
+/*二级回复*/
+.mult-reply-container{ border:solid 1px #f3ddb3; background:#fffef4; padding:4px;color:#999; margin-top:-1px;}
+.mult-reply-content{ color:#707070; font-size:13px;}
+.mult-reply-hide{ text-align:center; display:block; font-size:14px; color:#aaa; border-bottom:1px solid #F3DDB3; padding:8px 0;}
+.mult-reply-arrow{ color:#aaa; margin-right:10px; font-size:14px; font-weight:bold;}
\ No newline at end of file

From 24ee25e095d162dd451914672a0330803a4ab735 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 21 Jul 2016 13:54:03 +0800
Subject: [PATCH 18/26] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=AE=A1=E7=90=86=E8=AF=BE=E7=A8=8B=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=EF=BC=8C=E5=88=97=E8=A1=A8=E5=B1=95=E5=BC=80bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/class_list.html | 10 ++++++----
 public/stylesheets/weui/weixin.css   |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html
index 063e92861..2c3b3b7b9 100644
--- a/public/assets/wechat/class_list.html
+++ b/public/assets/wechat/class_list.html
@@ -3,8 +3,9 @@
     <div class="blue-title">课程列表</div>
     <div>
         <div class="course-diff-row"><span class="c-blue f13 ml10">我创建的课程</span></div>
-        <div  ng-show = "syllabus.can_setting" ng-repeat="syllabus in syllabuses">
-            <div ng-click="syllabus.show_plus = !syllabus.show_plus"  class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10 class-list-name hidden">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
+        <div  ng-show = "syllabus.can_setting" ng-repeat="syllabus in syllabuses" style="position:relative;">
+            <div ng-click="syllabus.show_plus = !syllabus.show_plus"  class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10 class-list-name hidden">{{syllabus.title}}</span></div>
+            <img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="class-list-setting" ng-click="onSetting(syllabus)" />
             <ul ng-show="syllabus.show_plus" class="class-list f13 c-grey3">
                 <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
                     <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
@@ -17,8 +18,9 @@
     </div>
     <div>
         <div class="course-diff-row border-top mt10"><span class="c-blue f13 ml10">我参与的课程</span></div>
-        <div  ng-show = "!syllabus.can_setting" ng-repeat="syllabus in syllabuses">
-            <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10 class-list-name hidden">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
+        <div  ng-show = "!syllabus.can_setting" ng-repeat="syllabus in syllabuses" style="position:relative;">
+            <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10 class-list-name hidden">{{syllabus.title}}</span></div>
+            <img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="class-list-setting" ng-click="onSetting(syllabus)" />
             <ul ng-show="syllabus.show_plus" class="class-list f13 c-grey3">
                 <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
                     <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index ed3af75ae..364c8a001 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -212,6 +212,7 @@ a.underline {text-decoration:underline;}
 .new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
 .join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
 .new-class-input {width:60%; color:#555; height:16px; line-height:16px; vertical-align:middle; border:none; outline:none; padding:10px 0;}
+.class-list-setting {position:absolute; top:10px; right:10px;}
 
 /*20160616登录注册*/
 .login-wrap {padding:0 10px;}

From 7cd505ea4bed9102f42fd9563d601591f8167b1f Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 21 Jul 2016 14:03:04 +0800
Subject: [PATCH 19/26] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8A=A0=E5=85=A5=E4=BA=8C=E7=BA=A7=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84=E5=B1=95=E5=BC=80=E5=8A=9F=E8=83=BD=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=80=E7=BA=A7=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/blog_comment.rb       | 61 ++++++++++-----
 app/controllers/wechats_controller.rb         |  4 +-
 app/services/syllabuses_service.rb            |  4 +-
 public/assets/wechat/blog_detail.html         | 74 ++++++++++++++++++-
 public/assets/wechat/edit_class.html          |  4 +-
 public/assets/wechat/new_class.html           |  4 +-
 public/assets/wechat/send_class_list.html     |  2 +-
 public/javascripts/wechat/controllers/blog.js | 18 +++--
 public/javascripts/wechat/others/factory.js   | 11 ++-
 public/stylesheets/weui/weixin.css            |  2 +-
 10 files changed, 141 insertions(+), 43 deletions(-)

diff --git a/app/api/mobile/entities/blog_comment.rb b/app/api/mobile/entities/blog_comment.rb
index cd7902097..3f58e901f 100644
--- a/app/api/mobile/entities/blog_comment.rb
+++ b/app/api/mobile/entities/blog_comment.rb
@@ -75,14 +75,27 @@ module Mobile
         has_praise
       end
 
+      expose :parents_count, if: lambda { |instance, options| options[:user] } do |instance, options|
+        parents_reply = []
+        parents_reply = get_reply_parents_no_root(parents_reply, instance)
+        parents_reply.count
+      end
+
       expose :parents_reply_bottom, using:Mobile::Entities::BlogComment do |c,opt|
         if c.is_a? (::BlogComment)
           #取二级回复的底楼层
-          if (opt[:type] == 1 && !opt[:bottom])
-            opt[:bottom] = true
-            parents_reply = []
-            parents_reply = c.parent.nil? ? [] : parents_reply << c.parent #get_reply_parents_no_root(parents_reply, c)[0]
-            parents_reply
+          parents_reply = []
+          parents_reply = get_reply_parents_no_root(parents_reply, c)
+          if parents_reply.count > 0 && !opt[:bottom]
+            if opt[:type] == 1
+              # opt[:bottom] = true
+              # parents_reply[opt[:page]..opt[:page]]
+            else
+              opt[:bottom] = true
+              parents_reply[0..0]
+            end
+          else
+            []
           end
         end
       end
@@ -90,26 +103,34 @@ module Mobile
       expose :parents_reply_top, using:Mobile::Entities::BlogComment do |c,opt|
         if c.is_a? (::BlogComment)
           #取二级回复的顶楼层
-          if (opt[:type] == 1 && !opt[:top])
-            opt[:top] = true
+          parents_reply = []
+          parents_reply = get_reply_parents_no_root(parents_reply, c)
+          if parents_reply.count > 0 && !opt[:top]
+            if opt[:type] == 1
+              opt[:bottom] = true
+              tStart = (opt[:page]-1)*5+2
+              tEnd = (opt[:page])*5+2 - 1
 
-            parents_reply = []
-            parents_reply = get_reply_parents_no_root(parents_reply, c)
-
-            tStart = opt[:page]*2
-            tEnd = (opt[:page]+1)*2 - 1
+              if tEnd >= parents_reply.count - 1
+                tEnd = parents_reply.count - 2
+              end
 
-            parents_reply = parents_reply.reverse[tStart,tEnd]
-            parents_reply
+              if tStart <= parents_reply.count - 2
+                parents_reply = parents_reply.reverse[tStart..tEnd]
+                parents_reply.reverse
+              else
+                []
+              end
+            else
+              opt[:top] = true
+              parents_reply = parents_reply.reverse[0..1]
+              parents_reply.reverse
+            end
+          else
+            []
           end
         end
       end
-
-      expose :parents_count, if: lambda { |instance, options| options[:user] } do |instance, options|
-        parents_reply = []
-        parents_reply = get_reply_parents_no_root(parents_reply, instance)
-        parents_reply.count
-      end
     end
   end
 end
\ No newline at end of file
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index c72e04e14..e596042d9 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -221,8 +221,8 @@ class WechatsController < ActionController::Base
       raise CoursesService::JoinCourseError.message(status[:state])
     end
 
-    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
-                                                             content: "课程名称: #{course.name}\n班级名称: #{course.name}\n任课老师: #{course.teacher.show_name}\n进入班级,和小伙伴愉快的学习吧!"} }
+    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级，开始学习吧！',
+                                                             content: "课程名称：#{course.name}\n班级名称：#{course.name}\n任课老师：#{course.teacher.show_name}\n进入班级，和小伙伴愉快的学习吧！"} }
     return request.reply.news(news) do |article, n, index| # article is return object
       url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities#/class?id='+course.id.to_s}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
       pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
diff --git a/app/services/syllabuses_service.rb b/app/services/syllabuses_service.rb
index d5dec9f88..fcb70653b 100644
--- a/app/services/syllabuses_service.rb
+++ b/app/services/syllabuses_service.rb
@@ -71,8 +71,8 @@ class SyllabusesService
     count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count
     if count == 0
       ws = WechatService.new
-      title = "恭喜您创建班级成功"
-      ws.create_class_notice user.id, "create_course_notice", course.id,title, course.name, user.show_name, 0, "点击查看班级详情"
+      title = "恭喜您创建班级成功。"
+      ws.create_class_notice user.id, "create_course_notice", course.id,title, course.name, user.show_name, 0, "点击查看班级详情。"
     end
   end
 
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index aabea2532..d18575b94 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -42,11 +42,61 @@
                         </div>
                         <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
                         <div class="cl"></div>
-                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>
-                        <div class="cl"></div>
+                        <!--<div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>-->
+                        <div ng-show="journal.parents_count > 0" class="mult-reply-container mt10">
+                            <!--<div ng-repeat="reply_top in journal.parents_reply_top" >-->
+                                <div class="mult-reply-container mt2">
+                                <ul ng-if="journal.parents_reply_top[1]" ng-include="'comment_reply'"  ng-init="i=1;journal=journal"></ul>
+                                <div class="post-avatar fl mr10"><img ng-src="{{journal.parents_reply_top[0].user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
+                                <div class="post-dynamic-author hidden fl ng-binding">
+                                    {{journal.parents_reply_top[0].user.realname}}
+                                    <img ng-if="journal.parents_reply_top[0].user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                    <img ng-if="journal.parents_reply_top[0].user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                                </div>
+                                <div class="post-dynamic-time fr f13">{{journal.parents_reply_top[0].lasted_comment}}</div>
+                                <div class="cl"></div>
+                                <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="journal.parents_reply_top[0].content|safeHtml"></div>
+                                <div class="cl"></div>
+                                </div>
+                            <!--</div>-->
+
+                            <!--['weixin-tab', {'class-tab-active': currentTab == $index+1}]-->
+                            <!--一层end-->
+                            <!--<div class="mt10">-->
+                                <!--<div class="post-avatar fl mr10"><img src="images/pic01.jpg" ng-src="/images/avatars/User/0" class="border-radius img-circle" height="30" width="30"></div>-->
+                                <!--<div class="post-dynamic-author hidden fl ng-binding">yixin<img src="images/female.png" class="ml5" width="14"></div>-->
+                                <!--<div class="post-dynamic-time fr f13">5分钟前</div>-->
+                                <!--<div class="cl"></div>-->
+                                <!--<div class="post-reply-content c-grey2 mt12 border-bottom-none">烤活牛你见过似的，美国那边吃人你怎么不信？</div>-->
+                                <!--<div class="cl"></div>-->
+                            <!--</div>-->
+                            <!--二层end-->
+                            <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
+
+                            <div class="mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
+                                <div class="post-avatar fl mr10"><img ng-src="{{reply_bottom.user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
+                                <div class="post-dynamic-author hidden fl ng-binding">
+                                    {{reply_bottom.user.realname}}
+                                    <img ng-if="reply_bottom.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                                    <img ng-if="reply_bottom.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                                </div>
+                                <div class="post-dynamic-time fr f13">{{reply_bottom.lasted_comment}}</div>
+                                <div class="cl"></div>
+                                <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
+                                <div class="cl"></div>
+                            </div>
+                        </div>
+                        <div class="post-reply-content">
+                            <div class="mult-reply-content">
+                                <div class="mt10" ng-bind-html="journal.content|safeHtml"></div>
+                            </div>
+                            <div class="cl"></div>
+                        </div>
                     </div>
                 </div>
-
+                <div ng-if="has_more">
+                    <div id="more_reply" class="more-events mt10" ng-click="showMoreReply(0,blog);">更多</div>
+                </div>
             </div>
 
             <div ng-if="!blog.locked" id="post_input_1" class="post-input-wrap post-box-shadow">
@@ -63,4 +113,20 @@
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<script id="comment_reply" type="text/ng-template">
+    <div  class="mult-reply-container mt2">
+    <ul ng-if="journal.parents_reply_top[i+1]" ng-include="'comment_reply'"  ng-init="i=i+1;journal=journal"></ul>
+    <div class="post-avatar fl mr10"><img ng-src="{{journal.parents_reply_top[i].user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
+    <div class="post-dynamic-author hidden fl ng-binding">
+        {{journal.parents_reply_top[i].user.realname}}
+        <img ng-if="journal.parents_reply_top[i].user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+        <img ng-if="journal.parents_reply_top[i].user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+    </div>
+    <div class="post-dynamic-time fr f13">{{journal.parents_reply_top[i].lasted_comment}}</div>
+    <div class="cl"></div>
+    <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="journal.parents_reply_top[i].content|safeHtml"></div>
+    <div class="cl"></div>
+    </div>
+</script>
\ No newline at end of file
diff --git a/public/assets/wechat/edit_class.html b/public/assets/wechat/edit_class.html
index d6bc7e03c..62022566b 100644
--- a/public/assets/wechat/edit_class.html
+++ b/public/assets/wechat/edit_class.html
@@ -3,9 +3,9 @@
 
     <div class="blue-title">管理课程</div>
     <form novalidate name="classForm">
-        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input ng-change="syllabus.change = true" ng-class="['new-class-input ml25', {'c-grey':syllabus.change} ]" ng-model="syllabus.tmptitle" required placeholder="请输入课程名" /></div>
+        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input ng-change="syllabus.change = true" ng-class="['new-class-input ml25', {'c-grey':syllabus.change} ]" ng-model="syllabus.tmptitle" required placeholder="请输入课程名，如：软件工程" /></div>
 
-        <div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses" ng-show="course.can_setting"><span class="fl ml15 c-grey3">班级</span><input ng-change="course.change = true" required ng-class="['new-class-input ml25', {'c-grey':course.change} ]" ng-model="course.tmpname" placeholder="请输入班级名" /><a ng-click="deleteClass($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
+        <div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses" ng-show="course.can_setting"><span class="fl ml15 c-grey3">班级</span><input ng-change="course.change = true" required ng-class="['new-class-input ml25', {'c-grey':course.change} ]" ng-model="course.tmpname" placeholder="请输入班级名，如：计算机学院A班" /><a ng-click="deleteClass($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
         <div class="tac"><a ng-click="addClass()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增班级</a></div>
         <a ng-click="newClass(classForm, syllabus)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
     </form>
diff --git a/public/assets/wechat/new_class.html b/public/assets/wechat/new_class.html
index 039d19d75..5ce75d358 100644
--- a/public/assets/wechat/new_class.html
+++ b/public/assets/wechat/new_class.html
@@ -3,9 +3,9 @@
 
     <div class="blue-title">新建课程</div>
     <form novalidate name="classForm">
-    <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input class="new-class-input ml25" ng-model="syllabus.title" required placeholder="请输入课程名" /></div>
+    <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input class="new-class-input ml25" ng-model="syllabus.title" required placeholder="请输入课程名，如：软件工程" /></div>
 
-    <div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses"><span class="fl ml15 c-grey3">班级</span><input required class="new-class-input ml25" ng-model="course.name" placeholder="请输入班级名" /><a ng-click="deleteClass($index)" ng-show="!$first" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
+    <div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses"><span class="fl ml15 c-grey3">班级</span><input required class="new-class-input ml25" ng-model="course.name" placeholder="请输入班级名，如：计算机学院A班" /><a ng-click="deleteClass($index)" ng-show="!$first" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
     <div class="tac"><a ng-click="addClass()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增班级</a></div>
     <a ng-click="newClass(classForm, syllabus)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
     </form>
diff --git a/public/assets/wechat/send_class_list.html b/public/assets/wechat/send_class_list.html
index b66b5008d..68a9d1ae5 100644
--- a/public/assets/wechat/send_class_list.html
+++ b/public/assets/wechat/send_class_list.html
@@ -19,6 +19,6 @@
         <!--<li ng-click="selectCourse(course)" ng-class="{'border-bottom-none': $last }" ng-repeat="course in courses"><img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /><span class="fl ml10 class-list-name hidden">{{course.name}}</span><span ng-class="['login-box', 'fr', 'mr5', 'mt12', {'checked': course.checked}]"></span></li>-->
     <!--</ul>-->
 
-    <div class="btn2 bg-blue" ng-click="sendToCourses()">发送</div>
+    <div ng-show="syllabuses.length>0" class="btn2 bg-blue" ng-click="sendToCourses()">发送</div>
     <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
 </div>
diff --git a/public/javascripts/wechat/controllers/blog.js b/public/javascripts/wechat/controllers/blog.js
index dc9f4bf39..40902fa12 100644
--- a/public/javascripts/wechat/controllers/blog.js
+++ b/public/javascripts/wechat/controllers/blog.js
@@ -9,12 +9,15 @@ app.controller('BlogController',
             replyType: 'BlogComment',
             loadCallback: function(data){
                 console.log(data.data);
+
+                //回复级别 0 一级回复 1 二级回复
                 replytype = data.type;
                 page = data.page;
 
                 if (replytype == 0){
                     if (page == 0){
                         $scope.blog = data.data;
+                        $scope.page = 0;
                     }
                     else{
                         $scope.blog.blog_comment_children = $scope.blog.blog_comment_children.concat(data.data.blog_comment_children);
@@ -23,13 +26,14 @@ app.controller('BlogController',
                     console.log($scope.has_more);
                 }
                 else{
-
-
-
-
-
-
-
+                    comment_id = data.data.id;
+                    for (var i in $scope.blog.blog_comment_children) {
+                        var comment = $scope.blog.blog_comment_children[i];
+                        if(comment.id == comment_id){
+//                            comment.parents_reply_top = comment.parents_reply_top.concat(data.data.parents_reply_top);
+                            comment.parents_reply_top = data.data.parents_reply_top.concat(comment.parents_reply_top);
+                        }
+                    }
                 }
             },
             replyCallback: function(){
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index dcd78740f..a329c2906 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -254,8 +254,15 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
             decreaseCommonPraise(act);
         };
 
-        args.scope.morereply = function(data,replytype,page){
-            loadCommonData(data.id, args.type,replytype,page).then(function successCallback(response) {
+        args.scope.showMoreReply = function(replytype,data){
+            if(!data.page){
+                data.page = 1;
+            }
+            else{
+                data.page = data.page + 1;
+            }
+
+            loadCommonData(data.id, args.type,replytype,data.page).then(function successCallback(response) {
                 args.loadCallback(response.data);
             }, function errorCallback(response) {
             });
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index ed3af75ae..cdac0d1a3 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -225,7 +225,7 @@ a.underline {text-decoration:underline;}
 .forget-psw {position:fixed; bottom:10px;}
 
 /*二级回复*/
-.mult-reply-container{ border:solid 1px #f3ddb3; background:#fffef4; padding:4px;color:#999; margin-top:-1px;}
+.mult-reply-container{ border:solid 1px #f3ddb3; background:#fffef4; padding:4px;color:#999;}
 .mult-reply-content{ color:#707070; font-size:13px;}
 .mult-reply-hide{ text-align:center; display:block; font-size:14px; color:#aaa; border-bottom:1px solid #F3DDB3; padding:8px 0;}
 .mult-reply-arrow{ color:#aaa; margin-right:10px; font-size:14px; font-weight:bold;}
\ No newline at end of file

From 86731c34d5f00f6b810620f252d3d834d2e44e7b Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 21 Jul 2016 15:21:09 +0800
Subject: [PATCH 20/26] =?UTF-8?q?=E5=8D=95=E4=B8=AA=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8A=A0=E5=85=A5=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E6=97=B6=E5=A6=82=E6=9E=9C=E7=8F=AD=E7=BA=A7=E5=B7=B2=E8=A2=AB?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=9C=80=E8=A6=81=E6=8F=90=E7=A4=BA!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/homework.rb                   | 11 ++++++-----
 app/controllers/wechats_controller.rb                 |  2 +-
 app/services/courses_service.rb                       |  5 ++++-
 app/services/wechat_service.rb                        |  2 +-
 public/javascripts/wechat/controllers/class_list.js   |  5 ++---
 .../javascripts/wechat/controllers/send_class_list.js | 10 +++++++++-
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/api/mobile/entities/homework.rb b/app/api/mobile/entities/homework.rb
index cea15ece9..a5b981c6d 100644
--- a/app/api/mobile/entities/homework.rb
+++ b/app/api/mobile/entities/homework.rb
@@ -99,12 +99,13 @@ module Mobile
       homework_expose :coursename #所属班级名
 
       expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options|
-        current_user = options[:user]
-        current_user_is_teacher = false
-        current_user_is_teacher = is_course_teacher(current_user,instance.course)
-        current_user_is_teacher
+        if instance[:current_user_is_teacher].nil?
+          current_user = options[:user]
+          current_user_is_teacher = false
+          current_user_is_teacher = is_course_teacher(current_user,instance.course)
+          current_user_is_teacher
+        end
       end
-
     end
   end
 end
\ No newline at end of file
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index e596042d9..6b1e3010d 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -277,7 +277,7 @@ class WechatsController < ActionController::Base
             user: user
         )
         ws = WechatService.new
-        ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, format_time(Time.now))
+        ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台！", user.login, format_time(Time.now))
         render :json => {status:0, msg: "绑定成功"}
       rescue Exception=>e
         render :json => {status: -1, msg: e.message}
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 091e2749e..ab4b65f5c 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -335,6 +335,7 @@ class CoursesService
         8, '您已经是该班级的教师了',
         9, '您已经是该班级的教辅了',
         10, '您已经是该班级的管理员了',
+        11, '该班级不存在或已被删除啦',
         '未知错误，请稍后再试'
     ]
   end
@@ -348,6 +349,8 @@ class CoursesService
     if course
       if course_endTime_timeout? course
         @state = 2
+      elsif course[:is_delete] == 1
+        @state = 11
       else
         if current_user.member_of_course?(course) #如果已经是成员
           member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
@@ -632,7 +635,7 @@ class CoursesService
      :homework_submit_num => bid.student_works.count,
      :homework_status_student => get_homework_status( bid),:homework_status_teacher =>  homework_status_desc( bid),
      :student_evaluation_part => get_evaluation_part( bid ,3),
-     :ta_evaluation_part => get_evaluation_part( bid ,2),:homework_anony_type => bid.homework_type == 1 && !bid.homework_detail_manual.nil?}
+     :ta_evaluation_part => get_evaluation_part( bid ,2),:homework_anony_type => bid.homework_type == 1 && !bid.homework_detail_manual.nil?,:current_user_is_teacher => is_course_teacher}
 
   end
 
diff --git a/app/services/wechat_service.rb b/app/services/wechat_service.rb
index 2da942ea6..7ac4e99d3 100644
--- a/app/services/wechat_service.rb
+++ b/app/services/wechat_service.rb
@@ -229,7 +229,7 @@ class WechatService
                   color:"#707070"
               },
               remark:{
-                  value:"绑定成功后可使用微信查看Trustie平台最新动态",
+                  value:"绑定成功后可使用微信查看Trustie平台最新动态。",
                   color:"#707070"
               }
           }
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
index 9e0087135..488d1913c 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -59,7 +59,7 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
                     }).then(function (response) {
                         console.log(response.data);
                         if (response.data.status != 0) {
-                            vm.alertService_1.showMessage('错误', response.data.message);
+                            vm.alertService_1.showMessage('提示', response.data.message);
                         } else {
                             vm.alertService_1.showMessage('提示', '加入课程成功');
                             vm.alertService_3.invite = "";
@@ -68,9 +68,8 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
                     });
                 } else {
                     if(vm.alertService_3.invite){
-                        vm.alertService_1.showMessage('错误', '邀请码格式不正确');
+                        vm.alertService_1.showMessage('提示', '邀请码格式不正确');
                     }
-
                 }
             });
         };
diff --git a/public/javascripts/wechat/controllers/send_class_list.js b/public/javascripts/wechat/controllers/send_class_list.js
index 1eabfa94c..eee462ee3 100644
--- a/public/javascripts/wechat/controllers/send_class_list.js
+++ b/public/javascripts/wechat/controllers/send_class_list.js
@@ -46,7 +46,15 @@ app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'co
         }).then(function(response){
             console.log(response.data);
             if(response.data.status == 0){
-                vm.alertService.showMessage('发送成功', '题目已发送到目标班级的作业列表，但需要您访问Trustie网站设置发布和截止时间，以激活相应作业，谢谢！', function () {
+                var tip = "";
+                if (vm.myresource_sendIndex == 1){
+                    tip = "课件已发送到目标班级。";
+                }
+                else if(vm.myresource_sendIndex == 2){
+                    tip = "题目已发送到目标班级的作业列表，但需要您访问Trustie网站设置发布和截止时间，以激活相应作业，谢谢。";
+                }
+
+                vm.alertService.showMessage('发送成功', tip, function () {
                     window.history.back();
                 });
             } else {

From 0a0f8aefac6bf138e4411ba19a88e928d7b1ca2e Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 21 Jul 2016 15:56:27 +0800
Subject: [PATCH 21/26] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=BC=B9=E6=A1=86css=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=9Bapp=E9=A1=B5=E9=9D=A2meta=E6=A0=87=E7=AD=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/app.html      | 4 ++--
 public/stylesheets/weui/weixin.css | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index a3977ec5c..726755c3d 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -6,9 +6,9 @@
     <meta charset='utf-8' />
     <meta name="keywords" content="" />
     <meta name="description" content="" />
-    <meta name="apple-mobile-web-app-capable" content="no">
+    <meta name="apple-mobile-web-app-capable" content="yes">
     <meta content='True' name='HandheldFriendly' />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
 
     <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
     <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 364c8a001..2172911ce 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -155,7 +155,7 @@ a.underline {text-decoration:underline;}
 .locked_btn_cir {background: url("/images/wechat/locked.png") 0 0 no-repeat; cursor: default;}
 
 /*20150612加入班级样式*/
-.add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%);}
+.add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%); -ms-transform: translate(-50%,-50%); -moz-transform: translate(-50%,-50%); -webkit-transform: translate(-50%,-50%); -o-transform: translate(-50%,-50%);}
 .add-class-tip {padding-top:1.2em; padding-bottom:.5em; font-weight:400;}
 .class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;}
 .cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}

From 00c3e880e635f87a83f819c6aff660049c0f0ee8 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 21 Jul 2016 16:21:00 +0800
Subject: [PATCH 22/26] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=BF=94=E5=9B=9E=E5=AE=9A=E4=BD=8Djs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/controllers/activity.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index 1ad4b9c1e..8847e8e10 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -136,7 +136,7 @@ app.controller('ActivityController',
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){
-        rms.save("yoffset", window.document.body.scrollTop);
+        rms.save("yoffset", document.documentElement.scrollTop);
         rms.save("activities",$scope.activities);
         rms.save("course_activities",$scope.course_activities);
         rms.save("project_activities",$scope.project_activities);

From 5a8f1b3d835d136cc9eb100cbeb73aed900194fc Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 21 Jul 2016 16:50:15 +0800
Subject: [PATCH 23/26] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=90=8E=E8=BF=94=E5=9B=9E=E5=85=AC=E4=BC=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/controllers/login.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
index 1dbf804ed..f31dd629f 100644
--- a/public/javascripts/wechat/controllers/login.js
+++ b/public/javascripts/wechat/controllers/login.js
@@ -33,7 +33,8 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
                     vm.loginFailed = (response.data.status != 0);
                     if (!$scope.loginFailed) { //绑定成功
                         vm.alertService.showMessage('提示', response.data.message, function(){
-                            $location.path("/activities");
+//                            $location.path("/activities");
+                            window.WeixinJSBridge.call('closeWindow');
                         });
                     } else {
                         vm.alertService.showMessage('出错了', response.data.message);

From 0622978920191d956ddffacf01728af0c2b7940d Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 21 Jul 2016 16:59:47 +0800
Subject: [PATCH 24/26] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=B3=A8=E5=86=8C=E5=90=8E=E8=BF=94=E5=9B=9E=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/controllers/reg.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/controllers/reg.js b/public/javascripts/wechat/controllers/reg.js
index 44c2e098b..9600e9dbf 100644
--- a/public/javascripts/wechat/controllers/reg.js
+++ b/public/javascripts/wechat/controllers/reg.js
@@ -34,7 +34,8 @@ app.controller('RegController', ['$scope', '$http', '$location', 'alertService',
                     vm.errDialog.showMessage('出错了',response.data.message);
                 } else {
                     vm.successDialog.showMessage("提示","注册且绑定微信成功", function(){
-                        $location.path("/activities");
+//                        $location.path("/activities");
+                        window.WeixinJSBridge.call('closeWindow');
                     });
                 }
             }, function (response) {

From 8fd915bf1a7e73ea9bd06373cc8fa741ad1fb020 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 21 Jul 2016 17:18:09 +0800
Subject: [PATCH 25/26] =?UTF-8?q?issue=E6=A0=87=E9=A2=98=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index cb1696dbf..154355ebd 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -160,7 +160,7 @@
                   </div>
                   <div class="post-dynamic-time fr f13">{{act.latest_update}}</div>
                   <div class="cl"></div>
-                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【帖子】{{act.subject|safeHtml}}</div>
+                  <div class="post-dynamic-title c-grey3 hidden mt12 fb">【问题】{{act.subject|safeHtml}}</div>
                   <div class="post-content c-grey3 mt10 mb10">
                     <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                     <span class="mr15 f12 c-grey2">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15 f12 c-grey2">优先级：{{act.issue_detail.issue_priority}}</span> <br />

From 19781ded4e6e3909af03a83ef7f56ec083211abd Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 21 Jul 2016 17:22:03 +0800
Subject: [PATCH 26/26] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86padding?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/weui/weixin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index b59b00b58..c3a38415a 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -211,7 +211,7 @@ a.underline {text-decoration:underline;}
 .students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;}
 .new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
 .join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
-.new-class-input {width:60%; color:#555; height:16px; line-height:16px; vertical-align:middle; border:none; outline:none; padding:10px 0;}
+.new-class-input {width:60%; color:#555; height:16px; line-height:16px; vertical-align:middle; border:none; outline:none; padding:8px 0;}
 .class-list-setting {position:absolute; top:10px; right:10px;}
 
 /*20160616登录注册*/