Merge branch 'master' of http://git.9026.com/roobe/miao

miaomiao/www/js/controllers/home.js

@@ -244,6 +244,7 @@
                 timerID = null;
             });
             $scope.$on('$ionicView.beforeEnter', function () {
+                $scope.video = {};
                 msg.loading();
                 $ionicTabsDelegate.showBar(false);
                 $scope.load(id,dream_user_id,interaction_id);

miaomiao/www/js/services/msgservice.js

@@ -33,7 +33,7 @@
             },
             loading: function (template) {
                 $ionicLoading.show({
-                    showDelay:0,
+                    showDelay:800,
                     template: '<ion-spinner class="nerve-loading"></ion-spinner>'
                 });
                 //超时退出

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

@@ -167,9 +167,10 @@ class PayController extends Controller
 
                     //记日志
                     $_types = AccountLog::getAllType();
+                    $_ops = AccountLog::getAllop();
                     $this->logAccount($_types[AccountLog::TYPE_CASH], $u->id, $u->name,$order->amount,
-                        AccountLog::OP_CHARGE,
-                        $_types[AccountLog::TYPE_COIN], $u->id,$u->name,$order->price,$out_trade_no,$u->avatar);
+                        $_ops[AccountLog::OP_CHARGE],
+                        $_types[AccountLog::TYPE_COIN], $u->id,$u->name,$order->price,$out_trade_no,'http://miao.beiyuesi.com/base/img/wechat.png');
 
                     \Log::info('支付完成');