one_after пре 3 месеци
родитељ
комит
1d00ef08c3
1 измењених фајлова са 30 додато и 25 уклоњено
  1. 30 25
      app/controller/MyGoodsController.php

+ 30 - 25
app/controller/MyGoodsController.php

@@ -70,31 +70,36 @@ class MyGoodsController
                 }
 
                 $arr[] = [
-                    'good_name'       => $wa_goods->name,
-                    'pay_price'       => $wa_goods->pay_price,
-                    'bonus'           => $bonus,
-                    'balance'         => $balance,
-                    'original_price'  => $wa_goods->original_price,
-                    'deduction_price' => $wa_goods->deduction_price,
-                    'payment_usd'     => $wa_goods->payment_usd,
-                    'rebate'          => $wa_goods->rebate,
-                    'rebate_one'      => $wa_goods->rebate_one,
-                    'rebate_two'      => $wa_goods->rebate_two,
-                    'bl'              => $wa_goods->bl,
-                    'trial_bonus'     => $wa_goods->trial_bonus,
-                    'remarks'         => $wa_goods->remarks,
-                    'img'             => imageToBase64($wa_goods->img),
-                    'created_at'      => date('Y-m-d H:i:s', strtotime($v->created_at)),
-                    'id'              => $v->id,
-                    'num'             => $v->num,
-                    'money'           => $v->money,
-                    'status'          => $v->status,
-                    'name'            => $v->name,
-                    'mobile'          => $v->mobile,
-                    'address'         => $v->address,
-                    'send_status'     => $v->send_status,
-                    'pass'            => $v->pass,
-                    'type'            => $v->type,
+                    'good_name'          => $wa_goods->name,
+                    'pay_price'          => $wa_goods->pay_price,
+                    'bonus'              => $bonus,
+                    'balance'            => $balance,
+                    'original_balancs'   => $wa_goods->original_balancs,
+                    'original_bonus'     => $wa_goods->original_bonus,
+                    'original_price'     => $wa_goods->original_price,
+                    'deduction_price'    => $wa_goods->deduction_price,
+                    'payment_usd'        => $wa_goods->payment_usd,
+                    'rebate'             => $wa_goods->rebate,
+                    'rebate_one'         => $wa_goods->rebate_one,
+                    'rebate_two'         => $wa_goods->rebate_two,
+                    'bl'                 => $wa_goods->bl,
+                    'trial_bonus'        => $wa_goods->trial_bonus,
+                    'remarks'            => $wa_goods->remarks,
+                    'usd_quota'          => $wa_goods->usd_quota,
+                    'original_usd_quota' => $wa_goods->original_usd_quota,
+                    'ranking'            => $wa_goods->ranking,
+                    'img'                => imageToBase64($wa_goods->img),
+                    'created_at'         => date('Y-m-d H:i:s', strtotime($v->created_at)),
+                    'id'                 => $v->id,
+                    'num'                => $v->num,
+                    'money'              => $v->money,
+                    'status'             => $v->status,
+                    'name'               => $v->name,
+                    'mobile'             => $v->mobile,
+                    'address'            => $v->address,
+                    'send_status'        => $v->send_status,
+                    'pass'               => $v->pass,
+                    'type'               => $v->type,
                 ];
             }
         } catch (\Throwable $exception) {