Merge branch 'master' of http://120.76.158.63:18080/zhangtai/zzhnc

WebContent/WEB-INF/jsp/pc/activity/activityList.jsp

@@ -58,24 +58,7 @@
 				keyword: null
 			};
 
-			initData(queryObj);
-
-			//查询
-			form.on('submit(querybtn)', function(data) {
-				queryObj.keyword = $("[name=keyword]").val();
-				queryObj.page = 1;
-				initData(queryObj)
-			});
-			$(".resetBtn").on("click", function() {
-				$("[name=keyword]").val("")
-				queryObj.page = 1;
-				queryObj.keyword = null;
-				initData(queryObj)
-				return false
-			})
-			//初始化数据
-			initData(queryObj);
-
+			//初始化方法
 			function initData(queryObj) {
 				$.get("/zzhnc/article/getArticlesList", queryObj, function(data) {
 					var data = data.data;
@@ -101,12 +84,13 @@
 						$("#tablelist").html(str);
 						form.render();
 						toNull_G();
+					}
 					laypage.render({
 						elem: 'page',
 						count: data.total,
 						limit: queryObj.pagesize,
 						curr: queryObj.page,
-							skip: true,
+						layout: ['count', 'prev', 'page', 'next', 'skip'],
 						jump: function(obj, first) {
 							if(!first) {
 								queryObj.page = obj.curr
@@ -114,10 +98,27 @@
 							}
 						}
 					})
+				})
 			}
 
+			//初始化数据
+			initData(queryObj);
+
+			//查询
+			form.on('submit(querybtn)', function(data) {
+				queryObj.keyword = $("[name=keyword]").val();
+				queryObj.page = 1;
+				initData(queryObj)
+			});
+
+			//重置
+			$(".resetBtn").on("click", function() {
+				$("[name=keyword]").val("")
+				queryObj.page = 1;
+				queryObj.keyword = null;
+				initData(queryObj)
+				return false
 			})
-			}
 
 			//添加文章
 			$(document).on("click", ".createBtn", function() {
@@ -131,6 +132,7 @@
 					title: "添加文章"
 				});
 			})
+
 			//修改文章
 			$(document).on("click", ".updataBtn", function() {
 				var id = $(this).parents("tr").attr("data-id");
@@ -144,6 +146,7 @@
 					title: "修改文章"
 				});
 			})
+
 			//删除文章
 			$(document).on("click", ".deleteBtn", function() {
 				var id = $(this).parents("tr").attr("data-id");

WebContent/WEB-INF/jsp/pc/autoresponse/autoresponse.jsp

@@ -84,6 +84,7 @@
 				$.get("/zzhnc/autoreply/getAutoreplyList", queryObj, function(data) {
 					var data = data.data;
 					console.log(data)
+					$("#tablelist").html("");
 					if(data.rows.length < 1) {
 						$(".nodata").show();
 					} else {
@@ -103,12 +104,13 @@
 						$("#tablelist").html(str);
 						form.render();
 						toNull_G();
+					}
 					laypage.render({
 						elem: 'page',
 						count: data.total,
 						limit: queryObj.size,
 						curr: queryObj.page,
-							skip: true,
+						layout: ['count', 'prev', 'page', 'next', 'skip'],
 						jump: function(obj, first) {
 							if(!first) {
 								queryObj.page = obj.curr
@@ -116,7 +118,6 @@
 							}
 						}
 					})
-					}
 				})
 			}
 
@@ -232,7 +233,7 @@
 						});
 						form.render();
 					},
-					success: function(){
+					success: function() {
 						$.get("/zzhnc/autoreply/getAutoReply", {
 							id: id
 						}, function(data) {

WebContent/WEB-INF/jsp/pc/goods/goodsList.jsp

@@ -87,7 +87,7 @@
 								'<td>' + data.rows[i].sellerName + '</td>' +
 								'<td>' + data.rows[i].sellerAddress + '</td>' +
 								'<td>' + data.rows[i].sellerPhone + '</td>' +
-								'<td>' + isHome(data.rows[i].isHome) +'</td>' +
+								'<td>' + isHome(data.rows[i].isHome) + '</td>' +
 								'<td><a href="#" class="layui-btn layui-btn-sm updataBtn">修改</a>' +
 								'<a href="#" class="layui-btn layui-btn-sm deleteBtn">删除</a>' +
 								'</td>' +
@@ -96,12 +96,13 @@
 						$("#tablelist").html(str);
 						form.render();
 						toNull_G();
+					}
 					laypage.render({
 						elem: 'page',
 						count: data.total,
 						limit: queryObj.size,
 						curr: queryObj.page,
-							skip: true,
+						layout: ['count', 'prev', 'page', 'next', 'skip'],
 						jump: function(obj, first) {
 							if(!first) {
 								queryObj.page = obj.curr
@@ -109,7 +110,6 @@
 							}
 						}
 					})
-					}
 				})
 			}
 
