Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

public/javascripts/wechat/app.js

@@ -2,13 +2,19 @@ var app = angular.module('wechat', ['ngRoute']);
 var apiUrl = 'http://wechat.trustie.net/api/v1/';
 //var openid= "oCnvgvz8R7QheXE-R9Kkr39j8Ndg";
 var openid = '';
+var debug = true; //调试标志,如果在本地请置为true
+
+if(debug){
+    openid = "oCnvgvz8R7QheXE-R9Kkr39j8Ndg";
+}
 
 app.factory('auth', function($http,$routeParams){
-    var _openid = '';
+    var _openid = openid;
 
     var getOpenId = function(cb) {
         if (_openid.length > 0) {
             cb(_openid);
+            return;
         }
         var code = $routeParams.code;
         $http({
@@ -39,16 +45,7 @@ app.controller('ActivityController',function($scope, $http, auth){
     $scope.activities = [];
     $scope.page = 1;
 
-    auth.getOpenId(function(openid){
+    var loadActData = function(page){
-        if(!openid){
-            alert("获取openid出错");
-        } else {
-            openid = openid;
-            $scope.loadActData($scope.page);
-        }
-    });
-
-    $scope.loadActData = function(page){
         $scope.page = page;
         $http({
             method: 'POST',
@@ -60,6 +57,17 @@ app.controller('ActivityController',function($scope, $http, auth){
         });
     }
 
+    auth.getOpenId(function(openid){
+        if(!openid){
+            alert("获取openid出错");
+        } else {
+            openid = openid;
+            loadActData($scope.page);
+        }
+    });
+
+    $scope.loadActData = loadActData;
+
 });
 
 app.controller('IssueController', function($scope, $http, $routeParams, auth){