Browse Source

完善功能

gorden 8 months ago
parent
commit
473003bb68

+ 1 - 1
app/admin/controller/content/ActivityController.php

@@ -28,7 +28,7 @@ class ActivityController extends Curd
 
     protected function doSelect(array $where, string $field = null, string $order = 'desc')
     {
-        $model = $this->model;
+        $model = $this->model->with('category');
         foreach ($where as $column => $value) {
             if (is_array($value)) {
                 if ($value[0] === 'like' || $value[0] === 'not like') {

+ 1 - 1
app/admin/controller/order/WholeController.php

@@ -1237,7 +1237,7 @@ class WholeController extends Curd
                 $resArray = json_decode($res, true);
 
                 throw new PayException('退款失败,原因:未完全接入');
-                
+
             } else if (isset($payType[1]) && $payType[1] == 'CASH') {  // 余额支付
                 $account = MemberAccount::where('join_account_member_id', $order->join_order_member_id)
                     ->where('member_account_classify', 'CASH')

+ 1 - 1
app/admin/service/member/MemberService.php

@@ -264,7 +264,7 @@ class MemberService
 
     public static function info($memberId)
     {
-        $member = Member::with('cert')
+        $member = Member::with('cert','info')
             ->where('member_id', $memberId)
             ->first();