Home Explore Help
Register Sign In
zhuishuyun
/
zhuishuyun_quickapp
10
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

dist conflict

zz 5 years ago
parent
be801ac3e3 1d9354d786
commit
9a958f6882
5 changed files with 42 additions and 32 deletions
Split View Show Diff Stats
  1. 16 2
      app/Http/Controllers/Wap/Pay/OrdersController.php
  2. 4 2
      app/Http/Controllers/Wap/User/CoflController.php
  3. 1 1
      app/Http/Controllers/Wap/Web/WelcomeController.php
  4. 13 0
      app/Modules/OfficialAccount/Services/OfficialAccountService.php
  5. 8 27
      resources/views/wap/index.blade.php

File diff suppressed because it is too large
+ 16 - 2
app/Http/Controllers/Wap/Pay/OrdersController.php


+ 4 - 2
app/Http/Controllers/Wap/User/CoflController.php
View File 

@@ -103,13 +103,15 @@ class CoflController extends Controller
 
         $source = $request->get('wx','none');
 
         $type = 'CRM';
 
         if($uri == 'freethrhcurrency'){
 
-            $fee = 300;
 
+            //$fee = 300;
 
+            $fee = 500;
 
             $this->stats('reward_300',$crm);
 
         }elseif($uri == 'wfreecurrency'){
 
             $fee = 200;
 
             $type = 'WCRM';
 
         }elseif ($uri == 'frocefreethrhcurrency'){
 
-            $fee = 200;
 
+            //$fee = 200;
 
+            $fee = 500;
 
             $type = 'CRM_FORCE';
 
         }
 
         else{

+ 1 - 1
app/Http/Controllers/Wap/Web/WelcomeController.php
View File 

@@ -2150,7 +2150,7 @@ class WelcomeController extends BaseController
 
         }
 
         //Log::info('guidePersonalAccount555555555555555');
 
         if($charge){
 
-            return ['title'=>'点击领取200书币>>','link'=>'/guidestrem?uid='.$this->uid];
 
+            return ['title'=>'您有500书币待领取>>','link'=>'/guidestrem?uid='.$this->uid];
 
         }
 
         return '';
 
     }

+ 13 - 0
app/Modules/OfficialAccount/Services/OfficialAccountService.php
View File 

@@ -658,4 +658,17 @@ class OfficialAccountService
 
     {
 
         return OfficialAccount::getBusinessChannelData($channels, $distribution_channel_name, $official_account_name,$isAll);
 
     }
 
+
 
+    /**
 
+     * 获取置顶地址
 
+     */
 
+    static function getTopUrl($service_type_info = 2)
 
+    {
 
+        if($service_type_info == 1)
 
+        {
 
+            return 'https://help.'. env('WECHAT_CUSTOM_HOST') .'.com/top2.html';
 
+        }else{
 
+            return 'https://help.'. env('WECHAT_CUSTOM_HOST') .'.com/top.html';
 
+        }
 
+    }
 
 }

+ 8 - 27
resources/views/wap/index.blade.php
View File 

@@ -1,19 +1,7 @@
 
-<!DOCTYPE html>
 
-<html>
 
-<head>
 
-    <meta charset=utf-8>
 
-    <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=">
 
-    <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>
 
-    <link href=https://cdn-novel.iycdm.com/static2019-8-6/css/app.dbad105ca37bbc7083af10d1f386cb72.css rel=stylesheet>
 
-</head>
 
-<body>
 
-<div id=app></div>
 
-<script>var _mtac = {};
 
+<!DOCTYPE html><html><head><meta charset=utf-8><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="><script>window.errOptions || document.wri
 
+        te('<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><lin
 
+            k href=https://cdn-novel.iycdm.com/static2019-8-6/css/app.dbad105ca37bbc7083af10d1f386cb72.css rel=stylesheet></head><body><div id=app></div><script>var _mtac = {};
 
     (function () {
 
         var mta = document.createElement("script");
 
         mta.src = "https://pingjs.qq.com/h5/stats.js?v2.0.2";
 
@@ -21,19 +9,12 @@
 
         mta.setAttribute("sid", "500633040");
 
         var s = document.getElementsByTagName("script")[0];
 
         s.parentNode.insertBefore(mta, s);
 
-    })();</script>
 
-<script>var _hmt = window._hmt || [];
 
+    })();</script><script>var _hmt = window._hmt || [];
 
     (function () {
 
         var hm = document.createElement("script");
 
         hm.src = "https://hm.baidu.com/hm.js?a027c0fdf2b6e70f1892dbd8227cbb2b";
 
         var s = document.getElementsByTagName("script")[0];
 
         s.parentNode.insertBefore(hm, s);
 
-        window._hmt.push(['_setAutoPageview', false])
 
-    })();</script>
 
-<script id=options>window.options = {!! $options!!};</script>
 
-<script type=text/javascript
 
-        src=https://cdn-novel.iycdm.com/static2019-8-6/js/manifest.805d1c033fb3dc77b6e7.js></script>
 
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-8-6/js/vendor.67516a6a43f9adc48771.js></script>
 
-<script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-8-6/js/app.200c9f90582284fca6b3.js></script>
 
-</body>
 
-</html>
 
+        window._hmt.push(['_setAutoPageview',false])
 
+    })();</script><script id=options>window.options = {!! $options!!};</script><script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-8-6/js/manifest.c5eeef8e7eabe877721d.js></script><script type=text/javascript src=https://cdn-novel.iycdm.c
 
+                                                                                                                                                                                                                om/static2019-8-6/js/vendor.67516a6a43f9adc48771.js></script><script type=text/javascript src=https://cdn-novel.iycdm.com/static2019-8-6/js/app.200c9f90582284fca6b3.js></script></body></html>