bjdevs · bjdevs · Jul 10, 2017 · May 18, 2017 · May 18, 2017 · May 23, 2017
diff --git a/src/main/java/com/core/service/HomePageService.java b/src/main/java/com/core/service/HomePageService.java
@@ -408,6 +408,7 @@ public void staticNotice(long userId) throws Exception {
      */
     public String articlePublish(long id, String type) {
         String staticResPrefix = config.getStaticResourceURLPrefix();
+        String listDomain = config.getListDomain();
 
         ToolContext toolManagerContext = toolManager.createContext();
 
@@ -524,7 +525,7 @@ private Map<String, Object> staticOtherModules(int articleId, int different) thr
         List<String[]> other;
         int maxLimit = 4;
         if (articleId == Constant.CATEGORY_ID_NEWS) {
-            maxLimit = 13;
+            maxLimit = 12;
         } else if (articleId == Constant.CATEGORY_ID_DEPOSITORY) {
             maxLimit = 7;
         } else if (articleId == Constant.CATEGORY_ID_LIFE || articleId == Constant.CATEGORY_ID_ZIYUNFOGUO) {
@@ -694,12 +695,15 @@ private Map<String, Object> staticOtherModules(int articleId, int different) thr
     public ObjectNode staticArticleList() {
         ObjectNode objectNode = objectMapper.createObjectNode();
         String staticResPrefix = config.getStaticResourceURLPrefix();
+//        String listDomain = config.getListDomain();
+
         ToolContext toolManagerContext = toolManager.createContext();
 
         String path = System.getProperty("webapp.root") + "WEB-INF" + File.separator + "admin";
 
         //返回绑定的文件路径
         toolManagerContext.put("resURLPrefix", staticResPrefix);
+//        toolManagerContext.put("listURLPrefix", listDomain);
 
         create(path + "/articleList.jsp", "base/articleList.vm", toolManagerContext, "jsp");
         create(path + "/photoList.jsp", "base/photoList.vm", toolManagerContext, "jsp");

diff --git a/src/main/webapp/WEB-INF/admin/articleList.jsp b/src/main/webapp/WEB-INF/admin/articleList.jsp
@@ -9,9 +9,17 @@
     <title>${winTitle}</title>
     <meta name="author" content="4what"/>
     <meta name="description" content="黄梅老祖寺 ${depict}"/>
-    <meta name="keywords" content="黄梅老祖寺 ${keyWord}"/>
-
+    <meta name="keywords" content="老祖寺,黄梅老祖寺,紫云山,${keyWord}"/>
+    <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main.css?v=1.0?v=1.0" />
     <link rel="stylesheet" type="text/css" href="http://www.hmlzs.me:8080/article/static/lzs/css/style.css"/>
+    <style type="text/css">
+        #container{
+            margin:0;
+            height:100%;
+            width:100%;
+            font-size:12px;
+        }
+    </style>
 </head>
 
 <body>
@@ -35,8 +43,7 @@
         <div class="header">
             <div class="wrapper">
                 <h1><a href="http://www.hmlzs.cn"><img src="http://www.hmlzs.me:8080/article/static/lzs/images/logo.png" alt="黄梅老祖寺"/></a></h1>
-
-                <form action="${listURLPrefix}/search" method="get" id="search-frm" class="search">
+                <form action="${listURLPrefix}search" method="get" id="search-frm" class="search">
                     <div>
                         <div class="keyword"><input type="text" name="kw" value=""/></div>
                         <input type="submit" name="" value="搜索" class="submit"/>
@@ -118,12 +125,16 @@
 
 <script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/jquery.qrcode.min.js></script>
 
-<script type="text/javascript" src='http://webapi.amap.com/maps?v=1.3&key=aa83bb67a3b8592e7b3aaf2674b6a50b'></script>
+<script src="http://cache.amap.com/lbs/static/es5.min.js"></script>
+<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=aa83bb67a3b8592e7b3aaf2674b6a50b&plugin=AMap.ToolBar"></script>
+
 <script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/map_main.js"></script>
+<script type="text/javascript" src="http://webapi.amap.com/ui/1.0/main.js"></script>
 <script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/map.js"></script>
 
 
 
+
 <!-- page analytics -->
 <script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/analytics.js></script>
 
@@ -208,6 +219,10 @@
     var pageCnt = ${list.totalPage};
     var page = ${list.pageNum};
     var listUrl = ${listUrl};
+
+    $('#contact li:eq(2) > span').text("");
+    $('#contact li:eq(2)').css("text-align", "center");
+    $('#map_container').css("width", "270px");
 </script>
 <script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/paginate.js"></script>
 </body>

diff --git a/src/main/webapp/WEB-INF/admin/photoList.jsp b/src/main/webapp/WEB-INF/admin/photoList.jsp
@@ -9,9 +9,17 @@
     <title>${winTitle}</title>
     <meta name="author" content="4what"/>
     <meta name="description" content="黄梅老祖寺 ${depict}"/>
-    <meta name="keywords" content="黄梅老祖寺 ${keyWord}"/>
-
+    <meta name="keywords" content="老祖寺,黄梅老祖寺,紫云山,${keyWord}"/>
+    <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main.css?v=1.0?v=1.0" />
     <link rel="stylesheet" type="text/css" href="http://www.hmlzs.me:8080/article/static/lzs/css/style.css"/>
+    <style type="text/css">
+        #container{
+            margin:0;
+            height:100%;
+            width:100%;
+            font-size:12px;
+        }
+    </style>
 </head>
 
 <body>
@@ -35,8 +43,7 @@
         <div class="header">
             <div class="wrapper">
                 <h1><a href="http://www.hmlzs.cn"><img src="http://www.hmlzs.me:8080/article/static/lzs/images/logo.png" alt="黄梅老祖寺"/></a></h1>
-
-                <form action="${listURLPrefix}/search" method="get" id="search-frm" class="search">
+                <form action="${listURLPrefix}search" method="get" id="search-frm" class="search">
                     <div>
                         <div class="keyword"><input type="text" name="kw" value=""/></div>
                         <input type="submit" name="" value="搜索" class="submit"/>
@@ -114,12 +121,16 @@
 
 <script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/jquery.qrcode.min.js></script>
 
-<script type="text/javascript" src='http://webapi.amap.com/maps?v=1.3&key=aa83bb67a3b8592e7b3aaf2674b6a50b'></script>
+<script src="http://cache.amap.com/lbs/static/es5.min.js"></script>
+<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=aa83bb67a3b8592e7b3aaf2674b6a50b&plugin=AMap.ToolBar"></script>
+
 <script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/map_main.js"></script>
+<script type="text/javascript" src="http://webapi.amap.com/ui/1.0/main.js"></script>
 <script type="text/javascript" src="http://www.hmlzs.me:8080/article/static/lzs/js/map.js"></script>
 
 
 
+
 <!-- page analytics -->
 <script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/analytics.js></script>
 
@@ -204,6 +215,10 @@
     var pageCnt = ${list.totalPage};
     var page = ${list.pageNum};
     var listUrl = ${listUrl};
+
+    $('li > span:eq(2)').text("");
+    $('#contact > ul > li:gt(1)').css("text-align", "center");
+
 </script>
 <script type="text/javascript" src=http://www.hmlzs.me:8080/article/static/lzs/js/paginate.js></script>
 </body>

diff --git a/src/main/webapp/app/temp/app/view/content/headline/picture/PictureMainForm.js b/src/main/webapp/app/temp/app/view/content/headline/picture/PictureMainForm.js
@@ -24,7 +24,7 @@ Ext.define('Admin.view.content.headline.picture.PictureMainForm', {
                 xtype: 'panel',
                 region: 'center',
                 layout: 'form',
-                minHeight: 400,
+                // minHeight: 400,
                 border: false,
                 scrollable: 'y',
                 items: [

diff --git a/src/main/webapp/app/temp/app/view/main/Main.js b/src/main/webapp/app/temp/app/view/main/Main.js
@@ -31,8 +31,11 @@ Ext.define('Admin.view.main.Main', {
                 height: 60,
                 items: [
                     {
-                        xtype: 'image',
+                        /*xtype: 'image',
                         src: 'http://www.hmlzs.cn/static/lzs/images/logo.png',
+                        userCls: 'admin-header-logo'*/
+                        xtype: 'label',
+                        html: '<a href="http://www.hmlzs.cn" target="_blank"><img src="http://www.hmlzs.cn/static/lzs/images/logo.png"></a>',
                         userCls: 'admin-header-logo'
                     },
                    /* {