fly преди 5 години
родител
ревизия
409d45a264

+ 2 - 1
app/Http/Controllers/Wap/IndividualWechat/ActivityController.php

@@ -23,6 +23,7 @@ class ActivityController extends Controller
         $userNationalDay->sign();
         $sign_configs = $userNationalDay->getSignConfigs();
         $bonus = $userNationalDay->bonus;
+        $is_sign = $userNationalDay->is_sign;
         $continue_link = sprintf(
             '%s://site%s.%s.com/recent',
             env('PROTOCOL'),
@@ -35,7 +36,7 @@ class ActivityController extends Controller
             'pay_redirect_url' => $continue_link, 'activity_id' => 15871, 'crm' => 'crm_national'
         ]);
         $this->statsDetail($uid, 'crm_national');
-        return view('crm.notionalDay')->with(compact('sign_configs', 'bonus', 'continue_link', 'pay_link'));
+        return view('crm.notionalDay')->with(compact('sign_configs','is_sign', 'bonus', 'continue_link', 'pay_link'));
     }
 
     private function getUserColumnValue(string $column)

+ 1 - 1
app/Modules/Activity/Services/UserNationalDay.php

@@ -21,7 +21,7 @@ class UserNationalDay
     use NationalDay { __construct as private baseConfig;}
 
     private $uid;
-    private $is_sign;
+    public $is_sign;
     public $sign_day;
     public $bonus;
 

+ 8 - 1
resources/views/crm/notionalDay.blade.php

@@ -45,7 +45,7 @@
         </div>
         <div class="repeat-bg"></div>
     </main>
-    <div class="dialog-wrap">
+    <div class="dialog-wrap" style="display:none">
         <div class="dialog-content">
             <img src="https://cdn-novel.iycdm.com/crm/activity/imgs/d_bg.png" alt="" />
             <p class="user-get">获得<i>{{$bonus}}</i>书币</p>
@@ -58,6 +58,13 @@
     var doc = document;
      var bg_height = doc.querySelector(".main-wrap").clientHeight;
      var screen = window.screen.height || doc.documentElement.clientHeight;
+     var is_sign = {{$is_sign}};
+     setTimeout(() => {
+         if(!is_sign)
+         {
+            doc.querySelector('.dialog-wrap').style.display='block';
+         }
+     }, 500);
      // 背景填充
      if (screen > bg_height) {
        doc.querySelector(".repeat-bg").style.height = screen - bg_height + "px";