Merge remote-tracking branch 'origin/dev' into dev

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

@@ -235,7 +235,11 @@
 												<span>游戏类型:<span>{$vo.game_type_name}</span>&nbsp;&nbsp;</span>
 											</p>
 										</div>
-                    <?php $qrcode = base64_encode(base64_encode(get_cover($vo['icon'],'path')));?>
+                    <?php
+                    $qrcode = get_cover($vo['icon'],'path');
+                    if (stripos($qrcode,'http') === false) {$qrcode = C('APPLY_DOWN_DOMAIN');}
+                    $qrcode = base64_encode(base64_encode(get_cover($vo['icon'],'path')));
+                    ?>
 										<div class="game-operating" 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>