Mike há 7 anos atrás
pai
commit
0d7045d389

+ 17 - 17
miaomiao/www/js/controllers/my.js

xqd
@@ -378,28 +378,28 @@
         }]);
     app.controller('rechargeCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg"
   , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
-            $scope.$on('$ionicView.beforeEnter', function () {
-                $ionicTabsDelegate.showBar(false);
-                myService.myInfo().then(function(result){
-                    $scope.vm = result.data.data;
-                    $scope.vm.money = '';
-                    $scope.vm.payType = 2;
-                })
-            });
-            $scope.payExplain = function(){
-                $state.go("app.payExplain")
-            };
-            $scope.withdraw = function(){
-                $state.go("app.withdraw")
-            };
+        $scope.$on('$ionicView.beforeEnter', function () {
+            $ionicTabsDelegate.showBar(false);
+            myService.myInfo().then(function(result){
+                $scope.vm = result.data.data;
+                $scope.vm.number = '';
+                $scope.vm.payType = 2;
+            })
+        });
+        $scope.payExplain = function(){
+            $state.go("app.payExplain")
+        };
+        $scope.withdraw = function(){
+            $state.go("app.withdraw")
+        };
            
       //充值
-      $scope.charge = function(money){
-          if (!money) {
+      $scope.charge = function(number){
+          if (!number) {
               msg.text('请输入充值金额');
               return;
           }
-          myService.charge(money,2).then(function (result) {
+          myService.charge(number,2).then(function (result) {
               //todo:result需要返回支付宝或者微信的签名信息
               console.log("result: " + JSON.stringify(result));
               var payInfo = result.data;

+ 2 - 2
miaomiao/www/js/services/myservice.js

xqd
@@ -14,11 +14,11 @@
                     data: { password: password }
                 })
             },
-            charge:function(coin,type){
+            charge:function(number,type){
                 return $http({
                     url:config.server + "api/pay/charge",
                     method:"post",
-                    data: { coin:coin,goods:1,type:type}
+                    data: { number:number,goods:1,type:type}
                 })
             },
             setting:function(){

+ 2 - 2
miaomiao/www/templates/my/my-recharge.html

xqd xqd
@@ -22,7 +22,7 @@
             </div>
             <div class="item item-input" style="padding-top: 20px; padding-bottom: 20px">
                 <span class="input-label" style="width: 60px">梦想币</span>
-                <input type="tel" placeholder="请输入数量" ng-model="vm.money">
+                <input type="tel" placeholder="请输入数量" ng-model="vm.number">
             </div>
             <div class="item" style="color: #969696; padding-top: 40px">
                选择支付方式
@@ -39,7 +39,7 @@
             </ion-list>
         </div>
         <div class="padding">
-            <button  class="button button-block button-calm" ng-click="charge(vm.money)">
+            <button  class="button button-block button-calm" ng-click="charge(vm.number)">
                 支付
             </button>
         </div>

+ 3 - 3
server/app/Http/Controllers/Api/V1/PayController.php

xqd
@@ -292,13 +292,13 @@ class PayController extends Controller
         $pTypes = array_keys($payTypes);
         $validator = Validator::make($data = $request->all(),
             [
-                'coin' => 'required|integer|min:1',
+                'number' => 'required|integer|min:1',
                 'type' => 'required|in:' . join(',', $pTypes),
                 'goods' => 'in:' . join(',', $gTypes),
             ],
             [
-                'coin.required' => '请输入梦想币数量',
-                'coin.integer' => '梦想币数量必须为整数',
+                'number.required' => '请输入梦想币数量',
+                'number.integer' => '梦想币数量必须为整数',
                 'number.min' => '充值梦想币数量至少为1',
                 'type.required' => '支付类型必填',
                 'type.in' => '支付类型非法',