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 5 years ago
parent
114ed91c3a 56011501a1
commit
abae430b65
2 changed files with 6 additions and 6 deletions
Split View Show Diff Stats
  1. 2 2
      app/Http/Controllers/Wap/Web/ActivityController.php
  2. 4 4
      resources/views/wap/index.blade.php

+ 2 - 2
app/Http/Controllers/Wap/Web/ActivityController.php
View File 

@@ -396,8 +396,8 @@ class ActivityController extends BaseController
 
         }
 
         //结束
 
         if (time() > strtotime($activity_info->end_time)) {
 
-            return view('pay.order.common', ['url' => [], 'code' => 2, 'img' => $imgs]);
 
-            //return view('pay.activity.summerHoliday', ['url' => ['javascript:void(0)', 'javascript:void(0)','javascript:void(0)'], 'code' => -2]);
 
+            //return view('pay.order.common', ['url' => [], 'code' => 2, 'img' => $imgs]);
 
+            return view('pay.activity.summerHoliday', ['url' => ['javascript:void(0)', 'javascript:void(0)','javascript:void(0)'], 'code' => -2]);
 
         }
 
         /*$url = [];
 
         foreach ($product_ids as $product_id) {

+ 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-7-24/css/app.114a9c6c95057b302bac8f5709eac067.css rel=stylesheet>
 
+    <link href=https://cdn-novel.iycdm.com/static2019-7-26/css/app.4251825a5328878f7948281866d47f1c.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-7-24/js/manifest.9f2f52724d189361546c.js></script>
 
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-24/js/vendor.fa223fb19e81cd0aa605.js></script>
 
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-24/js/app.c9cc0d0d174998aad7be.js></script>
 
+        src=https://cdn-novel.iycdm.com/static2019-7-26/js/manifest.db64e4310974e676f24e.js></script>
 
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-26/js/vendor.fa223fb19e81cd0aa605.js></script>
 
+<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-7-26/js/app.af5e191228d51cbb679a.js></script>
 
 </body>
 
 </html>