Home Explore Help
Register Sign In
zhuishuyun
/
zhuishuyun_quickapp
10
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'stabble'

zz 6 years ago
parent
7017a3f0d1 73e90e61a0
commit
ce639c71f9
4 changed files with 14 additions and 10 deletions
Split View Show Diff Stats
  1. 2 1
      app/Http/Controllers/Wap/Book/ChapterController.php
  2. 2 0
      app/Http/Controllers/Wap/User/CoflController.php
  3. 6 5
      app/Http/Controllers/Wap/Web/WelcomeController.php
  4. 4 4
      resources/views/wap/index.blade.php

+ 2 - 1
app/Http/Controllers/Wap/Book/ChapterController.php
View File 

@@ -766,7 +766,8 @@ class ChapterController extends BaseController
 
         $this->initChapterDefaultField();
 
         //章节内容
 
         $chapter_content = ChapterService::getChapter($this->book_info->bid, $this->cid);
 
-        $this->chapter->content = str_replace($chapter_content->name, '', $chapter_content->content);
 
+        //$this->chapter->content = str_replace($chapter_content->name, '', $chapter_content->content);
 
+        $this->chapter->content = $chapter_content->content;
 
 
         //阅读记录
 
         ReadRecordService::addReadRecord(['uid' => $this->uid, 'bid' => $this->book_info->bid, 'book_name' => $this->book_info->book_name,

+ 2 - 0
app/Http/Controllers/Wap/User/CoflController.php
View File 

@@ -306,6 +306,8 @@ class CoflController extends Controller
 
         if($friend_link_uid_bind) {
 
             $user = User::where('id',$friend_link_uid_bind->uid)->select('id','distribution_channel_id')->first();
 
             if($user) {
 
+                \Log::info('user;'.json_encode($user));
 
+
 
                 return [$user->id,$user->distribution_channel_id];
 
             }
 
         }

+ 6 - 5
app/Http/Controllers/Wap/Web/WelcomeController.php
View File 

@@ -564,12 +564,13 @@ class WelcomeController extends BaseController
 
     }
 
 
     private function pddAd(){
 
-        $result = Redis::get('advertise:pdd');
 
-        if(!$result){
 
-            return [];
 
+        if(in_array($this->distribution_channel_id,[2,123,146,155,211,256,691,695,722,4025,4053,4174,4237,4241,4334,4364,4426,4427,4487,4593,4889,4891,5611])){
 
+            return [
 
+                'banner'=>'https://cdn-novel.iycdm.com/h5/20190531/banner.jpg',
 
+                'url'=>'https://m.ycsd.cn/reader/9F69C5F384552E71/663249E009CA5AC0?u=13002705&isLogin=1'
 
+            ];
 
         }
 
-        $result = json_decode($result,1);
 
-        return array_keys($result);
 
+        return '';
 
     }

+ 4 - 4
resources/views/wap/index.blade.php
View File 

@@ -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-5-24/css/app.3a48c20e0714df0c6165a7672fd10461.css rel=stylesheet>
 
+    <link href=https://cdn-novel.iycdm.com/static2019-5-31/css/app.c773f908339b68525ba2d605a5a09fda.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-5-24/js/manifest.120a3e504985353ca949.js></script>
 
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-5-24/js/vendor.171a7cafc999efe6724c.js></script>
 
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-5-24/js/app.28a541b216c1c6b349cb.js></script>
 
+        src=https://cdn-novel.iycdm.com/static2019-5-31/js/manifest.f3efd0a83a23b23049be.js></script>
 
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-5-31/js/vendor.171a7cafc999efe6724c.js></script>
 
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-5-31/js/app.e7928244d0bc7a5aaf21.js></script>
 
 </body>
 
 </html>