diff --git a/public/assets/wechat/review_project_member.html b/public/assets/wechat/review_project_member.html
index b03fdd276..5b8113eb4 100644
--- a/public/assets/wechat/review_project_member.html
+++ b/public/assets/wechat/review_project_member.html
@@ -6,7 +6,7 @@
拒绝
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
index 98910242f..48e778f9d 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -94,7 +94,7 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
// }
// });
- $location.path("/join_class");
+ $location.path("/join_class").search({tag: 1});
};
diff --git a/public/javascripts/wechat/controllers/join_class.js b/public/javascripts/wechat/controllers/join_class.js
index bbdaae7c5..3f1a28387 100644
--- a/public/javascripts/wechat/controllers/join_class.js
+++ b/public/javascripts/wechat/controllers/join_class.js
@@ -1,10 +1,11 @@
-app.controller('JoinClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+app.controller('JoinClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','wx', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,wx){
var vm = $scope;
// vm.current_edit_member = rms.get('current_edit_member');
vm.current_edit_member = null;
+ var tag = $routeParams.tag;
vm.alertService = alertService.create();
@@ -17,7 +18,13 @@ app.controller('JoinClassController', ['$scope', '$http', 'auth', 'config', 'ale
// vm.alertService.showMessage('提示', '您确定不对角色进行变更吗?', function(){
// window.history.back();
// });
- window.history.back();
+ if(tag){
+ window.history.back();
+ }
+ else{
+ wx.closeWindow();
+ }
+
};
vm.joinClass = function(){
diff --git a/public/javascripts/wechat/controllers/join_project.js b/public/javascripts/wechat/controllers/join_project.js
index 2b167e04c..f27c535c5 100644
--- a/public/javascripts/wechat/controllers/join_project.js
+++ b/public/javascripts/wechat/controllers/join_project.js
@@ -1,6 +1,6 @@
-app.controller('JoinProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+app.controller('JoinProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','wx', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,wx){
var vm = $scope;
// vm.current_edit_member = rms.get('current_edit_member');
@@ -9,9 +9,15 @@ app.controller('JoinProjectController', ['$scope', '$http', 'auth', 'config', 'a
vm.role_id = 0;
vm.alertService = alertService.create();
vm.invite_code = "";
+ var tag = $routeParams.tag;
vm.cancel = function(){
- window.history.back();
+ if(tag){
+ window.history.back();
+ }
+ else{
+ wx.closeWindow();
+ }
};
vm.join_project = function(){
diff --git a/public/javascripts/wechat/controllers/project_list.js b/public/javascripts/wechat/controllers/project_list.js
index 2d0568f16..6ff7495e4 100644
--- a/public/javascripts/wechat/controllers/project_list.js
+++ b/public/javascripts/wechat/controllers/project_list.js
@@ -75,7 +75,7 @@ app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$
// }
// }
// });
- $location.path("/join_project");
+ $location.path("/join_project").search({tag: 1});
};
vm.onSetting = function (project) {