@@ -183,10 +183,11 @@
 				});
 			});
 			
-			function isHome(v){
-				if(v){
+			//是否在首页显示的bool值转为是或否
+			function isHome(v) {
+				if(v) {
 					v = "是"
-				}else{
+				} else {
 					v = "否"
 				}
 				return v;

WebContent/WEB-INF/jsp/pc/prize/prizeList.jsp

@@ -333,7 +333,7 @@
 					console.log(data)
 					if(data.code == 0) {
 						//基本信息
-						$("[name=beginTime]").val(toTime_G(data.data.beginTime));
+						$("[name=beginTime]").val(data.data.beginTime);
 						$("[name=status]").val(data.data.status);
 						$("[name=turn]").val(data.data.turn);
 						$("[name=planMny]").val(data.data.planMny);
@@ -461,7 +461,7 @@
 					}
 
 					var submitData = {
-						//beginTime: e.field.beginTime,
+						beginTime: e.field.beginTime,
 						status: e.field.status,
 						turn: e.field.turn,
 						planMny: e.field.planMny,
@@ -509,14 +509,14 @@
 						}, function(data) {
 							console.log(data);
 							if(data.code == 0) {
-								top.layer.msg("开启活动成功");
+								layer.msg("开启活动成功");
 
 							} else {
-								top.layer.msg(data.msg);
+								layer.msg(data.msg);
 							}
 						})
 					} else {
-						top.layer.msg("只有未开启的活动才可以开启");
+						layer.msg("只有未开启的活动才可以开启");
 					}
 				});
 
@@ -529,35 +529,31 @@
 						}, function(data) {
 							console.log(data);
 							if(data.code == 0) {
-								top.layer.msg("设置活动结束成功");
-
+								layer.msg("设置活动结束成功");
 							} else {
-								top.layer.msg(data.msg);
+								layer.msg(data.msg);
 							}
 						})
 					} else {
-						top.layer.msg("只有进行中的活动可以结束");
+						layer.msg("只有进行中的活动可以结束");
 					}
-
 				});
+				
 				//设置下一轮
 				form.on('submit(nextround)', function(e) {
-
 					var status = $("select[name=status]").val();
 					if(status == "3") {
-						$.post("/zzhnc/activity/clearActivity", function(data) {
+						$.get("/zzhnc/activity/clearActivity", function(data) {
 							console.log(data);
 							if(data.code == 0) {
-								top.layer.msg("开启下一轮成功");
-
+								layer.msg("开启下一轮成功");
 							} else {
-								top.layer.msg(data.msg);
+								layer.msg(data.msg);
 							}
 						})
 					} else {
-						top.layer.msg("活动结束后才能开启下一轮");
+						layer.msg("活动结束后才能开启下一轮");
 					}
-
 				});
 
 				//数值转为true或false

WebContent/WEB-INF/jsp/pc/report/fans.jsp

@@ -79,12 +79,13 @@
 						$("#fanslist").html(str)
 						form.render()
 						toNull_G();
+					}
 					laypage.render({
 						elem: 'page',
 						count: data.total,
 						limit: 10,
 						curr: queryObj.page,
-							skip: true,
+						layout: ['count', 'prev', 'page', 'next', 'skip'],
 						jump: function(obj, first) {
 							if(!first) {
 								queryObj.page = obj.curr
@@ -92,7 +93,6 @@
 							}
 						}
 					})
-					}
 				})
 			}
 

WebContent/WEB-INF/jsp/pc/report/goods.jsp

@@ -92,12 +92,13 @@
 						$("#tablelist").html(str);
 						form.render();
 						toNull_G();
