Merge branch 'master' of http://git.9026.com/roobe/miao

miaomiao/www/js/controllers/home.js

@@ -286,7 +286,7 @@
                     });
                 }, 50000);
 
-                $scope.isTest = true;
+                $scope.isTest = false;
                 userService.isTest().then(function(res){
                     if(res.data.data){
                         $scope.isTest = true;

miaomiao/www/js/controllers/my.js

@@ -452,7 +452,7 @@
     app.controller('rechargeCtrl', ["$scope","$ionicModal","$timeout","$ionicHistory","$ionicTabsDelegate", "$state", "myService","userService", "msg"
   , function ($scope,$ionicModal,$timeout, $ionicHistory,$ionicTabsDelegate,$state, myService,userService, msg) {
         $scope.$on('$ionicView.beforeEnter', function () {
-            $scope.showWithdraw = true;
+            $scope.showWithdraw = false;
             $ionicTabsDelegate.showBar(false);
             $scope.vm = {