微信菜单跳入加入项目和班级界面点取消要能返回公众号界面

public/assets/wechat/review_class_member.html

@@ -6,7 +6,7 @@
         <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
         <ul class="class-list f13 c-grey3">
             <li><span class="fl ml10 class-list-name hidden">教师</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':current_review_member.roles_id == 7,'checked': current_review_member.roles_id == 9}]"></span></li>
-            <li><span class="fl ml10 class-list-name hidden">助教</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':current_review_member.roles_id == 9, 'checked': current_review_member.roles_id == 7}]"></span></li>
+            <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">助教</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':current_review_member.roles_id == 9, 'checked': current_review_member.roles_id == 7}]"></span></li>
         </ul>
         <div class="bottom-tab-wrap mt10">
             <a href="javascript:void(0);" ng-click="deal(1)" class="weixin-tab c-grey border-top">拒绝</a>

public/assets/wechat/review_project_member.html

@@ -6,7 +6,7 @@
         <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
         <ul class="class-list f13 c-grey3">
             <li><span class="fl ml10 class-list-name hidden">管理人员</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle',{'bg-grey':current_review_member.roles_id == 4,'checked': current_review_member.roles_id == 3}]"></span></li>
-            <li><span class="fl ml10 class-list-name hidden">开发人员</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle',{'bg-grey':current_review_member.roles_id == 3,'checked': current_review_member.roles_id == 4}]"></span></li>
+            <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">开发人员</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle',{'bg-grey':current_review_member.roles_id == 3,'checked': current_review_member.roles_id == 4}]"></span></li>
         </ul>
         <div class="bottom-tab-wrap mt10">
             <a href="javascript:void(0);" ng-click="deal(1)" class="weixin-tab c-grey border-top">拒绝</a>

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});
 
         };
 

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();
 //        });
+        if(tag){
             window.history.back();
+        }
+        else{
+            wx.closeWindow();
+        }
+
     };
 
     vm.joinClass = function(){

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(){
+        if(tag){
             window.history.back();
+        }
+        else{
+            wx.closeWindow();
+        }
     };
 
     vm.join_project = function(){

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) {