+					}
 					laypage.render({
 						elem: 'page',
 						count: data.total,
 						limit: queryObj.size,
 						curr: queryObj.page,
-							skip: true,
+						layout: ['count', 'prev', 'page', 'next', 'skip'],
 						jump: function(obj, first) {
 							if(!first) {
 								queryObj.page = obj.curr
@@ -105,7 +106,6 @@
 							}
 						}
 					})
-					}
 				})
 			}
 

WebContent/WEB-INF/jsp/pc/report/prize.jsp

@@ -89,14 +89,12 @@
 					data = data.data;
 					$('#moneySum').text(data.sum)
 					console.log(data)
-
+					$("#tablelist").html("");
 					var str = "";
 					if(data.rows.length < 1) {
 						$(".nodata").show();
-						$("#page").hide();
 					} else {
 						$(".nodata").hide();
-						$("#page").show();
 						for(var i = 0; i < data.rows.length; i++) {
 							str += '<tr>' +
 								'<td>' + ((data.page - 1) * data.pageSize + i + 1) + '</td>' +
@@ -110,12 +108,13 @@
 						$("#tablelist").html(str);
 						form.render();
 						toNull_G();
+					}
 					laypage.render({
 						elem: 'page',
 						count: data.total,
 						limit: queryObj.pagesize,
 						curr: queryObj.page,
-							skip: true,
+						layout: ['count', 'prev', 'page', 'next', 'skip'],
 						jump: function(obj, first) {
 							if(!first) {
 								queryObj.page = obj.curr
@@ -124,7 +123,6 @@
 
 						}
 					})
-					}
 				})
 			}
 

WebContent/WEB-INF/res/css/basic.css

@@ -107,7 +107,8 @@
 	margin-right: 5px;
 }
 
-.layui-code, .layui-upload-list{
+.layui-code,
+.layui-upload-list {
 	margin: 0;
 }
 
@@ -144,11 +145,16 @@
 	margin-right: 5px;
 }
 
-#upload{
+#upload {
 	float: left;
 	margin-right: 10px;
 }
 
+#page {
+	text-align: center;
+}
+
+
 /*-----------公共样式 end-----------*/
 
 
@@ -172,14 +178,17 @@
 	margin-bottom: 40px;
 	color: #666;
 }
