diff --git a/app/controller/admin/order/Order.php b/app/controller/admin/order/Order.php index 83885bbb..0d944c9e 100644 --- a/app/controller/admin/order/Order.php +++ b/app/controller/admin/order/Order.php @@ -93,7 +93,7 @@ class Order extends BaseController $groupOrder = $groupOrderRepository->detailOne((int)$id, false); $groupOrder->order_extend=$data['img']; // $this->repository->dealChangeStatus($data['img'],$id); - $res=$this->repository->financialVoucher($groupOrder); + $res=$this->repository->paySuccess($groupOrder); if($res){ return app('json')->success('更新成功'); }else{ diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 69765f33..44413cbf 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -1003,13 +1003,6 @@ class Auth extends BaseController } elseif (strpos($agent, 'android') !== false) { // 检查是否为Android设备 $appInfo = Db::name('AppUpdate')->where('type', $type)->order('id','desc')->find(); - if($agent == 'ios'){ - $pattern = '/\.wgt$/i'; - if (preg_match($pattern, basename($appInfo['dow_url']))) { - $appInfo =[]; - } - - } } else { $appInfo=[]; // 如果都不是,则输出其他