首页 发现 帮助
注册 登录
zhuishuyun
/
zhuishuyun_quickapp
10
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'master' of iqiyoo:zhuishuyun_wap

onlinetest 6 年之前
父节点
51afbb1794 d6f72b634d
当前提交
1433207f9d
共有 3 个文件被更改，包括 8 次插入 和 6 次删除
合并视图 显示文件统计
  1. 3 1
      app/Http/Controllers/Wap/Book/ChapterController.php
  2. 1 1
      app/Http/Controllers/Wap/Book/Transformers/ChapterTransformer.php
  3. 4 4
      resources/views/wap/index.blade.php

+ 3 - 1
app/Http/Controllers/Wap/Book/ChapterController.php
查看文件 

@@ -1698,7 +1698,9 @@ class ChapterController extends BaseController
 
         //智能推送 测书统计章节uv
 
         //智能推送 测书统计章节uv
 
         if ($chapter->sequence <= 60) {
 
         if ($chapter->sequence <= 60) {
 
             //测书数据 由30改到60 2018-11-26 18:00
 
             //测书数据 由30改到60 2018-11-26 18:00
 
-            //$this->smartPushTestBookChapterUv($bid, $chapter->sequence); //2019-07-09 10:30 cancel
 
+            if($this->book_info->test_status == 1){
 
+                $this->smartPushTestBookChapterUv($bid, $chapter->sequence); //2019-07-09 10:30 cancel
 
+            }
 
         }
 
         }
 
         //智能推送 测书统计第二章 uv
 
         //智能推送 测书统计第二章 uv
 
         if ($chapter->sequence == 2) {
 
         if ($chapter->sequence == 2) {

+ 1 - 1
app/Http/Controllers/Wap/Book/Transformers/ChapterTransformer.php
查看文件 

@@ -17,7 +17,7 @@ class ChapterTransformer
 
             'prev_cid'   =>  $chapter->prev_cid,
 
             'prev_cid'   =>  $chapter->prev_cid,
 
             'next_cid'   =>  $chapter->next_cid,
 
             'next_cid'   =>  $chapter->next_cid,
 
             'recent_update_at'   =>  $chapter->recent_update_at,
 
             'recent_update_at'   =>  $chapter->recent_update_at,
 
-            'chapter_content'   =>  $chapter->content,
 
+            'chapter_content'   =>  preg_replace("/\n+/","\n",$chapter->content),
 
             'sign_status'   =>  $chapter->sign_status,
 
             'sign_status'   =>  $chapter->sign_status,
 
             'sign_reard'   =>  isset($chapter->sign_reard)?$chapter->sign_reard:0,
 
             'sign_reard'   =>  isset($chapter->sign_reard)?$chapter->sign_reard:0,
 
             'sign_days'   =>  isset($chapter->sign_days)?$chapter->sign_days:0,
 
             'sign_days'   =>  isset($chapter->sign_days)?$chapter->sign_days:0,

+ 4 - 4
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.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>
 
     <script>(window.Vue && window.VueLazyload) || document.write('<script src="https://cdn-novel.iycdm.com/static/vue-lazyload.js"><\/script>')</script>
 
     <title>{{$title}}</title>
 
     <title>{{$title}}</title>
 
-    <link href=https://cdn-novel.iycdm.com/static2019-7-31/css/app.924cd356e44e4ab8a47c25a7485d3f6e.css rel=stylesheet>
 
+    <link href=https://cdn-novel.iycdm.com/static2019-8-1/css/app.573de38fd36e46ece26aa959c23ae12d.css rel=stylesheet>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <div id=app></div>
 
 <div id=app></div>
 
@@ -32,8 +32,8 @@
 
     })();</script>
 
     })();</script>
 
 <script id=options>window.options = {!! $options!!};</script>
 
 <script id=options>window.options = {!! $options!!};</script>
 
 <script type=text/javascript
 
 <script type=text/javascript
 
-        src=https://cdn-novel.iycdm.com/static2019-7-31/js/manifest.50e08a92cf515c0c7cea.js></script>
 
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-31/js/vendor.67516a6a43f9adc48771.js></script>
 
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-31/js/app.318862f944c8bb5c5f7f.js></script>
 
+        src=https://cdn-novel.iycdm.com/static2019-8-1/js/manifest.dfa0db50180fb7b00c98.js></script>
 
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-8-1/js/vendor.67516a6a43f9adc48771.js></script>
 
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-8-1/js/app.82273e31eaba2bd73565.js></script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>