-.popupbos .layui-form-label{
+
+.popupbos .layui-form-label {
 	width: 90px;
 	padding: 9px 0;
 }
-.popupbos .layui-input-block{
+
+.popupbos .layui-input-block {
 	margin-left: 90px;
 }
-.popupbos .layui-form-mid{
+
+.popupbos .layui-form-mid {
 	padding: 0!important;
 }
 

WebContent/WEB-INF/res/css/layout.css

@@ -63,7 +63,6 @@ body .layui-layout-admin .footer-demo{height: auto; padding: 5px 0; line-height:
   90% {opacity: 0.1; transform: translate3d(0, 0, 0) rotate(3600deg) scale(6);}
   100% {opacity: 1; transform: translate3d(0, 0, 0) rotate(3600deg) scale(1);}
 }
-
 @-webkit-keyframes site-desc {
   0% { -webkit-transform: scale(1.1);}
   100% {opacity: 1; -webkit-transform: scale(1);}

WebContent/WEB-INF/res/js/index.js

 /** index.js By Beginner Emain:zheng_jinfan@126.com HomePage:http://www.zhengjinfan.cn */
 
-var tab,layer;
+var tab, layer;
 
 layui.config({
 	base: '/zzhnc/res/js/',
 	version: new Date().getTime()
-}).use(['element', 'layer', 'navbar', 'tab'], function () {
+}).use(['element', 'layer', 'navbar', 'tab'], function() {
 	var element = layui.element,
 		$ = layui.jquery,
 		navbar = layui.navbar();
 	layer = layui.layer
 	tab = layui.tab({
-        elem: '.admin-nav-card' //设置选项卡容器
-        ,
+		elem: '.admin-nav-card', //设置选项卡容器
 		//maxSetting: {
 		//	max: 5,
 		//	tipMsg: '只能开5个哇，不能再开了。真的。'
 		//},
 		contextMenu: true,
-        onSwitch: function (data) {
+		onSwitch: function(data) {
 			/*console.log(data.id); //当前Tab的Id
 			console.log(data.index); //得到当前Tab的所在下标
 			console.log(data.elem); //得到当前的Tab大容器
 
 			console.log(tab.getCurrentTabId())*/
-            $('iframe[data-id=' + (data.index+1) + ']').each(function () {
+			$('iframe[data-id=' + (data.index + 1) + ']').each(function() {
 				$(this)[0].src = $(this)[0].src;
 			});
 		}
 	});
 	//iframe自适应
-    $(window).on('resize', function () {
+	$(window).on('resize', function() {
 		var $content = $('.admin-nav-card .layui-tab-content');
 		$content.height($(this).height() - 147);
-        $content.find('iframe').each(function () {
+		$content.find('iframe').each(function() {
 			$(this).height($content.height());
 		});
 	}).resize();
 
-
-
 	//设置navbar
 	navbar.set({
 		spreadOne: true,
@@ -52,13 +49,13 @@ layui.config({
 	//渲染navbar
 	navbar.render();
 	//监听点击事件
-    navbar.on('click(side)', function (data) {
+	navbar.on('click(side)', function(data) {
 		tab.tabAdd(data.field);
 	});
 
-    $('.admin-side-toggle').on('click', function () {
+	$('.admin-side-toggle').on('click', function() {
 		var sideWidth = $('#admin-side').width();
-        if (sideWidth === 200) {
+		if(sideWidth === 200) {
 			$('#admin-body').animate({
 				left: '0'
 			}); //admin-footer
@@ -80,55 +77,54 @@ layui.config({
 			});
 		}
 	});
-    $('.admin-side-full').on('click', function () {
+	$('.admin-side-full').on('click', function() {
 		var docElm = document.documentElement;
 		//W3C  
-        if (docElm.requestFullscreen) {
+		if(docElm.requestFullscreen) {
 			docElm.requestFullscreen();
 		}
 		//FireFox  
-        else if (docElm.mozRequestFullScreen) {
+		else if(docElm.mozRequestFullScreen) {
 			docElm.mozRequestFullScreen();
 		}
 		//Chrome等  
-        else if (docElm.webkitRequestFullScreen) {
+		else if(docElm.webkitRequestFullScreen) {
 			docElm.webkitRequestFullScreen();
 		}
 		//IE11
-        else if (elem.msRequestFullscreen) {
+		else if(elem.msRequestFullscreen) {
 			elem.msRequestFullscreen();
 		}
 		layer.msg('按Esc即可退出全屏');
 	});
 
-
-
 	//锁屏
-    $(document).on('keydown', function () {
+	$(document).on('keydown', function() {
 		var e = window.event;
-        if (e.keyCode === 76 && e.altKey) {
+		if(e.keyCode === 76 && e.altKey) {
 			//alert("你按下了alt+l");
 			lock($, layer);
 		}
 	});
-    $('#lock').on('click', function () {
+	$('#lock').on('click', function() {
 		lock($, layer);
 	});
 
 	//手机设备的简单适配
 	var treeMobile = $('.site-tree-mobile'),
 		shadeMobile = $('.site-mobile-shade');
-    treeMobile.on('click', function () {
+	treeMobile.on('click', function() {
 		$('body').addClass('site-mobile');
 	});
-    shadeMobile.on('click', function () {
+	shadeMobile.on('click', function() {
 		$('body').removeClass('site-mobile');
 	});
 });
 
 var isShowLock = false;
+
 function lock($, layer) {
-    if (isShowLock)
+	if(isShowLock)
 		return;
 	//自定页
 	layer.open({
@@ -138,19 +134,19 @@ function lock($, layer) {
 		anim: 6,
 		content: $('#lock-temp').html(),
 		shade: [0.9, '#393D49'],
-        success: function (layero, lockIndex) {
+		success: function(layero, lockIndex) {
 			isShowLock = true;
 			//给显示用户名赋值
 			layero.find('div#lockUserName').text('admin');
-            layero.find('input[name=lockPwd]').on('focus', function () {
+			layero.find('input[name=lockPwd]').on('focus', function() {
 					var $this = $(this);
-                if ($this.val() === '输入登录密码解锁..') {
+					if($this.val() === '输入登录密码解锁..') {
 						$this.val('').attr('type', 'password');
 					}
 				})
-                .on('blur', function () {
+				.on('blur', function() {
 					var $this = $(this);
-                    if ($this.val() === '' || $this.length === 0) {
+					if($this.val() === '' || $this.length === 0) {
 						$this.attr('type', 'text').val('输入登录密码解锁..');
 					}
 				});
@@ -161,21 +157,21 @@ function lock($, layer) {
 			 $.post(url,params,callback,'json');
 			 */
 			//绑定解锁按钮的点击事件
-            layero.find('button#unlock').on('click', function () {
+			layero.find('button#unlock').on('click', function() {
 				var $lockBox = $('div#lock-box');
-                if(window.sessionStorage){
-                	if(sessionStorage.getItem('phone')){
+				if(window.sessionStorage) {
+					if(sessionStorage.getItem('phone')) {
 						var userName = sessionStorage.getItem('phone')
 					}
-                }else{
-                	if(document.cookie.length > 0){
-                		if(document.cookie.indexOf("phone") > 0 )
+				} else {
+					if(document.cookie.length > 0) {
+						if(document.cookie.indexOf("phone") > 0)
 							var userName = document.cookie.slice(6)
 					}
 				}
 
 				var pwd = $lockBox.find('input[name=lockPwd]').val();
-                if (pwd === '输入登录密码解锁..' || pwd.length === 0) {
+				if(pwd === '输入登录密码解锁..' || pwd.length === 0) {
 					layer.msg('请输入登录密码..', {
 						icon: 2,
 						time: 1000
@@ -189,7 +185,7 @@ function lock($, layer) {
 			 * @param {String} 用户名
 			 * @param {String} 密码
 			 */
-            var unlock = function (un, pwd) {
+			var unlock = function(un, pwd) {
 				var code = ""
 				//这里可以使用ajax方法解锁
 				/*$.post('api/xx',{username:un,password:pwd},function(data){
@@ -206,22 +202,27 @@ function lock($, layer) {
 					type: 'POST',
 					async: false,
 					url: "../center/login",
-	                data: {account:un,pwd:pwd,code:code},
-	                success: function (data) {
-	                	if(data.code==0){
+					data: {
+						account: un,
+						pwd: pwd,
+						code: code
+					},
+					success: function(data) {
+						if(data.code == 0) {
 							isShowLock = false;
 							//演示：默认输入密码都算成功
 							//关闭锁屏层
 							layer.close(lockIndex);
-	                	}else{
+						} else {
 
-	                		layer.msg(data.msg,{icon:2,time:1000});
+							layer.msg(data.msg, {
+								icon: 2,
+								time: 1000
+							});
 						}
 					}
 				});
 
-            	
-                
 			};
 		}
 	});

WebContent/WEB-INF/res/js/me.js

@@ -9,10 +9,12 @@ function toTime_G(v) {
 		var day = time.getDate();
 		var hour = time.getHours();
 		var min = time.getMinutes();
+		var second = time.getSeconds(); 
 		if(mon < 10) mon = "0" + mon
 		if(day < 10) day = "0" + day
 		if(hour < 10) hour = "0" + hour
 		if(min < 10) min = "0" + min
+		if(second < 10) second = "0" + second
 		return year + "-" + mon + "-" + day + " " + hour + ":" + min
 	}
 }

WebContent/WEB-INF/res/js/tab.js

@@ -152,7 +152,7 @@ layui.define(['element', 'common'], function(exports) {
 		} else {
 			element.tabChange(ELEM.tabFilter, that.getTabId(data.title));
 			//自动刷新
-			if (_config.autoRefresh) {
+			if(_config.autoRefresh) {
 				_config.elem.find('div.layui-tab-content > div').eq(tabIndex).children('iframe')[0].contentWindow.location.reload();
 			}
 		}

WebContent/WEB-INF/res/plugins/datas/area_.js

-
-var threeSelectData = null //城市数据
-$.ajax({
-    url: url_gobol + "public/getDropDownCity",
-    type:"get",
-    async:false,
-    beforeSend:function(){
-        top.layer.load()
-    },
-    success:function(data){
-        data = JSON.parse(data.data)
-        threeSelectData = data
-        top.layer.close(top.layer.load())
-    },
-    error:function(){
-        top.layer.close(top.layer.load())
-        top.layer.msg("获取城市数据失败,请刷新重试")
-    }
-})