diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 857498f0a..893d693c8 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -13,7 +13,8 @@
回复 ({{message.reply_count}})
-
赞 ({{message.message_praise_count}})
+
已赞 ({{message.message_praise_count}})
+
赞 ({{message.message_praise_count}})
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index d868e0d03..62d6dc728 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -16,7 +16,8 @@
回复 ({{discussion.replies_count}})
-
赞 ({{discussion.message_praise_count}})
+
已赞 ({{discussion.message_praise_count}})
+
赞 ({{discussion.message_praise_count}})
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index dc926574d..a31bf8c22 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -135,7 +135,7 @@ app.factory('common', function($http, auth){
var loadCommonData = function(id, type){
return $http({
method: 'GET',
- url: apiUrl+ type + "/"+id
+ url: apiUrl+ type + "/" + id
})
};
@@ -155,238 +155,126 @@ app.controller('IssueController', function($scope, $http, $routeParams, auth, co
$scope.issue = response.data.data;
}, function errorCallback(response) {
});
- }
+ };
loadData($routeParams.id);
$scope.addIssueReply = function(data){
- console.log("add issue reply");
+ console.log(data.comment);
common.addCommonReply($routeParams.id, 'Issue', data, function(){
$scope.formData = {comment: ''};
loadData($routeParams.id);
});
};
-
-
-
-
});
-app.controller('HomeworkController', function($scope, $http, $routeParams, auth){
+app.controller('HomeworkController', function($scope, $http, $routeParams, auth, common){
$scope.formData = {comment: ''};
var loadData = function(id){
- $http({
- method: 'GET',
- url: apiUrl+ "whomeworks/"+id,
- }).then(function successCallback(response) {
+ common.loadCommonData(id, 'whomeworks').then(function successCallback(response) {
console.log(response.data);
$scope.homework = response.data.data;
-
}, function errorCallback(response) {
});
- }
+ };
loadData($routeParams.id);
-
$scope.addHomeworkReply = function(data){
console.log(data.comment);
-
- if(!data.comment || data.comment.length<=0){
- return;
- }
-
- var userInfo = {
- type: "HomeworkCommon",
- content: data.comment,
- openid: auth.openid(),
- };
-
- $http({
- method: 'POST',
- url: apiUrl+ "new_comment/"+$routeParams.id,
- data: userInfo,
- }).then(function successCallback(response) {
- alert("提交成功");
+ common.addCommonReply($routeParams.id, 'HomeworkCommon', data, function(){
$scope.formData = {comment: ''};
loadData($routeParams.id);
- }, function errorCallback(response) {
});
- }
+ };
});
-app.controller('CourseNoticeController', function($scope, $http, $routeParams, auth){
+app.controller('CourseNoticeController', function($scope, $http, $routeParams, auth, common){
$scope.formData = {comment: ''};
var loadData = function(id){
- $http({
- method: 'GET',
- url: apiUrl+ "newss/"+id,
- }).then(function successCallback(response) {
+ common.loadCommonData(id, 'newss').then(function successCallback(response) {
console.log(response.data);
$scope.news = response.data.data;
-
}, function errorCallback(response) {
});
- };
+ }
loadData($routeParams.id);
-
$scope.addNoticeReply = function(data){
console.log(data.comment);
-
- if(!data.comment || data.comment.length<=0){
- return;
- }
-
- var userInfo = {
- type: "News",
- content: data.comment,
- openid: auth.openid(),
- };
-
- $http({
- method: 'POST',
- url: apiUrl+ "new_comment/"+$routeParams.id,
- data: userInfo,
- }).then(function successCallback(response) {
- alert("提交成功");
+ common.addCommonReply($routeParams.id, 'News', data, function(){
$scope.formData = {comment: ''};
loadData($routeParams.id);
- }, function errorCallback(response) {
});
}
});
-app.controller('CourseDiscussionController', function($scope, $http, $routeParams, auth){
+app.controller('DiscussionController', function($scope, $http, $routeParams, auth, common){
$scope.formData = {comment: ''};
var loadData = function(id){
- $http({
- method: 'GET',
- url: apiUrl+ "messages/"+id,
- }).then(function successCallback(response) {
+ common.loadCommonData(id, 'messages').then(function successCallback(response) {
console.log(response.data);
$scope.discussion = response.data.data;
-
}, function errorCallback(response) {
});
- };
+ }
loadData($routeParams.id);
-
$scope.addDiscussionReply = function(data){
console.log(data.comment);
-
- if(!data.comment || data.comment.length<=0){
- return;
- }
-
- var userInfo = {
- type: "Message",
- content: data.comment,
- openid: auth.openid(),
- };
-
- $http({
- method: 'POST',
- url: apiUrl+ "new_comment/"+$routeParams.id,
- data: userInfo,
- }).then(function successCallback(response) {
- alert("提交成功");
+ common.addCommonReply($routeParams.id, 'Message', data, function(){
$scope.formData = {comment: ''};
loadData($routeParams.id);
- }, function errorCallback(response) {
});
}
});
-app.controller('JournalsController', function($scope, $http, $routeParams, auth){
+app.controller('JournalsController', function($scope, $http, $routeParams, auth, common){
$scope.formData = {comment: ''};
var loadData = function(id){
- $http({
- method: 'GET',
- url: apiUrl+ "journal_for_messages/"+id,
- }).then(function successCallback(response) {
+ common.loadCommonData(id, 'journal_for_messages').then(function successCallback(response) {
console.log(response.data);
$scope.message = response.data.data;
}, function errorCallback(response) {
});
- };
+ }
loadData($routeParams.id);
-
$scope.addJournalReply = function(data){
console.log(data.comment);
-
- if(!data.comment || data.comment.length<=0){
- return;
- }
-
- var userInfo = {
- type: "JournalsForMessage",
- content: data.comment,
- openid: auth.openid(),
- };
-
- $http({
- method: 'POST',
- url: apiUrl+ "new_comment/"+$routeParams.id,
- data: userInfo,
- }).then(function successCallback(response) {
- alert("提交成功");
+ common.addCommonReply($routeParams.id, 'JournalsForMessage', data, function(){
$scope.formData = {comment: ''};
loadData($routeParams.id);
- }, function errorCallback(response) {
});
}
});
-app.controller('BlogController', function($scope, $http, $routeParams, auth){
+app.controller('BlogController', function($scope, $http, $routeParams, auth, common){
$scope.formData = {comment: ''};
var loadData = function(id){
- $http({
- method: 'GET',
- url: apiUrl+ "blog_comments/"+id,
- }).then(function successCallback(response) {
+ common.loadCommonData(id, 'blog_comments').then(function successCallback(response) {
console.log(response.data);
$scope.blog = response.data.data;
}, function errorCallback(response) {
});
- };
+ }
loadData($routeParams.id);
-
$scope.addBlogReply = function(data){
console.log(data.comment);
-
- if(!data.comment || data.comment.length<=0){
- return;
- }
-
- var userInfo = {
- type: "BlogComment",
- content: data.comment,
- openid: auth.openid(),
- };
-
- $http({
- method: 'POST',
- url: apiUrl+ "new_comment/"+$routeParams.id,
- data: userInfo,
- }).then(function successCallback(response) {
- alert("提交成功");
+ common.addCommonReply($routeParams.id, 'BlogComment', data, function(){
$scope.formData = {comment: ''};
loadData($routeParams.id);
- }, function errorCallback(response) {
});
}
});
@@ -441,7 +329,7 @@ app.config(['$routeProvider',function ($routeProvider) {
})
.when('/project_discussion/:id', {
templateUrl: 'project_discussion.html',
- controller: 'CourseDiscussionController'
+ controller: 'DiscussionController'
})
.when('/homework/:id', {
templateUrl: 'homework_detail.html',
@@ -453,7 +341,7 @@ app.config(['$routeProvider',function ($routeProvider) {
})
.when('/course_discussion/:id', {
templateUrl: 'course_discussion.html',
- controller: 'CourseDiscussionController'
+ controller: 'DiscussionController'
})
.when('/journal_for_message/:id', {
templateUrl: 'jour_message_detail.html',