Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/rebate_xlqy

Application/Qrcode/Controller/JumpController.class.php

@@ -62,8 +62,9 @@ class JumpController extends HomeController
     public function getImgs()
     {
         $isHttps = is_https();
-        $backgroundImg = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/Public/Qrcode/images/b1.png";
+        $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([
@@ -84,6 +85,7 @@ class JumpController extends HomeController
             ]);
         }
         $qrcode = json_decode($qrcodePromotionList['qrcode_img'], true);
+        $qrcode = array_values($qrcode);
         $qrcodeCnt = count($qrcode);
         $intervalMin = $qrcodePromotionList['interval_min'];
         $elapseMin = floor((time() - $qrcodePromotionList['create_time']) / 60);

Application/Qrcode/Controller/QrCodePromotionController.class.php

@@ -203,7 +203,7 @@ class QrCodePromotionController extends BaseController
             ]);
             if ($id > 0) {
                 $uniqueStr = $this->getUniqueStr();
-                $h5Link = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/index.php?s=/Qrcode/Jump/jumpMp/{$uniqueStr}";
+                $h5Link = "https://game.wmtxkj.com"."/index.php?s=/Qrcode/Jump/jumpMp/{$uniqueStr}";
                 $shortLink = $this->getShortUrl($h5Link);
 
                 M('qrcode_promotion_list', 'tab_')->where(['id' => $id])->save([