- {{journal.parents_reply_top[i].user.realname}}
+ {{journal.parents_reply_top[i].user.real_name}}
- {{journal.parents_reply_top[i].user.realname}}
+ {{journal.parents_reply_top[i].user.real_name}}
{{journal.parents_reply_top[i].lasted_comment}}
diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index e646da5b9..25ced0a17 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -10,7 +10,7 @@ app.controller('ActivityController',
return url;
};
- $scope.menus = ['所有动态', '课程动态', '项目动态'];
+ $scope.menus = ['所有动态', '班级动态', '项目动态'];
$scope.alertService = alertService.create();
console.log("ActivityController load");
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index cd6d57d34..a6fb0feed 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -1,27 +1,37 @@
-app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService','rms','common', function($scope, config, $http, auth, $location, $routeParams,alertService,rms,common){
+app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService','rms','common','$timeout', function($scope, config, $http, auth, $location, $routeParams,alertService,rms,common,$timeout){
// common.checkLogin();
+ $scope.replaceUrl = function(url){
+ return url;
+ };
+
var vm = $scope;
var courseid = $routeParams.id;
var tag = $routeParams.tag;
- var getClassActivities = function(page){
+ vm.course_activities_page = rms.get('course_activities_page') || 0;
+ vm.course_activities = rms.get("course_activities") || [];
+ vm.course_has_more = rms.get("course_has_more");
+
+ vm.course = rms.get("course") || null;
+
+ vm.getClassActivities = function(page){
$http({
method: 'POST',
- url: apiUrl + "projects/activities?id=" + projectid,
+ url: apiUrl + "courses/activities?id=" + courseid,
data:{token:auth.token(),page:page}
}).then(function successCallback(response) {
console.log(response.data);
if(response.data.status == 0){
- vm.project_activities_page = response.data.page;
+ vm.class_activities_page = response.data.page;
if(response.data.page > 0)
{
- vm.project_activities = vm.project_activities.concat(response.data.data);
+ vm.course_activities = vm.course_activities.concat(response.data.data);
}
else{
- vm.project_activities = response.data.data;
- vm.project_activities_page = 0;
- vm.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+ vm.course_activities = response.data.data;
+ vm.course_activities_page = 0;
+ vm.course_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
}
}
else{
@@ -97,11 +107,15 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
vm.isTeacher = false;
- vm.currentTab = 1;
+// vm.currentTab = 1;
+
+ vm.currentTab = rms.get('tab_num');
+
vm.tab = function(index){
vm.currentTab = index;
vm.searchText = '';
+ vm.showActivities = false;
vm.showClassMate = false;
vm.showResources = false;
vm.showHomework = false;
@@ -112,7 +126,10 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
if(vm.isTeacher){
if(index == 1){
- getClassActivities();
+ if(vm.course_activities.length <= 0){
+ vm.getClassActivities(0);
+ }
+ vm.showActivities = true;
}
else if(index == 2){ //课件
getResources();
@@ -129,7 +146,10 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
} else {
if(index == 1){
- getClassActivities();
+ if(vm.course_activities.length <= 0){
+ vm.getClassActivities(0);
+ }
+ vm.showActivities = true;
}
else if(index == 3){
getUsers();
@@ -140,12 +160,12 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
vm.showResources = true;
}
}
- rms.save("tab_num",index);
+ rms.save("tab_num",vm.currentTab);
};
- vm.tabRecord = rms.get('tab_num') || 1;
+// vm.tabRecord = rms.get('tab_num') || 1;
- vm.course = {};
+// vm.course = {};
vm.students = [];
vm.teachers = [];
vm.reviewers = []; //待审批
@@ -159,59 +179,150 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
vm.alertService = alertService.create();
vm.invite = function(){
+ rms.save('course_activities_page',vm.course_activities_page);
+ rms.save("course_activities",vm.course_activities);
+ rms.save("course_has_more",vm.course_has_more);
+ rms.save("course",vm.course);
+
$location.path("/invite_code").search({id: courseid});
};
vm.sendFile = function(r,index){
vm.myresource_sendIndex = index;
+ rms.save('course_activities_page',vm.course_activities_page);
+ rms.save("course_activities",vm.course_activities);
+ rms.save("course_has_more",vm.course_has_more);
+ rms.save("course",vm.course);
rms.save('myresource_sendIndex',index);
- $location.path("/send_class_list").search({id: r.id});
+ $location.path("/send_class_list").search({id: r.id,course_id: courseid});
};
- $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
- function(response) {
- console.log(response.data);
+ if(!vm.currentTab){
+ $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
+ function(response) {
+ console.log(response.data);
- if (response.data.status == 0){
- vm.course = response.data.data;
- resetMenu(vm.course.current_user_is_teacher,vm.tabRecord);
- if(tag){
- vm.tab(4);
- tag = null;
+ if (response.data.status == 0){
+ vm.course = response.data.data;
+ resetMenu(vm.course.current_user_is_teacher,vm.currentTab);
+ if(tag){
+ vm.tab(4);
+ tag = null;
+ vm.currentTab = 4;
+ }
+ else{
+ vm.currentTab = 1;
+ vm.tab(vm.currentTab);
+ }
}
else{
- vm.tab(vm.tabRecord);
+ vm.alertService.showMessage('提示', response.data.message);
}
+
}
- else{
- vm.alertService.showMessage('提示', response.data.message);
- }
+ );
+ }else {
+ $timeout(function(){
+ window.scrollTo(0, rms.get("yoffset"));
+ });
+ }
- }
- );
-
-
- var resetMenu = function(is_teacher){
+ var resetMenu = function(is_teacher,index){
vm.isTeacher = is_teacher;
if(is_teacher){
vm.menus = ["动态", "课件", "作业", "成员管理"];
} else {
vm.menus = ['动态','课件', "我的同学"];
}
-
+ vm.tab(index);
};
+ if(vm.course){
+ resetMenu(vm.course.current_user_is_teacher,vm.currentTab);
+ }
+
+
vm.onSetting = function(user){
rms.save('current_edit_member', user);
+ rms.save("tab_num",vm.currentTab);
$location.path("/edit_class_member").search({id: courseid,user_id: user.id});
};
vm.review = function(user){
rms.save('current_review_member', user);
rms.save('current_course', vm.course);
-
+ rms.save("tab_num",vm.currentTab);
$location.path("/review_class_member").search({id: courseid,user_id: user.id});
};
+ //跳到详情页
+ vm.goDetail = function(type, act_id,id){
+ rms.save("yoffset", document.documentElement.scrollTop || document.body.scrollTop);
+ rms.save('course_activities_page',vm.course_activities_page);
+ rms.save("course_activities",vm.course_activities);
+ rms.save('course_has_more', vm.course_has_more);
+ rms.save("tab_num",vm.currentTab);
+ rms.save("course",vm.course);
+// $location.path('/'+type+'/'+act_id);
+ $location.path("/"+type).search({id: act_id});
+ };
+
+ vm.addPraise = function(act){
+ for(var i in vm.course_activities){
+ if(vm.course_activities[i].act_id == act.act_id){
+ vm.course_activities[i].praise_count += 1;
+ vm.course_activities[i].has_praise = true;
+ break;
+ }
+ }
+
+ common.addCommonPraise(act);
+ };
+
+ vm.decreasePraise = function(act){
+ for(var i in vm.course_activities){
+ if(vm.course_activities[i].act_id == act.act_id){
+ vm.course_activities[i].praise_count -= 1;
+ vm.course_activities[i].has_praise = false;
+ break;
+ }
+ }
+
+ common.decreaseCommonPraise(act);
+ };
+
+ vm.goPublishNotice = function(){
+ if(!vm.isTeacher){
+ return;
+ }
+ rms.save('course_activities_page',vm.course_activities_page);
+ rms.save("course_activities",vm.course_activities);
+ rms.save('course_has_more', vm.course_has_more);
+ rms.save("tab_num",vm.currentTab);
+ rms.save("course",vm.course);
+ rms.save('current_course', vm.course);
+ $location.path("/class_publishnotice").search({id:courseid});
+ };
+
+ vm.goPublishIssue = function(){
+ rms.save('course_activities_page',vm.course_activities_page);
+ rms.save("course_activities",vm.course_activities);
+ rms.save('course_has_more', vm.course_has_more);
+ rms.save("tab_num",vm.currentTab);
+ rms.save("course",vm.course);
+ rms.save('current_course', vm.course);
+ $location.path("/class_publishissue").search({id:courseid});
+ };
+
+ vm.goHomeworkDetail = function(id){
+ rms.save("yoffset", document.documentElement.scrollTop || document.body.scrollTop);
+ rms.save('course_activities_page',vm.course_activities_page);
+ rms.save("course_activities",vm.course_activities);
+ rms.save('course_has_more', vm.course_has_more);
+ rms.save("tab_num",vm.currentTab);
+ rms.save("course",vm.course);
+// $location.path('/'+type+'/'+act_id);
+ $location.path("/homework").search({id: id});
+ }
}]);
\ 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 cc5250970..5d3ca5b93 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -49,6 +49,11 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
}
vm.goClass = function (course_id) {
+ rms.save('course_activities_page',0);
+ rms.save("course_activities",[]);
+ rms.save("course_has_more",false);
+ rms.save("course",null);
+ rms.save("tab_num",null);
console.log(course_id);
$location.path("/class").search({id: course_id});
}
diff --git a/public/javascripts/wechat/controllers/class_publishissue.js b/public/javascripts/wechat/controllers/class_publishissue.js
new file mode 100644
index 000000000..1cd7f1285
--- /dev/null
+++ b/public/javascripts/wechat/controllers/class_publishissue.js
@@ -0,0 +1,73 @@
+app.controller('ClassPublishIssueController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
+// common.checkLogin();
+
+ var vm = $scope;
+ vm.current_course = rms.get('current_course');
+
+ vm.issuetitle = "";
+ vm.issue = "";
+ var course_id = $routeParams.id;
+
+ vm.alertService = alertService.create();
+
+ if(!vm.current_course){
+ $http.get(config.apiUrl+ 'courses/'+course_id+"?token="+auth.token()).then(
+ function(response) {
+ console.log(response.data);
+ if (response.data.status == 0){
+ vm.current_course = response.data.data;
+ console.log("courses");
+ console.log(response.data.data);
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+ }
+ if(!vm.current_course){
+ vm.tip_1 = "该班级不存在或已被删除";
+ }
+
+ }
+ );
+ }
+
+ vm.cancel = function(){
+ window.history.back();
+ };
+
+ //发布问题 即项目讨论区
+ vm.publishIssue = function(){
+ if(vm.issuetitle.length == 0)
+ {
+ vm.alertService.showMessage('提示', '标题不能为空');
+ return;
+ }
+
+ if(vm.issue.length == 0)
+ {
+ vm.alertService.showMessage('提示', '内容不能为空');
+ return;
+ }
+
+ var text = vm.issue.replace(/\n/g,'
');
+
+ $http.post(config.apiUrl + "courses/"+course_id+"/publishissue",
+ {token: auth.token(),title: vm.issuetitle, text: text}
+ ).then(function(response){
+ if(response.data.status == 0)
+ {
+ vm.alertService.showMessage('提示', '您已成功发布问题',function(){
+ rms.save('course_activities_page',0);
+ rms.save("course_activities",[]);
+ rms.save("course_has_more",false);
+ $location.path("/class").search({id: course_id});
+ });
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+
+ }
+ });
+
+ };
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/class_publishnotice.js b/public/javascripts/wechat/controllers/class_publishnotice.js
new file mode 100644
index 000000000..a0b9ab676
--- /dev/null
+++ b/public/javascripts/wechat/controllers/class_publishnotice.js
@@ -0,0 +1,72 @@
+app.controller('ClassPublishNoticeController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
+// common.checkLogin();
+
+ var vm = $scope;
+ vm.current_course = rms.get('current_course');
+
+ var course_id = $routeParams.id;
+
+ vm.alertService = alertService.create();
+
+ vm.noticetitle = "";
+ vm.notice = "";
+
+ if(!vm.current_course){
+ $http.get(config.apiUrl+ 'courses/'+course_id+"?token="+auth.token()).then(
+ function(response) {
+ console.log(response.data);
+ if (response.data.status == 0){
+ vm.current_course = response.data.data;
+ console.log("courses");
+ console.log(response.data.data);
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+ }
+ if(!vm.current_course){
+ vm.tip_1 = "该班级不存在或已被删除";
+ }
+
+ }
+ );
+ }
+ vm.cancel = function(){
+ window.history.back();
+ };
+
+ //发布通知 只有老师能发布
+ vm.publishNotice = function(){
+ if(vm.noticetitle.length == 0)
+ {
+ vm.alertService.showMessage('提示', '标题不能为空');
+ return;
+ }
+
+ if(vm.notice.length == 0)
+ {
+ vm.alertService.showMessage('提示', '内容不能为空');
+ return;
+ }
+
+ var text = vm.notice.replace(/\n/g,'
');
+
+ $http.post(config.apiUrl + "courses/"+course_id+"/publishnotice",
+ {token: auth.token(),title: vm.noticetitle, text: text}
+ ).then(function(response){
+ if(response.data.status == 0)
+ {
+ vm.alertService.showMessage('提示', '您已成功发布通知',function(){
+ rms.save('course_activities_page',0);
+ rms.save("course_activities",[]);
+ rms.save("course_has_more",false);
+ $location.path("/class").search({id: course_id});
+ });
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+ }
+ });
+
+ };
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/course_notice.js b/public/javascripts/wechat/controllers/course_notice.js
index 9f9ba83d6..48ec19889 100644
--- a/public/javascripts/wechat/controllers/course_notice.js
+++ b/public/javascripts/wechat/controllers/course_notice.js
@@ -8,8 +8,37 @@ app.controller('CourseNoticeController', ['$scope', '$http', '$routeParams', 'au
replyType: 'News',
urlName: 'course_notice',
loadCallback: function(data){
- $scope.news = data.data;
- $scope.is_public = data.is_public;
+ console.log(data.data);
+
+ //回复级别 0 一级回复 1 二级回复
+ replytype = data.type;
+ page = data.page;
+
+ if (replytype == 0){
+ if (page == 0){
+ $scope.news = data.data;
+ $scope.page = 0;
+ $scope.is_public = data.is_public;
+ }
+ else{
+ $scope.news.all_children = $scope.news.all_children.concat(data.data.all_children);
+ }
+ $scope.has_more = $scope.news.all_children.length < $scope.news.comment_count;
+ console.log($scope.has_more);
+ }
+ else{
+ comment_id = data.data.id;
+ for (var i in $scope.news.all_children) {
+ var comment = $scope.news.all_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/controllers/issue.js b/public/javascripts/wechat/controllers/issue.js
index 131fab6f6..91db1d535 100644
--- a/public/javascripts/wechat/controllers/issue.js
+++ b/public/javascripts/wechat/controllers/issue.js
@@ -7,9 +7,34 @@ app.controller('IssueController', ['$scope', '$http', '$routeParams', 'auth', 'c
replyType: 'Issue',
urlName: 'issues',
loadCallback: function(data){
- console.log(data);
- $scope.issue = data.data;
- $scope.is_public = data.is_public;
+ console.log(data.data);
+
+ //回复级别 0 一级回复 1 二级回复
+ replytype = data.type;
+ page = data.page;
+
+ if (replytype == 0){
+ if (page == 0){
+ $scope.issue = data.data;
+ $scope.page = 0;
+ $scope.is_public = data.is_public;
+ }
+ else{
+ $scope.issue.all_children = $scope.issue.all_children.concat(data.data.all_children);
+ }
+ $scope.has_more = $scope.issue.all_children.length < $scope.issue.comment_count;
+ console.log($scope.has_more);
+ }
+ else{
+ comment_id = data.data.id;
+ for (var i in $scope.issue.all_children) {
+ var comment = $scope.issue.all_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/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
index 089b63dfc..d920b376a 100644
--- a/public/javascripts/wechat/controllers/myresource.js
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -35,10 +35,14 @@ app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$l
vm.sendFile = function(r,index){
vm.myresource_sendIndex = index;
+
+ rms.save("has_more",vm.has_more);
+ rms.save("homework_has_more",vm.homework_has_more);
rms.save('myresource_sendIndex',index);
- $location.path("/send_class_list").search({id: r.id});
- }
+// $location.path("/send_class_list").search({id: r.id});
+ $location.path("/send_class_list").search({id: r.id,course_id: r.course_id});
+ };
vm.loadResourceData = function (index,page){
if(index == 1){
@@ -147,4 +151,11 @@ app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$l
vm.tab(currentTab);
+ vm.goHomeworkDetail = function(id){
+ rms.save("has_more",vm.has_more);
+ rms.save("homework_has_more",vm.homework_has_more);
+ rms.save("yoffset", document.documentElement.scrollTop || document.body.scrollTop);
+ $location.path("/homework").search({id: id});
+ }
+
}] );
diff --git a/public/javascripts/wechat/controllers/project.js b/public/javascripts/wechat/controllers/project.js
index 08987e491..c45696668 100644
--- a/public/javascripts/wechat/controllers/project.js
+++ b/public/javascripts/wechat/controllers/project.js
@@ -114,6 +114,7 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
//跳到详情页
vm.goDetail = function(type, act_id,id){
rms.save("yoffset", document.documentElement.scrollTop || document.body.scrollTop);
+ rms.save('project_activities_page',vm.project_activities_page);
rms.save("project_activities",vm.project_activities);
rms.save('project_has_more', vm.project_has_more);
rms.save("project",vm.project);
@@ -237,4 +238,19 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
$location.path("/review_project_member").search({id: projectid,user_id: user.id});
}
+ vm.goPublishNote = function(){
+ rms.save('project_activities_page',vm.project_activities_page);
+ rms.save("project_activities",vm.project_activities);
+ rms.save("project_has_more",vm.project_has_more);
+
+ rms.save("project",vm.project);
+ rms.save("project_master_members",vm.project_master_members);
+ rms.save("project_develop_members",vm.project_develop_members);
+ rms.save("project_report_members",vm.project_report_members);
+ rms.save("review_master_members",vm.review_master_members);
+ rms.save("review_develop_members",vm.review_develop_members);
+ rms.save('current_project', vm.project);
+ $location.path("/project_publishnote").search({id:projectid});
+ };
+
}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/project_publishnote.js b/public/javascripts/wechat/controllers/project_publishnote.js
new file mode 100644
index 000000000..231faaea6
--- /dev/null
+++ b/public/javascripts/wechat/controllers/project_publishnote.js
@@ -0,0 +1,74 @@
+app.controller('ProjectPublishNoteController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
+// common.checkLogin();
+
+ var vm = $scope;
+ vm.current_project = rms.get('current_project');
+
+ var project_id = $routeParams.id;
+
+ vm.alertService = alertService.create();
+
+ vm.notetitle = "";
+ vm.note = "";
+
+ if(!vm.current_project){
+ $http.get(config.apiUrl+ 'projects/'+project_id+"?token="+auth.token()).then(
+ function(response) {
+ console.log(response.data);
+ if (response.data.status == 0){
+ vm.current_project = response.data.data;
+ console.log("projects");
+ console.log(response.data.data);
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+ }
+
+ if(!vm.current_project){
+ vm.tip_1 = "该项目不存在或已被删除";
+ }
+
+ }
+ );
+ }
+ vm.cancel = function(){
+ window.history.back();
+ };
+
+ //发布通知 只有老师能发布
+ vm.publishNote = function(){
+ if(vm.notetitle.length == 0)
+ {
+ vm.alertService.showMessage('提示', '标题不能为空');
+ return;
+ }
+
+ if(vm.note.length == 0)
+ {
+ vm.alertService.showMessage('提示', '内容不能为空');
+ return;
+ }
+
+ var text = vm.note.replace(/\n/g,'
');
+
+ $http.post(config.apiUrl + "projects/"+project_id+"/publishnote",
+ {token: auth.token(),title: vm.notetitle, text: text}
+ ).then(function(response){
+ if(response.data.status == 0)
+ {
+ vm.alertService.showMessage('提示', '您已成功发布帖子',function(){
+ rms.save('project_activities_page',0);
+ rms.save("project_activities",[]);
+ rms.save("project_has_more",false);
+ rms.save('tab_num',null);
+ $location.path("/project").search({id: project_id});
+ });
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+ }
+ });
+
+ };
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/send_class_list.js b/public/javascripts/wechat/controllers/send_class_list.js
index ead0860f5..815d0d4b3 100644
--- a/public/javascripts/wechat/controllers/send_class_list.js
+++ b/public/javascripts/wechat/controllers/send_class_list.js
@@ -3,6 +3,7 @@ app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'co
var vm = $scope;
var send_id = $routeParams.id;
+ vm.course_id = $routeParams.course_id;
//发送类别 1课件 2作业 3测验
vm.myresource_sendIndex = rms.get('myresource_sendIndex') || 1;
diff --git a/public/javascripts/wechat/directives/iphone_recognize.js b/public/javascripts/wechat/directives/iphone_recognize.js
new file mode 100644
index 000000000..66014e71a
--- /dev/null
+++ b/public/javascripts/wechat/directives/iphone_recognize.js
@@ -0,0 +1,28 @@
+/**
+ * Created by ttang on 2016/8/22.
+ */
+app.directive('iphoneRecognize',["$timeout",function(timer){
+ return{
+ restrict: 'A',
+ scope: {},
+ link: function(scope, element){
+ timer(function(){
+ var userAgent = navigator.userAgent;
+ var contentHeight = $(".post-container").height();
+ if (/ipad|iphone|mac/i.test(navigator.userAgent)){
+ $("#postInput1").bind('focus',function(){
+ element.css({"position":"relative","padding":"1px 0"});
+ $(".post-wrapper").css("margin-bottom","0");
+ $("#all_homework_reply").css("margin-bottom","0");
+ window.scrollTo(0,contentHeight);
+ });
+ $("#postInput1").bind('blur',function(){
+ element.css("position","fixed");
+ $(".post-wrapper").css("margin-bottom","10px");
+ $("#all_homework_reply").css("margin-bottom","50px");
+ });
+ }
+ })
+ }
+ }
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 7311c66c1..2182e16ee 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -40,6 +40,8 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
.when('/send_class_list', makeRoute('send_class_list.html', 'SendClassListController'))
.when('/join_class', makeRoute('join_class.html', 'JoinClassController'))
.when('/review_class_member', makeRoute('review_class_member.html', 'ReviewClassMemberController'))
+ .when('/class_publishnotice', makeRoute('class_publishnotice.html', 'ClassPublishNoticeController'))
+ .when('/class_publishissue', makeRoute('class_publishissue.html', 'ClassPublishIssueController'))
.when('/project_list', makeRoute('project_list.html', 'ProjectListController'))
.when('/project', makeRoute('project.html', 'ProjectController'))
.when('/edit_project_member', makeRoute('edit_project_member.html', 'EditProjectMemberController'))
@@ -47,6 +49,7 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
.when('/project_invite_code', {templateUrl: rootPath + 'project_invite_code.html', controller: 'ProjectInviteCodeController'})
.when('/join_project', makeRoute('join_project.html', 'JoinProjectController'))
.when('/review_project_member', makeRoute('review_project_member.html', 'ReviewProjectMemberController'))
+ .when('/project_publishnote', makeRoute('project_publishnote.html', 'ProjectPublishNoteController'))
.when('/login_tip', makeRoute('login_tip.html', 'LoginTipController'))
.otherwise({
redirectTo: '/activites'
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 7375fc80c..3d960b4ad 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -92,14 +92,14 @@ a.underline {text-decoration:underline;}
/*tab*/
.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 {position:relative; display:block; -webkit-box-flex:1; -moz-box-flex:1; -ms-flex:1; -webkit-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;}
.weixin-tab {text-align:center; border-bottom:1px solid #ccc;}
/*bottom-tab*/
.bottom-tab-wrap {position:fixed; width:100%; bottom:0; line-height:38px; display:-webkit-box; display:-moz-box; display:-ms-flexbox; display:-webkit-flex; display:flex; font-size:13px; background-color:#fff;}
-.bottom-tab-wrap a {display:block; -webkit-box-flex:1; -moz-box-flex:1; -ms-flex:1; flex:1; position:relative;}
+.bottom-tab-wrap a {display:block; -webkit-box-flex:1; -moz-box-flex:1; -ms-flex:1; -webkit-flex:1; flex:1; position:relative;}
.bottom-tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}
/*动态样式*/
@@ -220,7 +220,7 @@ a.underline {text-decoration:underline;}
.amount-arrow {height:14px; line-height:14px; vertical-align:middle; margin-top:12px;}
.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; border:none; outline:none; padding:11px 0;}
+.new-class-input {width:60%; color:#555; height:16px; line-height:16px; border:none; outline:none; padding:10px 0;}
.class-list-setting {position:absolute; top:11px; right:10px;}
.class-setting-wrap {width:38px; height:38px; position:absolute; top:0; right:0;}
@@ -257,4 +257,4 @@ a.underline {text-decoration:underline;}
/*发布帖子，通知*/
.full-width-wrap {padding:5px 15px; background-color:#fff; border-top:1px solid #ddd; border-bottom:1px solid #ddd;}
-.full-width-textarea {width:100%; height:180px; line-height:18px; max-height:180px; border:none; resize:none; font-size:13px; color:#555;}
\ No newline at end of file
+.full-width-textarea {width:100%; height:180px; line-height:18px; max-height:180px; border:none; resize:none; font-size:13px; color:#555; overflow-y:auto;}
\ No newline at end of file
+ 
+ 
