首頁 探索 說明
註冊 登入
zhuishuyun
/
zhuishuyun_quickapp
10
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'stabble' of iqiyoo:zhuishuyun_wap

onlinetest 6 年之前
父節點
30d7e6730a b34ed39eff
當前提交
8b7ec2e860
共有 4 個文件被更改，包括 15 次插入 和 17 次删除
分割檢視 顯示文件統計
  1. 2 2
      app/Http/Controllers/Wap/Book/ChapterController.php
  2. 2 2
      app/Http/Controllers/Wap/Order/OrdersController.php
  3. 5 7
      app/Http/Controllers/Wap/Web/WelcomeController.php
  4. 6 6
      resources/views/pay/order/yearactivityV3.blade.php

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

@@ -1810,7 +1810,7 @@ class ChapterController extends BaseController
 
         //付费用户没有广告
 
         if(OrderService::isPaidUser($this->uid))  return ;
 
         //如果下一张已经付费，广告不显示
 
-        $exists = AdVisitStatService::getByUid($this->uid);
 
+        /*$exists = AdVisitStatService::getByUid($this->uid);
 
         if(!$exists){
 
             if($this->uid %2 == 0){
 
                 DataAnalysisSelectUserService::create($this->uid,$this->distribution_channel_id,'AD_TEST_3',-1,'unshow');
 
@@ -1818,7 +1818,7 @@ class ChapterController extends BaseController
 
             }else{
 
                 DataAnalysisSelectUserService::create($this->uid,$this->distribution_channel_id,'AD_TEST_3',-1,'show');
 
             }
 
-        }
 
+        }*/
 
         //广告都显示
 
         $this->chapter->is_visiable_ad = 1;
 
         AdVisitStatService::create($this->uid,$this->book_info->bid,$this->cid,'EXPOSURE');

+ 2 - 2
app/Http/Controllers/Wap/Order/OrdersController.php
查看文件 

@@ -229,11 +229,11 @@ class OrdersController extends BaseController
 
             $template_id = $male_site_template;
 
         }
 
 
-        if($book_config && $book_config->charge_type == 'BOOK'){
 
+        /*if($book_config && $book_config->charge_type == 'BOOK'){
 
             if( ($compare_id = $this->templateCompareV3()) ){
 
                 $template_id = $compare_id;
 
             }
 
-        }
 
+        }*/
 
         /*if( ($compare_id = $this->templateCompare()) ){
 
             $template_id = $compare_id;
 
         }*/

+ 5 - 7
app/Http/Controllers/Wap/Web/WelcomeController.php
查看文件 

@@ -437,17 +437,15 @@ class WelcomeController extends BaseController
 
                 if ($sites && in_array($this->distribution_channel_id, explode(',', $sites))) {
 
                     $is_show_activity = 1;
 
                     $bottom_show_type = 2;
 
-                    /*$old_discount_coupon = DB::table('discount_coupons')->where('uid', $this->uid)->whereIn('activity_id', [643, 827,1104])->count();
 
+                    $old_discount_coupon = DB::table('discount_coupons')->where('uid', $this->uid)->whereIn('activity_id', [643, 827,1104])->count();
 
                     if ($old_discount_coupon) {
 
-                        $activity_img = 'https://cdn-novel.iycdm.com/h5/activity-2018-08-29/reader-80.png';
 
+                        $activity_img = 'https://cdn-novel.iycdm.com/h5/activity-2019-05-10/reader-80.jpg';
 
                     } else {
 
-                        $activity_img = 'https://cdn-novel.iycdm.com/h5/activity-2018-08-29/reader-50.png';
 
-                    }*/
 
+                        $activity_img = 'https://cdn-novel.iycdm.com/h5/activity-2019-05-10/reader-50.jpg';
 
+                    }
 
 
-                    $activity_img = 'https://cdn-novel.iycdm.com/h5/activity-2018-12-20/reader-banner.jpg';
 
+                    //$activity_img = 'https://cdn-novel.iycdm.com/h5/activity-2018-12-20/reader-banner.jpg';
 
                     $url = $h5_scheme . '://' . _domain() . '/sale/yearActivity?fromtype=reader-year';
 
-                    //$url = $h5_scheme . '://' . _domain() . '/sale/chongyang?fromtype=reader-year';
 
-                    //$url = $h5_scheme . '://' . _domain() . '/sale/summer?fromtype=reader-year';
 
                 }
 
             }
 
         }

+ 6 - 6
resources/views/pay/order/yearactivityV3.blade.php
查看文件 

@@ -157,7 +157,7 @@
 
 <body>
 
 <main class="main_box">
 
     <div class="banner">
 
-        <img src="https://cdn-novel.iycdm.com/h5/activity-2018-12-20/banner.jpg" alt="">
 
+        <img src="https://cdn-novel.iycdm.com/h5/activity-2019-05-10/banner.png" alt="">
 
     </div>
 
     <p class="intro">
 
         365天内，全站书籍免费看！无需额外付费！最新最火最热门小说一网打尽，限时低价，机会难得，赶快订购吧！
 
@@ -165,9 +165,9 @@
 
     <input type="hidden" name="is_get" value="{{$is_get}}">
 
     <div class="coupon" data-value="{{$discount}}">
 
         @if($discount == 50)
 
-            <img src="https://cdn-novel.iycdm.com/h5/activity-2018-12-20/coupon_pick.png" alt="">
 
+            <img src="https://cdn-novel.iycdm.com/h5/activity-2019-05-10/coupon_pick.png" alt="">
 
         @else
 
-            <img src="https://cdn-novel.iycdm.com/h5/activity-2018-12-20/coupon_pick_80.png" alt="">
 
+            <img src="https://cdn-novel.iycdm.com/h5/activity-2019-05-10/coupon_pick_80.png" alt="">
 
         @endif
 
     </div>
 
     @if($discount == 50)
 
@@ -182,7 +182,7 @@
 
         <!-- 活动进行中 -->
 
             <a class="purchase doing" href="{{$coupons_url}}" id="js-purchase-doing">
 
                 {{-- <img src="https://cdn-novel.iycdm.com/h5/year_doing.png" alt="">--}}
 
-                <img src="https://cdn-novel.iycdm.com/h5/activity-2018-09-14/button.png" alt="">
 
+                <img src="https://cdn-novel.iycdm.com/h5/activity-2019-05-10/button.png" alt="">
 
             </a>
 
     @elseif($code == 1)
 
         <!-- 活动未开始 -->
 
@@ -219,9 +219,9 @@
 
 <div class="coupon-dialog" style="display:none">
 
     <div class="dialog-box">
 
         @if($discount == 80)
 
-            <img src="https://cdn-novel.iycdm.com/h5/activity-2018-12-20/dialog80.png" alt="">
 
+            <img src="https://cdn-novel.iycdm.com/h5/activity-2019-05-10/dialog80.png" alt="">
 
         @else
 
-            <img src="https://cdn-novel.iycdm.com/h5/activity-2018-12-20/dialog50.png" alt="">
 
+            <img src="https://cdn-novel.iycdm.com/h5/activity-2019-05-10/dialog50.png" alt="">
 
         @endif
 
         <div class="close"></div>
 
     </div>