瀏覽代碼

Merge remote-tracking branch 'origin/stabble' into stabble

tusx 6 年之前
父節點
當前提交
3507da6996

+ 7 - 7
app/Http/Controllers/Wap/Book/ChapterController.php

@@ -778,7 +778,7 @@ class ChapterController extends BaseController
         //#短篇推送长篇需求#
         //$this->shortPushLong();
         //#短推长、短推短对比
-        $this->shortPushshort();
+        //$this->shortPushshort();
         //阅读器分享
         $this->share();
         //广告
@@ -812,7 +812,8 @@ class ChapterController extends BaseController
         //阅读底部强关图片 只有123有
         $this->chapter->is_had_subscribe = 0;
         //广告
-        $this->chapter->is_show_ad = 0;
+        $this->chapter->is_show_ad = 0;//可不可点击
+        $this->chapter->is_visiable_ad = 0;//可不可显示
     }
 
     private function sign()
@@ -871,10 +872,6 @@ class ChapterController extends BaseController
         return false;
     }
 
-    private function getOfficialAccountForceReadNotice()
-    {
-
-    }
 
     //强关页面的统计
     private function subscribeStats()
@@ -1795,6 +1792,9 @@ class ChapterController extends BaseController
         //付费用户没有广告
         if(OrderService::isPaidUser($this->uid))  return ;
         //如果下一张已经付费,广告不显示
+        //广告都显示
+        $this->chapter->is_visiable_ad = 1;
+        AdVisitStatService::create($this->uid,$this->book_info->bid,$this->cid,'EXPOSURE');
         if($this->getOrderRecord($this->book_info->bid, $cid)){
             return ;
         }
@@ -1810,7 +1810,7 @@ class ChapterController extends BaseController
 
         if( $flag ){
             $this->chapter->is_show_ad = 1;
-            AdVisitStatService::create($this->uid,$this->book_info->bid,$this->cid,'EXPOSURE');
+            AdVisitStatService::create($this->uid,$this->book_info->bid,$this->cid,'CAN_CLICK');
         }
     }
 

+ 1 - 0
app/Http/Controllers/Wap/Book/Transformers/ChapterTransformer.php

@@ -33,6 +33,7 @@ class ChapterTransformer
             'share_url'=>isset($chapter->share_url)?$chapter->share_url:'',
             'js_config'=>isset($chapter->js_config)?$chapter->js_config:'',
             'is_show_ad'=>isset($chapter->is_show_ad)?$chapter->is_show_ad:'',
+            'is_visiable_ad'=>isset($chapter->is_visiable_ad)?$chapter->is_visiable_ad:0,
             //'is_had_subscribe'=>0
             //'is_need_subscirbe'   =>  $chapter->is_need_subscirbe,
         ];

+ 2 - 2
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-4-15/css/app.dc344e24d5e64a452d84b06f48008fa5.css rel=stylesheet>
+    <link href=https://cdn-novel.iycdm.com/static2019-4-15/css/app.d4b0d841448941738b356b5b47c81068.css rel=stylesheet>
 </head>
 <body>
 <div id=app></div>
@@ -32,7 +32,7 @@
     })();</script>
 <script id=options>window.options = {!! $options!!};</script>
 <script type=text/javascript
-        src=https://cdn-novel.iycdm.com/static2019-4-15/js/manifest.11e2044eeb462a0cfcd7.js></script>
+        src=https://cdn-novel.iycdm.com/static2019-4-15/js/manifest.000491709457aa596c79.js></script>
 <script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-4-15/js/vendor.ffff3089fc2f18220e2f.js></script>
 <script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-4-15/js/app.00627a040c0e8eafaee4.js></script>
 </body>