fly il y a 5 ans
Parent
commit
0c4f3af7e8

+ 11 - 9
app/Http/Controllers/Wap/User/CrmBooklistController.php

@@ -10,8 +10,6 @@ use Hashids;
 
 class CrmBooklistController extends Controller
 {
-    private $channel_id;
-
     public function index(Request $request)
     {
         $month = date('n');
@@ -20,8 +18,6 @@ class CrmBooklistController extends Controller
 
     public function bookshow(Request $request)
     {
-        $user = app()->make('user');
-        $this->channel_id = $user->channel_id;
         $booklists = (new CrmBookAutoRecommendService)->getRecommendBooksFromRedis();
         $book_models = collect($booklists)->groupBy('category_id')
             ->map(function ($item, $key) {
@@ -33,7 +29,7 @@ class CrmBooklistController extends Controller
                     $item['link'] = sprintf(
                         '%s://site%s.%s.com/detail?id=%s',
                         env('PROTOCOL'),
-                        encodeDistributionChannelId($this->channel_id),
+                        encodeDistributionChannelId($this->getUserColumnValue('channel_id')),
                         env('CUSTOM_HOST'),
                         Hashids::encode($item['bid'])
                     );
@@ -46,8 +42,6 @@ class CrmBooklistController extends Controller
 
     public function booklist(Request $request)
     {
-        $user = app()->make('user');
-        $this->channel_id = $user->channel_id;
         $month = date('n');
         $category_id = $request->get('category_id', 0);
         $books = [];
@@ -57,13 +51,21 @@ class CrmBooklistController extends Controller
                 $item['link'] = sprintf(
                     '%s://site%s.%s.com/detail?id=%s',
                     env('PROTOCOL'),
-                    encodeDistributionChannelId($this->channel_id),
+                    encodeDistributionChannelId($this->getUserColumnValue('channel_id')),
                     env('CUSTOM_HOST'),
                     Hashids::encode($item['bid'])
                 );
                 return $item;
             })->all();
         }
-        return view('crm.booklist',compact('books', 'month'));#->with(compact('books', 'month'));
+        return view('crm.booklist', compact('books', 'month')); #->with(compact('books', 'month'));
+    }
+
+    private function getUserColumnValue(string $column)
+    {
+        $user = app()->make('user');
+        if ($user) {
+            return $user->$column;
+        }
     }
 }

+ 3 - 1
resources/views/crm/booklist.blade.php

@@ -25,7 +25,9 @@
             <div class="list-wrap">
                 @foreach ($books as $item)
                 <div class="list-item">
-                    <img class="cover" src="{{$item['cover']}}" alt="" />
+                    <a href="{{$item['link']}}">
+                        <img class="cover" src="{{$item['cover']}}" alt="" />
+                    </a>
                     <div class="item-info">
                         <a href="{{$item['link']}}">
                             <p class="name">{{$item['name']}}</p>

+ 15 - 8
resources/views/crm/bookshow.blade.php

@@ -27,26 +27,33 @@
       <p class="box-title">{{$book_model['category_name']}}</p>
       <div class="book-wrap">
         <div class="book-main">
-          <img class="cover" src="{{$book_model['books'][0]['cover']}}" alt="" />
+          <a href="{{$book_model['books'][0]['link']}}">
+            <img class="cover" src="{{$book_model['books'][0]['cover']}}" alt="" />
+          </a>
           <div class="book-info">
             <a href="{{$book_model['books'][0]['link']}}">
               <p class="name">《{{$book_model['books'][0]['name']}}》</p>
+              <p class="intro">
+                简介:{{$book_model['books'][0]['intro']}}
+              </p>
             </a>
-            <p class="intro">
-              简介:{{$book_model['books'][0]['intro']}}
-            </p>
             <div class="book-rate">
               @for($i=0;$i
-              <$book_model['books'][0]['star'];$i++) <img src="https://cdn-novel.iycdm.com/h5/crm_booklist/images/full-star.png" alt="" />
+              <$book_model['books'][0]['star'];$i++) <img
+                src="https://cdn-novel.iycdm.com/h5/crm_booklist/images/full-star.png" alt="" />
               @endfor
               @for($i=0;$i
-              <5-$book_model['books'][0]['star'];$i++) <img src="https://cdn-novel.iycdm.com/h5/crm_booklist/images/no-star.png" alt="" />
+              <5-$book_model['books'][0]['star'];$i++) <img
+                src="https://cdn-novel.iycdm.com/h5/crm_booklist/images/no-star.png" alt="" />
               @endfor
               <span>{{$book_model['books'][0]['recommend_index']}}分</span>
             </div>
             <div class="book-read">
-              <img src="https://cdn-novel.iycdm.com/h5/crm_booklist/images/free-read-btn.png" alt="" class="to-read" />
-              <a href="#">查看更多&gt;</a>
+              <a href="{{$book_model['books'][0]['link']}}">
+                <img src="https://cdn-novel.iycdm.com/h5/crm_booklist/images/free-read-btn.png" alt=""
+                  class="to-read" />
+              </a>
+              <a href="{{url('/crm/booklist?category_id='.$book_model['category_id'])}}">查看更多&gt;</a>
             </div>
           </div>
         </div>