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

5 years ago · c8b184b877
parent 86fe5f1f9f 16814af0d2
commit c8b184b877
1 changed files with 7 additions and 1 deletions
--- a/Application/Admin/View/Query/marketList.html
+++ b/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,9 +281,13 @@
                    }
                });
            } else {
+
+                    $(_this).children().toggle();
+                if(display!='none') {
                    $(_this).children().toggle();
                }
            }
+        }

        $(function(){
            //搜索功能