add

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-  "release": "2017.09.13-09.36.30"
+  "release": "2017.09.13-15.37.09"
 }

miaomiao/www/chcp.manifest

@@ -401,7 +401,7 @@
   },
   {
     "file": "js/controllers/account.js",
-    "hash": "fbdb66cb63214a310a296c7ad6a664a1"
+    "hash": "d230224cf474e355bc5dfa78d834290c"
   },
   {
     "file": "js/controllers/add.js",
@@ -413,7 +413,7 @@
   },
   {
     "file": "js/controllers/my.js",
-    "hash": "709bb690c3c5f1969a2a97956dcad43f"
+    "hash": "76cd2f3cc2b63ddefadacc081ce34c26"
   },
   {
     "file": "js/controllers/tabs.js",

miaomiao/www/js/controllers/account.js

@@ -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",

server/app/Http/Controllers/Api/V1/PayController.php

@@ -6,7 +6,7 @@ use Omnipay\Omnipay;
 use App\Helper\LogHelper;
 use App\Helper\PayHelper;
 use App\Helper\JpushHelper;
-use App\UserInfoModel;
+use App\Models\UserInfoModel;
 use App\Models\OrderInfoModel;
 use App\Models\AccountLog;
 use App\Services\Base\ErrorCode;