Browse Source

Merge branch 'master' into stabble

zz 6 years ago
parent
commit
621e27e684

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

@@ -1710,7 +1710,7 @@ class ChapterController extends BaseController
         if(!$ad_status){
         if(!$ad_status){
             return ;
             return ;
         }
         }
-        if(!in_array($this->distribution_channel_id,[5,8,123,146,148,155,160,196,202,211,255,256,266,271,273,318,691,722,4053,4236,4237,4241,4334,4364,4427,4487,4488])){
+        if(!in_array($this->distribution_channel_id,[2,5,14,8,123,146,148,155,160,196,202,211,255,256,266,271,273,318,691,722,4053,4236,4237,4241,4334,4364,4427,4487,4488])){
             return ;
             return ;
         }
         }
         //按章付费才显示
         //按章付费才显示

+ 8 - 9
resources/views/wap/index.blade.php

@@ -4,12 +4,12 @@
     <meta charset=utf-8>
     <meta charset=utf-8>
     <meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
     <meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
     <link rel=icon type=image/png href="data:image/png;base64,iVBORw0KGgo=">
     <link rel=icon type=image/png href="data:image/png;base64,iVBORw0KGgo=">
-    <script src="https://cdn-novel.iycdm.com/static/errOptions.js"></script>
-    <script src="https://cdn-novel.iycdm.com/static/vue.min.js"></script>
-    <script src="https://cdn-novel.iycdm.com/static/vue-router.min.js"></script>
-    <script src="https://cdn-novel.iycdm.com/static/vue-lazyload.js"></script>
+    <script>window.errOptions || document.write('<script src="https://cdn-novel.iycdm.com/static/errOptions.js"><\/script>')</script>
+    <script>window.Vue || document.write('<script src="https://cdn-novel.iycdm.com/static/vue.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>
     <title>{{$title}}</title>
     <title>{{$title}}</title>
-    <link href=https://cdn-novel.iycdm.com/static2019-2-15/css/app.9ebdc43cd4751d6c60f83ba636847ebf.css rel=stylesheet>
+    <link href=https://cdn-novel.iycdm.com/static2019-2-20/css/app.fc98b1bfa13b2ed853125e2ac391dcc0.css rel=stylesheet>
 </head>
 </head>
 <body>
 <body>
 <div id=app></div>
 <div id=app></div>
@@ -32,9 +32,8 @@
     })();</script>
     })();</script>
 <script>window.options = {!! $options!!};</script>
 <script>window.options = {!! $options!!};</script>
 <script type=text/javascript
 <script type=text/javascript
-        src=https://cdn-novel.iycdm.com/static2019-2-15/js/manifest.609c3dfc00e9b0525d26.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-2-15/js/vendor.ffff3089fc2f18220e2f.js></script>
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-2-15/js/app.73f12afe3189345d2852.js></script>
+        src=https://cdn-novel.iycdm.com/static2019-2-20/js/manifest.6065652dbc2cbd428344.js></script>
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-2-20/js/vendor.ffff3089fc2f18220e2f.js></script>
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-2-20/js/app.1fada14a4c8a146a2fb5.js></script>
 </body>
 </body>
-<script src=//cdn.ipadview.com/jssdk/combo.bundle.js></script>
 </html>
 </html>