Merge branch 'dev' of 47.111.118.107:/srv/git/platform

Application/Home/View/default/Apply/my_game.html

@@ -245,11 +245,10 @@
                       }
                     }
 
-                    echo $qrcode;
+                    $qrcodes = $qrcode;
-
+                    $qrcode = base64_encode(base64_encode($qrcode));
-                    $qrcode = base64_encode(base64_encode(get_cover($vo['icon'],'path')));
                     ?>
-										<div class="game-operating" style="width: 35%;">
+										<div class="game-operating" data-url="{$qrcodes}" style="width: 35%;">
                       <if condition="$promoteRole == 1">
                         <span class="add-game" game-id="{$vo.id}" promote-type="2" style="cursor: pointer;margin-right: 10px;"><u>添加组长游戏</u></span>
                         <span class="add-game" game-id="{$vo.id}" promote-type="3" style="cursor: pointer;margin-right: 10px;"><u>添加推广员游戏</u></span>