Mike 7 лет назад
Родитель
Сommit
06d8bac8fc

+ 26 - 26
miaomiao/www/js/controllers/account.js

xqd
@@ -4,32 +4,32 @@
              //$ionicNavBarDelegate.showBackButton(false);
             $scope.wechat_login = function(){
                 var scope = "snsapi_userinfo", state = "_" + (+new Date());
-                Wechat.auth(scope, state, function (response) {
-                    // alert("response:"+JSON.stringify(response));
-                    // var response={code:1231};
-                   if(response.code){
-                       msg.loading('登录中...');
-                       userService.wechat_login(response.code).then(function(result){
-                           msg.hide();
-                            // alert("wechat_login success: " + JSON.stringify(result));
-                           if(result.data.data){
-                               storage.setObject('user', result.data.data.user);
-                               storage.set('token', result.data.data.token);
-                               $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                               $scope.user=storage.getObject('user');
-                               $state.go('app.home');
-                           }else{
-                               $state.go("loginAccount",{wechat:response.code})
-                           }
-                       },function(error){
-                            console.log("loginbywx Failed: " + JSON.stringify(error));
-                           $state.go("loginAccount",{wechat:$scope.wecaht});
-                       });
-                   }
-                }, function (error) {
-                   console.log("Failed: " + JSON.stringify(error));
-                })  
-                // $state.go("loginAccount",{wechat:1231});
+                // Wechat.auth(scope, state, function (response) {
+                //     // alert("response:"+JSON.stringify(response));
+                //     // var response={code:1231};
+                //    if(response.code){
+                //        msg.loading('登录中...');
+                //        userService.wechat_login(response.code).then(function(result){
+                //            msg.hide();
+                //             // alert("wechat_login success: " + JSON.stringify(result));
+                //            if(result.data.data){
+                //                storage.setObject('user', result.data.data.user);
+                //                storage.set('token', result.data.data.token);
+                //                $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                //                $scope.user=storage.getObject('user');
+                //                $state.go('app.home');
+                //            }else{
+                //                $state.go("loginAccount",{wechat:response.code})
+                //            }
+                //        },function(error){
+                //             console.log("loginbywx Failed: " + JSON.stringify(error));
+                //            $state.go("loginAccount",{wechat:$scope.wecaht});
+                //        });
+                //    }
+                // }, function (error) {
+                //    console.log("Failed: " + JSON.stringify(error));
+                // })  
+                $state.go("loginAccount",{wechat:1231});
             }
     }]);
     app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",

+ 10 - 4
miaomiao/www/js/controllers/my.js

xqd xqd xqd
@@ -121,6 +121,11 @@
                 myService.showAccount().then(function(result){
                     $scope.accountId = result.data.data;
                     var items = result.data.data;
+                    if(items.length==0){
+                        msg.text("请先添加账户");
+                        $state.go("app.my_account_add");
+                        return 
+                    }
                     $scope.pays=[];
                     angular.forEach(items,function(item){
                         if(item.bank_name!=null) {
@@ -134,7 +139,8 @@
                             value=item.type;
                         }
                         $scope.pays.push({id:item.id,value:value});
-                    })
+                    });
+                    $scope.vm.pay = $scope.pays[0]
                 },function(error){
                     msg.error(error.data.message)
                 })
@@ -463,9 +469,9 @@
         myService.testcharge(number,2).then(function (result) {
              msg.text("充值成功");
              $scope.vm.coin = parseInt($scope.vm.coin) + parseInt(number);
-            $timeout(function(){
-                $ionicHistory.goBack();
-            },500)
+            // $timeout(function(){
+            //     $ionicHistory.goBack();
+            // },500)
         });
       }
       //充值

+ 0 - 1
miaomiao/www/templates/my/withdraw.html

xqd
@@ -6,7 +6,6 @@
                  提现到
              </span>
                 <select name="pay" ng-model="vm.pay" ng-options="pay.value for pay in pays track by pay.id" >
-                    <option value="" selected hidden></option>
                 </select>
             </label>
             <label class="item item-input ">