Mike há 7 anos atrás
pai
commit
c4ca0357ec

+ 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.user){
-                                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:result.data.data.openid})
-                            }
-                        },function(error){
-                             console.log("loginbywx Failed: " + JSON.stringify(error));
-                            $state.go("loginAccount");
-                        });
-                    }
-                 }, function (error) {
-                    console.log("Failed: " + JSON.stringify(error));
-                 })
-                // $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                 // 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.user){
+                 //                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:result.data.data.openid})
+                 //            }
+                 //        },function(error){
+                 //             console.log("loginbywx Failed: " + JSON.stringify(error));
+                 //            $state.go("loginAccount");
+                 //        });
+                 //    }
+                 // }, function (error) {
+                 //    console.log("Failed: " + JSON.stringify(error));
+                 // })
+                $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
             }
     }]);
     app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",

+ 1 - 1
server/app/Http/Controllers/Api/V1/IndexController.php

xqd
@@ -141,7 +141,7 @@ class IndexController extends Controller
             return $this->api(compact('users','dreams'));
         } else{
             $banners = $this->getBanner();
-            $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->limit(15)->paginate(5);
+            $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->limit(5)->paginate(5);
             $this->dreams($dreams);
             return $this->api(compact('banners','users','dreams'));
         }