tusx 6 éve
szülő
commit
22c021674f

+ 9 - 5
app/Http/Controllers/Wap/Order/OrdersController.php

@@ -111,7 +111,7 @@ class OrdersController extends BaseController
                 }
                 }
 
 
             }*/
             }*/
-            $appad = $this->appad();
+
 
 
             foreach ($res as $v) {
             foreach ($res as $v) {
                 $intro = [];
                 $intro = [];
@@ -171,7 +171,7 @@ class OrdersController extends BaseController
                     'intro' => $intro,
                     'intro' => $intro,
                     'intro2' => $intro2,
                     'intro2' => $intro2,
                     'is_default' => $v->is_default,
                     'is_default' => $v->is_default,
-                    'show_free_ads'=>$appad
+
                 ];
                 ];
             }
             }
             return response()->success($data);
             return response()->success($data);
@@ -263,6 +263,7 @@ class OrdersController extends BaseController
         //yqLog('user')->info('user is ',['user'=>$user]);
         //yqLog('user')->info('user is ',['user'=>$user]);
         //yqLog('user')->info('user is ',['charge_count'=>$user->charge_count]);
         //yqLog('user')->info('user is ',['charge_count'=>$user->charge_count]);
         $data = [];
         $data = [];
+        $appad = $this->appad();
         foreach ($res as $v) {
         foreach ($res as $v) {
             if ($v->type == 'NEW_USER' && $is_first_recharge) {
             if ($v->type == 'NEW_USER' && $is_first_recharge) {
                 if (env('NO_NEW_USER_CHARGE') &&
                 if (env('NO_NEW_USER_CHARGE') &&
@@ -280,7 +281,8 @@ class OrdersController extends BaseController
                     'first_charge' => true,
                     'first_charge' => true,
                     'today_special' => false,
                     'today_special' => false,
                     'save_text' => round($v->given / 100, 1) . '元',
                     'save_text' => round($v->given / 100, 1) . '元',
-                    'product_id' => $v->id
+                    'product_id' => $v->id,
+                    'show_free_ads'=>$appad
                 ];
                 ];
                 $data[] = $temp;
                 $data[] = $temp;
             } elseif ($v->type == 'YEAR_ORDER') {
             } elseif ($v->type == 'YEAR_ORDER') {
@@ -296,7 +298,8 @@ class OrdersController extends BaseController
                     'first_charge' => false,
                     'first_charge' => false,
                     'today_special' => false,
                     'today_special' => false,
                     'save_text' => $save_text,
                     'save_text' => $save_text,
-                    'product_id' => $v->id
+                    'product_id' => $v->id,
+                    'show_free_ads'=>$appad
                 ];
                 ];
                 $data[] = $temp;
                 $data[] = $temp;
             } else {
             } else {
@@ -318,7 +321,8 @@ class OrdersController extends BaseController
                     'first_charge' => false,
                     'first_charge' => false,
                     'today_special' => $v->is_default == 1 ? true : false,
                     'today_special' => $v->is_default == 1 ? true : false,
                     'save_text' => $save_text,
                     'save_text' => $save_text,
-                    'product_id' => $v->id
+                    'product_id' => $v->id,
+                    'show_free_ads'=>$appad
                 ];
                 ];
                 $data[] = $temp;
                 $data[] = $temp;
             }
             }