修改星球影院城市显示与隐藏

@@ -113,6 +113,7 @@ class EnjoyController extends HomeBaseController
             ->where('pid','<>',0)
             ->where('pid','<>',0)
             ->where('id','<>',CityCategoryModel::xqgh_cc)
             ->where('id','<>',CityCategoryModel::xqgh_cc)
             ->where('id','<>',CityCategoryModel::djxq)
             ->where('id','<>',CityCategoryModel::djxq)
+            ->where('is_show',1)
             ->where('delete_time',0)
             ->where('delete_time',0)
             ->field('id,name')->select()->toArray();
             ->field('id,name')->select()->toArray();
         return $res;
         return $res;

@@ -167,6 +167,7 @@ class RegionController extends HomeBaseController
         $res = Db::name('city_category')
         $res = Db::name('city_category')
             ->where('pid','<>',0)
             ->where('pid','<>',0)
             ->where('id','<>',CityCategoryModel::xqgh_cc)
             ->where('id','<>',CityCategoryModel::xqgh_cc)
+            ->where('is_show',1)
             ->where('delete_time',0)
             ->where('delete_time',0)
             ->field('id,name')->select()->toArray();
             ->field('id,name')->select()->toArray();
         return $res;
         return $res;

@@ -49,7 +49,7 @@
                 <form method="GET" action="/portal/enjoy/index">
                 <form method="GET" action="/portal/enjoy/index">
                     <input class="show_city" type="text" value="所有" readonly="readonly">
                     <input class="show_city" type="text" value="所有" readonly="readonly">
                     <img src="__TMPL__/public/assets/starImg/down.png" alt="">
                     <img src="__TMPL__/public/assets/starImg/down.png" alt="">
-                    <ul style="height:300px;overflow-y: scroll;width:240px;">
+                    <ul style="min-height:138px;max-height:300px;overflow-y: scroll;width:240px;">
                         <li>所有</li>
                         <li>所有</li>
                         <volist name="city_name" id="vo">
                         <volist name="city_name" id="vo">
                             <li value="{$vo.id}">{$vo.name}</li>
                             <li value="{$vo.id}">{$vo.name}</li>

@@ -45,7 +45,7 @@
                     <div class="select">
                     <div class="select">
                         <input type="text" class="show_city" value="所有" readonly="readonly">
                         <input type="text" class="show_city" value="所有" readonly="readonly">
                         <img src="__TMPL__/public/assets/starImg/down.png" alt="">
                         <img src="__TMPL__/public/assets/starImg/down.png" alt="">
-                        <ul style="height:300px;overflow-y: scroll;width:145px;">
+                        <ul style="min-height:130px;max-height:300px;overflow-y: scroll;width:145px;">
                             <li>所有</li>
                             <li>所有</li>
                             <volist name="city_name" id="vo">
                             <volist name="city_name" id="vo">
                                 <li value="{$vo.id}">{$vo.name}</li>
                                 <li value="{$vo.id}">{$vo.name}</li>