搜索词管理样式统一

dongjunjie
Commit 618071e4033be56f500750e1fd4ef8d8b0cb398a 1 parent bdacef8a
Showing 4 changed files with 25 additions and 38 deletions
code/apps/searchWords/controllers/index.js
code/apps/searchWords/views/HotBrand/Index.html
code/apps/searchWords/views/SearchWords/Index.html
code/static/js.jquery/module/searchWords/SearchWords/Index.js
--- a/code/apps/searchWords/controllers/index.js
View file @618071e
+++ b/code/apps/searchWords/controllers/index.js
View file @618071e
@@ -9,7 +9,8 @@ module.exports = function (app) {
     //列表页
     app.get("/operations/terms/index", "searchWords.SearchWords.Index",function(){
         this.$extend={
-            filter: true
+            moduleName:'搜索词管理',
+            pageName:'品牌热搜词'
         }
     });
@@ -27,8 +28,7 @@ module.exports = function (app) {
     app.get("/hotSearchBrand/index", "searchWords.HotBrand.Index",function(){
         this.$extend={
             moduleName:'搜索词管理',
-            pageName:'品牌热搜词',
-            filter: true
+            pageName:'品牌热搜词'
         }
     });
--- a/code/apps/searchWords/views/HotBrand/Index.html
View file @618071e
+++ b/code/apps/searchWords/views/HotBrand/Index.html
View file @618071e
 <%include '../../../common/views/__ui/header'%>
-
 <%include '../../../common/views/__partail/ListHeader'%>
 <div class="contentpanel">
     <div class="panel panel-default" style="...">
-        <div class="panel-heading">
-            <a id="addHotBrand" class="btn btn-primary">添加</a>
+        <div class="panel-body" style="padding-bottom: 0">
+            <a id="addHotBrand" class="btn btn-success"><i class="fa fa-plus"></i> 添加品牌热搜词</a>
         </div>
         <div class="panel-body">
             <div class="row">
--- a/code/apps/searchWords/views/SearchWords/Index.html
View file @618071e
+++ b/code/apps/searchWords/views/SearchWords/Index.html
View file @618071e
 <%include '../../../common/views/__ui/header'%>
-<div class="pageheader">
-    <div class="media">
-        <div class="pageicon pull-left">
-            <i class="fa fa-th-list"></i>
-        </div>
-        <div class="media-body">
+<%include '../../../common/views/__partail/ListHeader'%>
-        </div>
-    </div>
-</div>
 <div class="contentpanel">
     <div class="panel panel-default" style="...">
-        <div class="panel-heading">
-            <a id="filter-add" class="btn btn-primary">添加</a>
+        <div class="panel-body" style="padding-bottom: 0">
+            <a id="filter-add" class="btn btn-success"><i class="fa fa-plus"></i> 添加词汇</a>
         </div>
         <div class="panel-body" id="filter">
             <div class="row">
@@ -40,23 +32,21 @@
                         </select>
                     </div>
                 </div>
-                <div class="panel-col2">
+                <div class="panel-col">
                     <input type="text" id="starttime-filter" class="form-control panel-input hasDatepicker"
                            jsaction="time:end:endtime-filter" name="start_time" placeholder="开始时间" value="">
                 </div>
-                <div class="panel-col2">
+                <div class="panel-col">
                     <input type="text" id="endtime-filter" class="form-control panel-input hasDatepicker"
                            jsaction="time:start:starttime-filter" name="end_time" placeholder="结束时间" value="">
                 </div>
-                <div class="panel-col2">
+                <div class="panel-col">
                     <a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
                 </div>
             </div>
         </div>
     </div>
-    <div id="search-words-list" class="search-words">
-
-    </div>
+    <div id="search-words-list" class="search-words"></div>
 </div>
 <script type="text/template" id="template">
@@ -65,11 +55,9 @@
         <li><a href="">搜索词管理</a></li>
         <li id="header-item">[[name1]]</li>
     </ul>
-
     <div>
-        <div style="width: 30%;float: left;">
-            <h4 id="header-title">[[name2]]</h4>
-
+        <div style="padding-left: 0; font-family: 'Microsoft YaHei'">
+            <h4 id="header-title" style="line-height: 30px;font-size: 24px;margin-top: 2px">[[name2]]</h4>
         </div>
     </div>
 </script>
--- a/code/static/js.jquery/module/searchWords/SearchWords/Index.js
View file @618071e
+++ b/code/static/js.jquery/module/searchWords/SearchWords/Index.js
View file @618071e
@@ -72,13 +72,13 @@ var Bll = {
     _render1: function () {
         //只有默认热搜词才显示时间选择
         if (parseInt(type) == PagEnum.DEF_HOT_SEARCH_WORDS) {
-            $('#starttime-filter').show();
-            $('#endtime-filter').show();
-            $('#channel-ops').show();
+            $('#starttime-filter').parent().show();
+            $('#endtime-filter').parent().show();
+            $('#channel-ops').parent().parent().show();
         } else {
-            $('#starttime-filter').hide();
-            $('#endtime-filter').hide();
-            $('#channel-ops').hide();
+            $('#starttime-filter').parent().hide();
+            $('#endtime-filter').parent().hide();
+            $('#channel-ops').parent().parent().hide();
         }
         var tem = common.util.__template2($("#template").html(), titles[parseInt(type)]);
         $(".media-body").html(tem);
@@ -200,7 +200,7 @@ var g = new common.grid({
                     {display: "修改时间", name: "modifyTime"},
                     {
                         display: "操作", name: "", render: function (item) {
-                        return '<a class="btn btn-info modify"  data-index="' + item.__index + '">修改</a>';
+                        return '<a class="btn btn-xs btn-info modify"  data-index="' + item.__index + '">修改</a>';
                     }
                     }
                 ];
@@ -227,7 +227,7 @@ var g = new common.grid({
                     {display: "修改时间", name: "modifyTime"},
                     {
                         display: "操作", name: "", render: function (item) {
-                        return '<a class="btn btn-info modify" data-index="' + item.__index + '">修改</a>';
+                        return '<a class="btn btn-xs btn-info modify" data-index="' + item.__index + '">修改</a>';
                     }
                     }
                 ];
@@ -260,7 +260,7 @@ var g = new common.grid({
                     {display: "修改时间", name: "modifyTime"},
                     {
                         display: "操作", name: "", render: function (item) {
-                        return '<a class="btn btn-info modify" data-index="' + item.__index + '">修改</a>';
+                        return '<a class="btn btn-xs btn-info modify" data-index="' + item.__index + '">修改</a>';
                     }
                     }
                 ];
@@ -285,7 +285,7 @@ var g = new common.grid({
                     {display: "修改时间", name: "modifyTime"},
                     {
                         display: "操作", name: "", render: function (item) {
-                        return '<a class="btn btn-info modify" data-index="' + item.__index + '">修改</a>';
+                        return '<a class="btn btn-xs btn-info modify" data-index="' + item.__index + '">修改</a>';
                     }
                     }
                 ];
@@ -310,7 +310,7 @@ var g = new common.grid({
                     {display: "修改时间", name: "modifyTime"},
                     {
                         display: "操作", name: "", render: function (item) {
-                        return '<a class="btn btn-info modify"  data-index="' + item.__index + '">修改</a>';
+                        return '<a class="btn btn-xs btn-info modify"  data-index="' + item.__index + '">修改</a>';
                     }
                     }
                 ];