Merge branch 'stabble' of iqiyoo:zhuishuyun_wap into obank

app/Http/Controllers/Wap/Book/BookController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Wap\Book;
 use App\Modules\Book\Models\BookSearchStat;
 use App\Modules\Book\Services\BookSearchStatService;
 use App\Modules\Book\Services\BookUrgeUpdateService;
+use App\Modules\Book\Services\RecoBannerService;
 use App\Modules\RecommendBook\Services\RecommendService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Wap\BaseController;
@@ -186,6 +187,7 @@ class BookController extends BaseController
                 'BOOK_MALE_NEW_RECOM'
             ];
             $channel = 1;
+            $reco_banner_type = ['MALE','PUBLIC'];
         }else{
             $type = [
                 'BOOK_FEMALE_LOOP',
@@ -194,10 +196,10 @@ class BookController extends BaseController
                 'BOOK_FEMALE_RECOM',
                 'BOOK_FEMALE_NEW_RECOM'
             ];
+            $reco_banner_type = ['FEMALE','PUBLIC'];
             $channel = 2;
         }
 
-
         $cache_key = 'wap_index_page_'.$sex;
         $cache_book =Cache::get($cache_key,'');
         if($cache_book){
@@ -205,11 +207,13 @@ class BookController extends BaseController
             //return response()->success($cache_book);
         }
         $book = [
-            ['type'=>'lunbo','lable'=>'','books'=>collectionTransform(new BookTransformer,BookConfigService::getBooksByIds(RecommendService::getRecommendBooksIds($channel,'loop')))],
+            ['type'=>'reco_banner','lable'=>'','books'=>RecoBannerService::getByType($reco_banner_type)],
+            //['type'=>'lunbo','lable'=>'','books'=>collectionTransform(new BookTransformer,BookConfigService::getBooksByIds(RecommendService::getRecommendBooksIds($channel,'loop')))],
             ['type'=>'hot','lable'=>'热门推荐','books'=>collectionTransform(new BookTransformer,BookConfigService::getBooksByIds(RecommendService::getRecommendBooksIds($channel,'hot')))],
             ['type'=>'zhibo','lable'=>'神书直播','books'=>collectionTransform(new BookTransformer,BookConfigService::getBooksByIds(RecommendService::getRecommendBooksIds($channel,'live')))],
             ['type'=>'recom','lable'=>'编辑推荐','books'=>collectionTransform(new BookTransformer,BookConfigService::getBooksByIds(RecommendService::getRecommendBooksIds($channel,'recom')))],
             ['type'=>'new_recom','lable'=>'新书推荐','books'=>collectionTransform(new BookTransformer,BookConfigService::getBooksByIds(RecommendService::getRecommendBooksIds($channel,'new_recom')))],
+
         ];
         /*foreach ($type as $key=>$v){
             $book[$key]['books']  = collectionTransform(new BookTransformer,BookConfigService::getBooksByIds(explode(',',env($v))));

app/Modules/Book/Models/RecoBanner.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Modules\Book\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class RecoBanner extends Model
+{
+    protected $table = 'reco_banners';
+    protected $fillable = [
+        'redirect_url',
+        'desc',
+        'reco_type',
+        'banner_url',
+        'start_time',
+        'end_time',
+        'redirect_type'
+    ];
+}

app/Modules/Book/Services/RecoBannerService.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: z-yang
+ * Date: 2019/7/23
+ * Time: 14:47
+ */
+namespace App\Modules\Book\Services;
+
+use App\Modules\Book\Models\RecoBanner;
+
+class RecoBannerService
+{
+
+    public static function getByType(array $type){
+        $model = new RecoBanner();
+        return $model->whereIn('reco_type',$type)->where('start_time','<=',date('Y-m-d H:i:s'))
+            ->where('end_time','>=',date('Y-m-d H:i:s'))
+            ->select('redirect_url',
+                'banner_url')
+            ->get();
+    }
+
+}

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-18/css/app.7a31796c7887d9c3168a60ca47e59f45.css rel=stylesheet>
+    <link href=https://cdn-novel.iycdm.com/static2019-7-24/css/app.114a9c6c95057b302bac8f5709eac067.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-18/js/manifest.d22076b4a964595eed04.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-18/js/vendor.cd37d0f2c51da0dd309b.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-18/js/app.c178df4282ab7892cc0d.js></script>
+        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>
 </body>
 </html>