From e4a414e550b81ad59c341fbb872f0308e646bd2d Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 4 Aug 2016 14:37:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=8F=9C=E5=8D=95=E8=B7=B3?= =?UTF-8?q?=E5=85=A5=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E5=92=8C=E7=8F=AD?= =?UTF-8?q?=E7=BA=A7=E7=95=8C=E9=9D=A2=E7=82=B9=E5=8F=96=E6=B6=88=E8=A6=81?= =?UTF-8?q?=E8=83=BD=E8=BF=94=E5=9B=9E=E5=85=AC=E4=BC=97=E5=8F=B7=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/review_class_member.html | 2 +- public/assets/wechat/review_project_member.html | 2 +- public/javascripts/wechat/controllers/class_list.js | 2 +- public/javascripts/wechat/controllers/join_class.js | 11 +++++++++-- public/javascripts/wechat/controllers/join_project.js | 10 ++++++++-- public/javascripts/wechat/controllers/project_list.js | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/public/assets/wechat/review_class_member.html b/public/assets/wechat/review_class_member.html index 81d2e03d6..c13571e4c 100644 --- a/public/assets/wechat/review_class_member.html +++ b/public/assets/wechat/review_class_member.html @@ -6,7 +6,7 @@
角色
拒绝 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) {