Merge pull request '二维码推广背景' (#517) from feature/qrcode_promotion into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/517
3 years ago · 5d973eef0f
parent fbfb8844bf 98458e341b
commit 5d973eef0f
2 changed files with 2 additions and 1 deletions
--- a/Application/Qrcode/Controller/JumpController.class.php
+++ b/Application/Qrcode/Controller/JumpController.class.php
@ -63,7 +63,8 @@ class JumpController extends HomeController
    {
        $isHttps = is_https();
        $backgroundImg = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/Public/Qrcode/images/b3.png";
-        $qrCodeImg = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/Public/Qrcode/images/qrcode.png";
+//        $qrCodeImg = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/Public/Qrcode/images/qrcode.png";
+        $qrCodeImg = '';
        $id = I('request.id', '');
        if (!$id || $id == 'undefined') {
            $this->ajaxReturn([
--- a/Public/Qrcode/images/b3.png
+++ b/Public/Qrcode/images/b3.png