Merge branch 'stabble' of iqiyoo:zhuishuyun_wap into stabble

app/Http/Controllers/Wap/Web/ActivityController.php

@@ -382,17 +382,24 @@ class ActivityController extends BaseController
             $redirect_url = urldecode($redirect_url);
         }
 
-        $product_ids = [6621, 6622,6623];
-
+        //$product_ids = [6621, 6622,6623];
+        $imgs = [
+            'page_bd_img'=>'https://cdn-novel.iycdm.com/h5/activity-2019-07-25/bg.jpg',
+            'page_btn_pre_img'=>'https://cdn-novel.iycdm.com/h5/activity-2019-07-25/undone.png',
+            'page_btn_doing_img'=>'https://cdn-novel.iycdm.com/h5/activity-2019-07-25/doing.png',
+            'page_btn_end_img'=>'https://cdn-novel.iycdm.com/h5/activity-2019-07-25/over.png'
+        ];
         //未开始
         if (time() < strtotime($activity_info->start_time)) {
-            return view('pay.activity.summerHoliday', ['url' => ['javascript:void(0)', 'javascript:void(0)','javascript:void(0)'], 'code' => -1]);
+            //return view('pay.activity.summerHoliday', ['url' => ['javascript:void(0)', 'javascript:void(0)','javascript:void(0)'], 'code' => -1]);
+            return view('pay.order.common', ['url' => [], 'code' => 1, 'img' => $imgs]);
         }
         //结束
         if (time() > strtotime($activity_info->end_time)) {
+            //return view('pay.order.common', ['url' => [], 'code' => 2, 'img' => $imgs]);
             return view('pay.activity.summerHoliday', ['url' => ['javascript:void(0)', 'javascript:void(0)','javascript:void(0)'], 'code' => -2]);
         }
-        $url = [];
+        /*$url = [];
         foreach ($product_ids as $product_id) {
             $param = [
                 'uid' => $this->uid,
@@ -404,9 +411,19 @@ class ActivityController extends BaseController
                 'limit' => 100
             ];
             $url[] = env('CREATE_PAY_URL') . '?' . http_build_query($param);
-        }
-
-        return view('pay.activity.summerHoliday', ['url' => $url, 'code' => 0]);
+        }*/
+        $param = [
+            'uid' => $this->uid,
+            'distribution_channel_id' => $this->distribution_channel_id,
+            'product_id' => $activity_info->product_id,
+            'activity_id' => $activity_info->id,
+            'fromtype' => $from,
+            'pay_redirect_url' => $redirect_url,
+            'limit' => 100,
+        ];
+        $url = env('CREATE_PAY_URL') . '?' . http_build_query($param);
+        return view('pay.order.common', ['url' => $url, 'code' => 0, 'img' => $imgs]);
+        //return view('pay.activity.summerHoliday', ['url' => $url, 'code' => 0]);
     }
 
     public function crmYearActivity(Request $request)

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -498,7 +498,8 @@ class WelcomeController extends BaseController
                     } else {
                         $activity_img = 'https://cdn-novel.iycdm.com/h5/activity-2019-05-10/reader-50.jpg';
                     }*/
-                    $activity_img = sprintf('https://cdn-novel.iycdm.com/h5/activity-2019-07-10/reader-banner%s.jpg',random_int(1,3));
+                    //$activity_img = sprintf('https://cdn-novel.iycdm.com/h5/activity-2019-07-10/reader-banner%s.jpg',random_int(1,3));
+                    $activity_img = 'https://cdn-novel.iycdm.com/h5/activity-2019-07-25/reader-banner.png';
                     $url = $h5_scheme . '://' . _domain() . $activity_info->activity_page . '&fromtype=reader';
                 }
             }

resources/views/wap/index.blade.php

@@ -9,7 +9,7 @@
     <script>window.VueRouter || document.write('<script src="https://cdn-novel.iycdm.com/static/vue-router.min.js"><\/script>')</script>
     <script>(window.Vue && window.VueLazyload) || document.write('<script src="https://cdn-novel.iycdm.com/static/vue-lazyload.js"><\/script>')</script>
     <title>{{$title}}</title>
-    <link href=https://cdn-novel.iycdm.com/static2019-7-24/css/app.114a9c6c95057b302bac8f5709eac067.css rel=stylesheet>
+    <link href=https://cdn-novel.iycdm.com/static2019-7-26/css/app.4251825a5328878f7948281866d47f1c.css rel=stylesheet>
 </head>
 <body>
 <div id=app></div>
@@ -32,8 +32,8 @@
     })();</script>
 <script id=options>window.options = {!! $options!!};</script>
 <script type=text/javascript
-        src=https://cdn-novel.iycdm.com/static2019-7-24/js/manifest.9f2f52724d189361546c.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-24/js/vendor.fa223fb19e81cd0aa605.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-24/js/app.c9cc0d0d174998aad7be.js></script>
+        src=https://cdn-novel.iycdm.com/static2019-7-26/js/manifest.db64e4310974e676f24e.js></script>
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-26/js/vendor.fa223fb19e81cd0aa605.js></script>
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-26/js/app.af5e191228d51cbb679a.js></script>
 </body>
 </html>