add

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: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.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",

miaomiao/www/js/controllers/my.js

@@ -359,7 +359,7 @@
           myService.charge(number,2).then(function (result) {
               //todo:result需要返回支付宝或者微信的签名信息
               console.log("result: " + JSON.stringify(result));
-              var payInfo = result.data;
+              var payInfo = result.data.data;
               if ($scope.vm.payType == 1) { //支付宝
                   cordova.plugins.AliPay.pay(payInfo, function success(e) {
                       //e.resultStatus  状态代码  e.result  本次操作返回的结果数据 e.memo 提示信息
@@ -382,7 +382,9 @@
                   });
               }
               if ($scope.vm.payType == 2) { //微信
-                  var obj = JSON.parse(payInfo);
+                  // var obj = JSON.parse(payInfo);
+                  var obj = payInfo.orderString;
+              // console.log("obj: " + JSON.stringify(obj));
                   var params = {
                       partnerid: obj.partnerid, // merchant id
                       prepayid: obj.prepayid, // prepay id
@@ -390,6 +392,7 @@
                       timestamp: obj.timestamp, // timestamp
                       sign: obj.sign, // signed string
                   };
+              // console.log("result: " + JSON.stringify(params));
                   Wechat.sendPaymentRequest(params, function (r) {
                       $scope.clicksub = false;
                       courseService.orderStatus(orderID, $scope.paytype).then(function (result) {

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

@@ -312,6 +312,7 @@ class PayController extends Controller
 
         $user = Auth::user();
         $data['goods_id'] = 0;
+        $data['number'] = 0.01;
         if (!isset($data['goods'])) {//默认充余额
             $data['goods'] = OrderInfoModel::GOODS_TYPE_COIN;
         }