活动海报模板管理

src/main/java/com/ssj/bean/sys/poster/domain/PosterTemplate.java

@@ -5,7 +5,9 @@ import java.util.Date;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ssj.bean.common.framework.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 @Entity
 @Table(name = "poster_template")
@@ -13,6 +15,13 @@ public class PosterTemplate extends BaseEntity {
 	
     private static final long serialVersionUID = 1L;
 
+    private String id;
+
+	/**
+	 * 模板名称
+	 */
+	private String templateName;
+
 	/**
 	 * 背景模板
 	 */
@@ -55,6 +64,8 @@ public class PosterTemplate extends BaseEntity {
 	/**
 	 * 创建时间
 	 */
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date createTime;
 
 	/**
@@ -120,6 +131,7 @@ public class PosterTemplate extends BaseEntity {
 		this.status = status;
 	}
 
+
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -167,4 +179,12 @@ public class PosterTemplate extends BaseEntity {
 	public void setBackLength(int backLength) {
 		this.backLength = backLength;
 	}
+
+	public String getTemplateName() {
+		return templateName;
+	}
+
+	public void setTemplateName(String templateName) {
+		this.templateName = templateName;
+	}
 }

src/main/java/com/ssj/dao/sys/poster/dao/PosterTemplateDao.java

@@ -2,6 +2,9 @@ package com.ssj.dao.sys.poster.dao;
 
 import java.util.List;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -20,4 +23,6 @@ public interface PosterTemplateDao extends JpaRepository<PosterTemplate, String>
 
 	@Query(nativeQuery = true,value = " SELECT * from poster_template t WHERE t.`status`=1 and t.id in(?1) ORDER BY t.create_time desc ")
 	List<PosterTemplate> findPosterTemplateByIds(List<String> templateIds);
+
+    Page<PosterTemplate> findAll(Specification<PosterTemplate> specification, Pageable sp);
 }

src/main/java/com/ssj/service/sys/poster/service/PosterTemplateService.java

@@ -1,13 +1,18 @@
 package com.ssj.service.sys.poster.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ssj.bean.sys.poster.domain.PosterTemplate;
 import com.ssj.framework.core.common.service.BaseService;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 
 public interface PosterTemplateService extends BaseService<PosterTemplate, String> {
 	
 	List<PosterTemplate> findPosterTemplateByList();
 
 	List<PosterTemplate> findPosterTemplateByIds(List<String> templateIds);
+
+    Page<PosterTemplate> findBypage(Map<String, Object> params, Pageable initPage);
 }

src/main/java/com/ssj/service/sys/poster/service/impl/PosterTemplateServiceImpl.java

@@ -1,10 +1,17 @@
 package com.ssj.service.sys.poster.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
+import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
+import com.ssj.framework.core.persistence.DynamicSpecifications;
+import com.ssj.framework.core.persistence.SearchFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,5 +49,12 @@ public class PosterTemplateServiceImpl extends BaseServiceImpl<PosterTemplate, S
 		return dao.findPosterTemplateByIds(templateIds);
 	}
 
+	@Override
+	public Page<PosterTemplate> findBypage(Map<String, Object> params, Pageable sp) {
+		Map<String, SearchFilter> filters = SearchFilter.parse(params);
+		Specification<PosterTemplate> specification = DynamicSpecifications.bySearchFilter(filters.values(), PosterTemplate.class);
+		return  dao.findAll(specification, sp);
+	}
+
 
 }

src/main/java/com/ssj/sys/controller/PosterController.java

@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -89,6 +90,34 @@ public class PosterController extends BaseController {
         model.addAttribute("search", params);
         return "sys/poster/activity_list";
     }
+    /**
+	 * 查询活动列表
+	 * @param model
+	 * @param pageSize
+	 * @param pageNo
+	 * @return
+	 * @throws Exception
+	 */
+    @RequestMapping("/template/list")
+    public String templateList(Model model,
+            @RequestParam(required = false, defaultValue = "100") int pageSize,
+            @RequestParam(required = false, defaultValue = "1") int pageNo)throws Exception {
+
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("LIKE_templateName", request.getParameter("LIKE_templateName")==null?"":request.getParameter("LIKE_templateName"));
+        SplitPage sp = new SplitPage();
+        sp.setAction(request.getRequestURI());
+        sp.setPageNo(pageNo);
+        sp.setPageSize(pageSize);
+        sp.setParams(params);
+        Page<PosterTemplate> page = posterTemplateService.findBypage(params, initPage(pageNo,pageSize, Sort.Direction.DESC, new String[] { "createTime" }));
+        sp.setRowCnt((int) page.getTotalElements());
+        model.addAttribute("list", page.getContent());
+        model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
+        model.addAttribute("page", sp);
+        model.addAttribute("search", params);
+        return "sys/poster/template_list";
+    }
 
 	/**
 	 * 下载海报
@@ -201,6 +230,50 @@ public class PosterController extends BaseController {
         return response;
     }
 
+	/**
+	 * 编辑机构页面
+	 * @param model
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping("/template/edit")
+	public String templateEdit(Model model,String id)throws Exception {
+		PosterTemplate template=new PosterTemplate();
+		if(StringUtils.isNotEmpty(id)) {
+			template=posterTemplateService.getById(id);
+		}
+		model.addAttribute("template",template);
+		return "sys/poster/template_edit";
+	}
+
+	@RequestMapping("/template/save")
+	@ResponseBody
+	public Response templateSave(Model model,PosterTemplate template)throws Exception {
+		Response response = new  Response();
+		posterTemplateService.save(template);
+		response.success("成功");
+		return response;
+	}
+
+	/**
+	 * 删除模板信息
+	 * @param model
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping("/template/del")
+	@ResponseBody
+	public Response templateyDel(Model model,String id)throws Exception {
+		Response response = new  Response();
+		if(StringUtils.isNotEmpty(id)){
+			posterTemplateService.delete(id);
+		}
+		response.success("成功");
+		return response;
+	}
+
 
 	/**
 	 * 删除活动信息

src/main/resources/templates/sys/poster/join_edit.html

@@ -107,7 +107,7 @@ dtext{
 			<li style="margin-bottom:3px">
 				<label>机构LOGO2：<b>*</b></label>
 				<input type="hidden" id="logoImg2" th:data-path="${posterJoin.logoImg2}" />
-				<plug id="pluguploadid_four" th:include="sys/common/imgUpload_four"  th:inline="javascript"  data-bindelem="#logoImg" th:data-filepaths="${posterJoin.logoImg2}"  data-type="1" data-maxnum="2"  \>
+				<plug id="pluguploadid_four" th:include="sys/common/imgUpload_four"  th:inline="javascript"  data-bindelem="#logoImg2" th:data-filepaths="${posterJoin.logoImg2}"  data-type="1" data-maxnum="2"  \>
 			</li>
 			
 			<li style="margin-bottom:3px">

src/main/resources/templates/sys/poster/template_edit.html

@@ -1,172 +1,175 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
-<title>私塾家</title>
-<script th:include="sys/common/metaCSS" th:remove="tag"></script> 
-<script th:include="sys/common/metaJS" th:remove="tag"></script> 
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/city.json.js}"></script>
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/citySetMe_V.js}"></script>
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/Popt.js}"></script>
-<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+	<title>私塾家</title>
+	<script th:include="sys/common/metaCSS" th:remove="tag"></script>
+	<script th:include="sys/common/metaJS" th:remove="tag"></script>
+	<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/city.json.js}"></script>
+	<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/citySetMe_V.js}"></script>
+	<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/js/city/Popt.js}"></script>
+	<script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
 </head>
- <style type="text/css">
-   body{min-width:180px;}
-       .select1{
-   		    width:100%;
-		    height: 32px;
-		    line-height: 32px;
-		    border-top: solid 1px #a7b5bc;
-		    border-left: solid 1px #a7b5bc;
-		    border-right: solid 1px #ced9df;
-		    border-bottom: solid 1px #ced9df;
-		    opacity:1;
-	        margin-bottom: 10px;
-    	}
-    	.btn{
-    	  width: 100px;
-    	}
-     label.control-label-error {color: Red;}	
-     
-._citys {     background-color: whitesmoke;width: 450px; display: inline-block; border: 2px solid #eee; padding: 5px; position: relative; }
-._citys span { color: #05920a; height: 15px; width: 15px; line-height: 15px; text-align: center; border-radius: 3px; position: absolute; right: 10px; top: 10px; border: 1px solid #05920a; cursor: pointer; }
-._citys0 { width: 95%; height: 34px; line-height: 34px; display: inline-block; border-bottom: 2px solid #05920a; padding: 0px 5px; font-size:14px; font-weight:bold; margin-left:6px; }
-._citys0 li { display: inline-block; line-height: 34px; font-size: 15px; color: #888; width: 80px; text-align: center; cursor: pointer; }
-._citys1 { width: 100%; display: inline-block; padding: 10px 0; }
-._citys1 a { width: 83px; height: 35px; display: inline-block; background-color: #f5f5f5; color: #666; margin-left: 6px; margin-top: 3px; line-height: 35px; text-align: center; cursor: pointer; font-size: 12px; border-radius: 5px; overflow: hidden; }
-._citys1 a:hover { color: #fff; background-color: #05920a; }
-.AreaS { background-color: #05920a !important; color: #fff !important; }
-#school{
-	margin-left: 110px;
-	padding-bottom: 10px;
-}  
-#school span{
-  	min-width: 25%;
-    float: left;
-    margin-bottom: 10px;
-}
-.joinseachform li{
-	width: 50%;
-	margin-right: 0px;
-	padding-right: 0px;
-}
-
-.schoolseachform li{
-	width: 50%;
-	margin-right: 0px;
-	padding-right: 0px;
-}    
-
-dtext{
-	color: red;
-	cursor: pointer;
-}
-.forminfo li label{
-	text-align: right;
-	padding-right: 10px
-}
-#posterimgs img{
-	width: 120px;
-  
-    margin: 10px;
-}
-
-.imgred{
-  border: 1px solid red;
-}
-
-.imgfff{
-  border: 1px solid #fff;
-}
-  
+<style type="text/css">
+	body{min-width:180px;}
+	.select1{
+		width:100%;
+		height: 32px;
+		line-height: 32px;
+		border-top: solid 1px #a7b5bc;
+		border-left: solid 1px #a7b5bc;
+		border-right: solid 1px #ced9df;
+		border-bottom: solid 1px #ced9df;
+		opacity:1;
+		margin-bottom: 10px;
+	}
+	.btn{
+		width: 100px;
+	}
+	label.control-label-error {color: Red;}
+
+	._citys {     background-color: whitesmoke;width: 450px; display: inline-block; border: 2px solid #eee; padding: 5px; position: relative; }
+	._citys span { color: #05920a; height: 15px; width: 15px; line-height: 15px; text-align: center; border-radius: 3px; position: absolute; right: 10px; top: 10px; border: 1px solid #05920a; cursor: pointer; }
+	._citys0 { width: 95%; height: 34px; line-height: 34px; display: inline-block; border-bottom: 2px solid #05920a; padding: 0px 5px; font-size:14px; font-weight:bold; margin-left:6px; }
+	._citys0 li { display: inline-block; line-height: 34px; font-size: 15px; color: #888; width: 80px; text-align: center; cursor: pointer; }
+	._citys1 { width: 100%; display: inline-block; padding: 10px 0; }
+	._citys1 a { width: 83px; height: 35px; display: inline-block; background-color: #f5f5f5; color: #666; margin-left: 6px; margin-top: 3px; line-height: 35px; text-align: center; cursor: pointer; font-size: 12px; border-radius: 5px; overflow: hidden; }
+	._citys1 a:hover { color: #fff; background-color: #05920a; }
+	.AreaS { background-color: #05920a !important; color: #fff !important; }
+	#school{
+		margin-left: 110px;
+		padding-bottom: 10px;
+	}
+	#school span{
+		min-width: 25%;
+		float: left;
+		margin-bottom: 10px;
+	}
+	.joinseachform li{
+		width: 50%;
+		margin-right: 0px;
+		padding-right: 0px;
+	}
+
+	.schoolseachform li{
+		width: 50%;
+		margin-right: 0px;
+		padding-right: 0px;
+	}
+
+	dtext{
+		color: red;
+		cursor: pointer;
+	}
+	.forminfo li label{
+		text-align: right;
+		padding-right: 10px
+	}
+	#posterimgs img{
+		width: 120px;
+
+		margin: 10px;
+	}
+
+	.imgred{
+		border: 1px solid red;
+	}
+
+	.imgfff{
+		border: 1px solid #fff;
+	}
+
 </style>
 <body>
 <div class="formbody">
-		<ul class="forminfo">
-			<input type="hidden" id="id" class="dfinput fl" name="id" th:value="${posterActivity.id}"/>
-			
-			<li>
-				<label>活动名称：	<b>*</b></label>
-				<input type="text" id="name" class="dfinput fl" name="name" th:value="${posterActivity.name}" />
-			</li>
-			
-			<li style="margin-bottom:3px">
-				<label>海报模板：<b></b></label>
-				<div id="posterimgs">
-					<img class="imgfff" th:each="item:${templates}" th:data-id="${item.id}" th:src="${imgUrl+item.backImg}">
-				</div>
-			</li>
-			
-			<li style="padding-top: 20px">
-				<label>&nbsp;</label>
-				<button type="submit" onclick="save();" class="btn">提交</button>
-				<button type="button" class="btn" onclick="closeWin();">取消</button>
-			</li>
-			
-		</ul>
-			
+	<form id="submitFrom"  method="post">
+	<ul class="forminfo">
+		<input type="hidden"  class="dfinput fl" name="id" th:value="${template.id}"/>
+		<input type="hidden" id="status" class="dfinput fl" name="status" th:value="${template.status}"/>
+		<input type="hidden" id="createTime" class="dfinput fl" name="createTime"  th:value="${#calendars.format(template.createTime,'yyyy-MM-dd HH:mm:ss')}"/>
+		<input type="hidden" id="fontColor" class="dfinput fl" name="fontColor" th:value="${template.fontColor}"/>
+
+		<li>
+			<label>模板名称：	<b>*</b></label>
+			<input type="text" id="templateName" class="dfinput fl" name="templateName" th:value="${template.templateName}" />
+		</li>
+
+		<li style="margin-bottom:3px">
+			<label>模板底图：<b>*</b></label>
+			<input type="hidden" id="backImg" name="backImg" th:data-path="${template.backImg}" />
+			<plug id="pluguploadid" th:include="sys/common/imgUpload"  th:inline="javascript"  data-bindelem="#backImg" th:data-filepaths="${template.backImg}"  data-type="1" data-maxnum="2"  />
+		</li>
+		<li>
+			<label>底图宽度(px)：</label>
+			<input type="text" id="backLength" placeholder="模板底图宽度(px)" class="dfinput fl" name="backLength" th:value="${template.backLength}" />
+		</li>
+
+		<li>
+			<label>logo1坐标：<b>*</b></label>
+			<input type="text" id="logoPosition" placeholder="左边距;上边距" class="dfinput fl" name="logoPosition" th:value="${template.logoPosition}" />
+		</li>
+
+		<li>
+			<label>logo2坐标：</label>
+			<input type="text" id="logoPosition2" placeholder="左边距;上边距" class="dfinput fl" name="logoPosition2" th:value="${template.logoPosition2}" />
+		</li>
+		<li>
+			<label>二维码1坐标：<b>*</b></label>
+			<input type="text" id="qrcodePosition1" placeholder="宽;长;左边距;上边距" class="dfinput fl" name="qrcodePosition1" th:value="${template.qrcodePosition1}" />
+		</li>
+
+		<li>
+			<label>二维码2坐标：</label>
+			<input type="text" placeholder="宽;长;左边距;上边距"  id="qrcodePosition2" class="dfinput fl" name="qrcodePosition2" th:value="${template.qrcodePosition2}" />
+		</li>
+
+		<li>
+			<label>联系人坐标：<b>*</b></label>
+			<input type="text" placeholder="左边距;上边距;右边距"  id="numberPosition" class="dfinput fl" name="numberPosition" th:value="${template.numberPosition}" />
+		</li>
+
+		<li>
+			<label>地址坐标：<b>*</b></label>
+			<input placeholder="左边距;上边距;右边距" type="text" id="addressPosition" class="dfinput fl" name="addressPosition" th:value="${template.addressPosition}" />
+		</li>
+
+		<li>
+			<label>字号(px)：<b>*</b></label>
+			<input type="text" id="fontSize" class="dfinput fl" name="fontSize" th:value="${template.fontSize}" />
+		</li>
+
+
+		<li style="padding-top: 20px">
+			<label>&nbsp;</label>
+			<button type="button" onclick="save();" class="btn">提交</button>
+			<button type="button" class="btn" onclick="closeWin();">取消</button>
+		</li>
+
+	</ul>
+	</form>
 </div>
 
 </body>
 <script type="text/javascript">
 
-
-$(function (){
-     $('#posterimgs img').click(function() {
-    	 // $('#posterimgs img').removeClass('imgred');
-    	 // $('#posterimgs img').addClass('imgfff');
-		 if($(this).hasClass("imgfff")){
-			 $(this).removeClass('imgfff');
-			 $(this).addClass('imgred');
-		 }else{
-			 $(this).removeClass('imgred');
-			 $(this).addClass('imgfff');
-		 }
-
-     }); 
-})
-
-function  closeWin() {
-	parent.layer.close(parent.layer.getFrameIndex(window.name));
-}
-
-function save(){
-	
-	if($("#name").val()==''){
-		parent.layer.msg("活动名称不能为空",{icon:11});
-		return
-	}
-	var templateId="";
-	$('.imgred').each(function(i,n){
-		templateId=templateId+$(n).data("id")+",";
-	});
-	if(templateId.endsWith(",")){
-		templateId = templateId.substr(0,templateId.length-1);
+	function save(){
+		parent.layer.confirm("确定保存机构?", {
+			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
+		}, function(){
+			var url="[[${sysUrl}]]/sys/poster/template/save";
+			var params = $("#submitFrom").serialize();
+			$.post(url,params,function(data){
+				if(data.meta.success){
+					parent.layer.msg("保存成功",{icon:1});
+					parent.location.reload();
+					parent.layer.close(parent.layer.getFrameIndex(window.name));
+				}else{
+					parent.layer.msg(data.meta.message,{icon:11});
+				}
+			});
+		});
 	}
-	console.log("templateId--->"+templateId);
-	if(templateId=='' || templateId==undefined || templateId=='undefined'){
-		parent.layer.msg("活动模板不能为空",{icon:11});
-		return
+	function  closeWin() {
+		parent.layer.close(parent.layer.getFrameIndex(window.name));
 	}
-	parent.layer.confirm("确定保存活动信息?", {
-		icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
-	}, function(){
-		var url="[[${sysUrl}]]/sys/poster/activity/save";
-		var params ={
-			'id' : $("#id").val(),
-            'name' : $("#name").val(),
-            'templateId' : templateId,
-        };
-		$.post(url,params,function(data){
-			if(data.meta.success){
-				parent.layer.msg("保存成功",{icon:1});
-				parent.location.reload();
-				parent.layer.close(parent.layer.getFrameIndex(window.name));
-			}else{
-				parent.layer.msg(data.meta.message,{icon:11});
-			}
-		});
-	});
-}
-
 
 
 </script>

src/main/resources/templates/sys/poster/template_list.html

@@ -42,21 +42,16 @@
 	<input type="hidden" name="pageSize" id="pageSize" value="10" />
 	<ul class="seachform">
 			<li>
-			 <label>活动名称</label>
-			  <input name="name" type="text" class="scinput" th:value="${search.name}"  />
+			 <label>模板名称</label>
+			  <input name="LIKE_templateName" type="text" class="scinput" th:value="${search.LIKE_templateName}"  />
 		    </li>
 			<li>
 				<input type="button" class="scbtn" value="查询" />
 			</li>
 			<li>
 				<ul class="toolbar">
-					<a href="javascript:;" onclick="exportAll()">
-						<input type="button" class="scbtn" value="导出" />
-					</a>
-				</ul>
-				<ul class="toolbar">
 					<a href="javascript:;" onclick="edit('')">
-						<li class="click"><span><img th:src="@{/static/sys/images/t01.png}"></span>新增活动</li>
+						<li class="click"><span><img th:src="@{/static/sys/images/t01.png}"></span>新增模板</li>
 					</a>
 				</ul>
 			</li>
@@ -68,30 +63,39 @@
 		<thead>
 		    <tr>
 		    	<th style="width: 50px;">序号</th>
-		    	<th >活动名称</th>
+		    	<th >模板名称</th>
 		    	<th >海报模板 </th>
 		    	<th >创建时间</th>
-		    	<th >份数</th>
+		    	<th >logo1坐标信息</th>
+		    	<th >logo2坐标信息</th>
+		    	<th >二维码1坐标信息</th>
+		    	<th >二维码2坐标信息</th>
+		    	<th >联系人坐标信息</th>
+		    	<th >地址坐标信息</th>
+		    	<th >模板宽度(px)</th>
+		    	<th >字体大小(px)</th>
 		    	<th >操作 </th>
 		    </tr> 
 		</thead>
 		<tbody>
 			<tr th:each="item:${list}" >
 				<td th:text="${itemStat.count+((page.pageNo-1)*page.pageSize) }"></td>
-				<td th:title="${item.name}" th:text="${item.name}"></td>
+				<td th:title="${item.templateName}" th:text="${item.templateName}"></td>
 				<td>
-					<img th:each="image:${#strings.listSplit(item.back_img,',')}" style="width: 50px;height: 50px;" th:src="${imgUrl+image}">
+					<img th:each="image:${#strings.listSplit(item.backImg,',')}" style="width: 50px;height: 50px;" th:src="${imgUrl+image}">
 				</td>
-				<td th:text="${item.create_time}"></td>
-				<td th:text="${item.count}"></td>
+				<td th:text="${item.createTime}"></td>
+				<td th:text="${item.logoPosition}"></td>
+				<td th:text="${item.logoPosition2}"></td>
+				<td th:text="${item.qrcodePosition1}"></td>
+				<td th:text="${item.qrcodePosition2}"></td>
+				<td th:text="${item.numberPosition}"></td>
+				<td th:text="${item.addressPosition}"></td>
+				<td th:text="${item.backLength}"></td>
+				<td th:text="${item.fontSize}"></td>
 				<td >
-					<a style="color: red" th:href="${'javascript:activityDel(''' + item.id + ''')'}"  class="tablelink">删除活动</a>
-					&nbsp;
-					<a th:href="@{/sys/poster/activityJoin/list.html(id=${item.id})}">
-						查看明细
-					</a>
-					
-					
+					<a style="color: red" th:href="${'javascript:activityDel(''' + item.id + ''')'}"  class="tablelink">删除</a>
+					<a  th:href="${'javascript:edit(''' + item.id + ''')'}"  class="tablelink">修改</a>
 				</td>
 			</tr>
 		</tbody>
@@ -118,7 +122,7 @@
 		    shift: 0.8,
 		    offset: '100px',
 		    area: ['50%', '60%'],
-		    content: '[[${sysUrl}]]/sys/poster/activity/edit.html?id='+id
+		    content: '[[${sysUrl}]]/sys/poster/template/edit.html?id='+id
 		});
 	}
 	
@@ -126,7 +130,7 @@
 		parent.layer.confirm("您确定要删除活动?", {
 			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
 		}, function(){
-			var url="[[${sysUrl}]]/sys/poster/activity/del?id="+id;
+			var url="[[${sysUrl}]]/sys/poster/template/del?id="+id;
 			var params ={};
 			$.post(url,params,function(data){
 				if(data.meta.success){