From c18928b3df7f7d785ef07adc20385524e51d3b37 Mon Sep 17 00:00:00 2001
From: shenzi <shenzi@theyeasy.com>
Date: Tue, 9 Jan 2018 11:16:13 +0800
Subject: [PATCH] 更新

---
 WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp | 11 ++++++-----
 WebContent/WEB-INF/jsp/pc/banner/bannerList.jsp     | 12 ++++++------
 WebContent/WEB-INF/jsp/pc/index.jsp                 |  4 ++--
 WebContent/WEB-INF/res/plugins/datas/nav.js         | 12 ++++++------
 4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
index 97d5679..564184d 100644
--- a/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
+++ b/WebContent/WEB-INF/jsp/pc/activity/activityEdit.jsp
@@ -83,6 +83,11 @@
 		<script src='/zzhnc/res/js/jquery.min.js'></script>
 		<script src="/zzhnc/res/plugins/layui/layui.js" charset="utf-8"></script>
 		<script type="text/javascript" src="/zzhnc/res/js/me.js"></script>
+		<!-- 配置文件 -->
+		<script type="text/javascript" src="/zzhnc/res/UE/ueditor.config.js"></script>
+		<!-- 编辑器源码文件 -->
+		<script type="text/javascript" src="/zzhnc/res/UE/ueditor.all.js"></script>
+		<!-- 实例化编辑器 -->
 		<script>
 			window.onload = function() {
 				UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
@@ -218,10 +223,6 @@
 			})
 		</script>
 
-		<!-- 配置文件 -->
-		<script type="text/javascript" src="/zzhnc/res/UE/ueditor.config.js"></script>
-		<!-- 编辑器源码文件 -->
-		<script type="text/javascript" src="/zzhnc/res/UE/ueditor.all.js"></script>
-		<!-- 实例化编辑器 -->
+		
 
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsp/pc/banner/bannerList.jsp b/WebContent/WEB-INF/jsp/pc/banner/bannerList.jsp
index ebeae10..a7cca8a 100644
--- a/WebContent/WEB-INF/jsp/pc/banner/bannerList.jsp
+++ b/WebContent/WEB-INF/jsp/pc/banner/bannerList.jsp
@@ -6,13 +6,13 @@
 		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title>首页banner设置</title>
+		<title>内页广告位</title>
 		<link rel="stylesheet" href="/zzhnc/res/plugins/layui/css/layui.css">
 		<link rel="stylesheet" href="/zzhnc/res/css/basic.css">
 		<style>
 			.bannerShow .item {
 				width: 300px;
-				height: 150px;
+				height: auto;
 				position: relative;
 				display: inline-block;
 				margin-right: 16px;
@@ -40,15 +40,15 @@
 	</head>
 
 	<body class="wrap">
-		<blockquote class="layui-elem-quote">说明：banner尺寸建议为：750*350</blockquote>
-		<button class="layui-btn uploadImg"><i class="layui-icon">&#xe61f;</i> 上传banner图</button>
+		<blockquote class="layui-elem-quote">说明：图片尺寸建议为：750*578</blockquote>
+		<button class="layui-btn uploadImg"><i class="layui-icon">&#xe61f;</i> 上传图片</button>
 		<fieldset class="layui-elem-field layui-field-title">
-			<legend>banner图片展示</legend>
+			<legend>图片展示</legend>
 		</fieldset>
 		<div class="bannerShow">
 
 		</div>
-		<div class="nodata">暂无banner图，请上传banner图片。</div>
+		<div class="nodata">暂无图片，请上传图片。</div>
 	</body>
 	<script src='/zzhnc/res/js/jquery.min.js'></script>
 	<script src="/zzhnc/res/plugins/layui/layui.js"></script>
diff --git a/WebContent/WEB-INF/jsp/pc/index.jsp b/WebContent/WEB-INF/jsp/pc/index.jsp
index bc87995..dc4967f 100644
--- a/WebContent/WEB-INF/jsp/pc/index.jsp
+++ b/WebContent/WEB-INF/jsp/pc/index.jsp
@@ -106,11 +106,11 @@
 			<div class="layui-body layui-tab-content site-demo site-demo-body" style="bottom: 0;" id="admin-body">
 				<div class="layui-tab admin-nav-card layui-tab-brief" lay-filter="admin-tab">
 					<ul class="layui-tab-title">
-						<li lay-id="0" class="layui-this"><i class="iconfont icon-xiangmu"></i><cite>首页设置</cite><i class="layui-icon layui-unselect layui-tab-close" data-id="0">ဆ</i></li>
+						<li lay-id="0" class="layui-this"><i class="iconfont icon-xiangmu"></i><cite>文章管理</cite><i class="layui-icon layui-unselect layui-tab-close" data-id="0">ဆ</i></li>
 					</ul>
 					<div class="layui-tab-content" style="min-height: 150px; padding: 0; height: auto;">
 						<div class="layui-tab-item layui-show">
-							<iframe src="/zzhnc/banner/bannerList" target="_self" id="baseIframe" data-id="0"></iframe>
+							<iframe src="/zzhnc/activity/activityList" target="_self" id="baseIframe" data-id="0"></iframe>
 						</div>
 					</div>
 				</div>
diff --git a/WebContent/WEB-INF/res/plugins/datas/nav.js b/WebContent/WEB-INF/res/plugins/datas/nav.js
index e9c5585..451bff6 100644
--- a/WebContent/WEB-INF/res/plugins/datas/nav.js
+++ b/WebContent/WEB-INF/res/plugins/datas/nav.js
@@ -1,15 +1,15 @@
-var navs2 = [       
-	{
-		"title": "首页设置",
-		"icon": "icon-banner",
-		"href": "/zzhnc/banner/bannerList"
-	},
+var navs2 = [  
 	{
 		"title": "文章管理",
 		"icon": "icon-huodong",
 		"href": "/zzhnc/activity/activityList"
 	},
 	{
+		"title": "内页广告位",
+		"icon": "icon-banner",
+		"href": "/zzhnc/banner/bannerList"
+	},
+	{
 		"title": "爆款商品",
 		"icon": "icon-shangpin",
 		"href": "/zzhnc/goods/goodsList"
--
libgit2 0.24.0

