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

Application/Admin/View/Query/marketList.html

@@ -265,7 +265,9 @@
             console.log(game_name)
             console.log(count_date)
             console.log(device)
+            var display=$(_this).children().css('display');
             $(".tooltiptext").hide();
+            console.log(display)
             if ($(_this).children().children().text()=='') {
                 $.ajax({
                     url: "{:U('Query/getChannelStream')}",
@@ -279,7 +281,11 @@
                     }
                 });
             } else {
-                $(_this).children().toggle();
+
+                    $(_this).children().toggle();
+                if(display!='none') {
+                    $(_this).children().toggle();
+                }
             }
         }