From 5e95f854a26c2b1b23af635a62684e6d810ea90a Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Tue, 30 Mar 2021 10:04:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sinosoft/activity/domain/DrawConfig.java | 2 +- .../main/java/com/sinosoft/activity/domain/DrawInfo.java | 2 +- .../src/main/resources/templates/activity/info/add.html | 2 +- .../resources/templates/activity/info/configEdit.html | 8 ++++---- .../src/main/resources/templates/activity/info/edit.html | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java index 3bf55369c..5c72d2a69 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java @@ -60,7 +60,7 @@ public class DrawConfig extends BaseEntity private Long AVAILABLENUMBER; /** 状态 */ - @Excel(name = "状态" ,readConverterExp="1=启用,2=禁用") + @Excel(name = "状态" ,readConverterExp="1=启用,2=停用") private String STATUS; /** 创建时间 */ diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java index 8dab0e21a..6d6f019fc 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java @@ -62,7 +62,7 @@ public class DrawInfo extends DrawRule private Date LASTUPDATETIMESTAMP; /** 状态 */ - @Excel(name = "状态" ,readConverterExp="1=启用,2=禁用") + @Excel(name = "状态" ,readConverterExp="1=启用,2=停用") private String STATUS; /** 是否需要更新缓存 */ diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/info/add.html index bb2402dd9..70a2c5a1e 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -110,7 +110,7 @@
- +
diff --git a/sino-activity/src/main/resources/templates/activity/info/configEdit.html b/sino-activity/src/main/resources/templates/activity/info/configEdit.html index 17a454502..97a325833 100644 --- a/sino-activity/src/main/resources/templates/activity/info/configEdit.html +++ b/sino-activity/src/main/resources/templates/activity/info/configEdit.html @@ -14,7 +14,7 @@
@@ -71,7 +71,7 @@
@@ -91,7 +91,7 @@
@@ -101,7 +101,7 @@
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html index 64f4dece1..904867b1c 100644 --- a/sino-activity/src/main/resources/templates/activity/info/edit.html +++ b/sino-activity/src/main/resources/templates/activity/info/edit.html @@ -112,7 +112,7 @@
- +
From 3c700c4f97b25d53f279ebc34f92345dc9fee9b3 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Tue, 30 Mar 2021 10:27:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/info/add.html | 9 +++-- .../templates/activity/info/configAdd.html | 12 +++++-- .../templates/activity/info/configEdit.html | 14 ++++++-- .../templates/activity/info/edit.html | 36 +++++++++++++------ 4 files changed, 55 insertions(+), 16 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/info/add.html index 70a2c5a1e..d7cb4194f 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -183,14 +183,19 @@ /**获取奖品及信息列表*/ $(document).ready(function() { - var job= ""; + var job= ""; $.ajax({ url:prefix + "/prizeInfo", success: function (data) { for(var i in data){ - job += "" + if (job.length==0){ + job = "" + } + else{ + job += "" + } } $("#firstawardprize").html(job); $("#willdrawawardprize").html(job); diff --git a/sino-activity/src/main/resources/templates/activity/info/configAdd.html b/sino-activity/src/main/resources/templates/activity/info/configAdd.html index 7b1597330..44b55a24c 100644 --- a/sino-activity/src/main/resources/templates/activity/info/configAdd.html +++ b/sino-activity/src/main/resources/templates/activity/info/configAdd.html @@ -130,14 +130,22 @@ /**获取奖品及信息列表*/ $(document).ready(function() { - var job= ""; + var job= ""; $.ajax({ url:prefix + "/prizeInfo", success: function (data) { for(var i in data){ - job += "" + if(job.length==0){ + job += "" + + }else{ + job += "" + + } + + } $("#PRIZECODE").html(job); }, diff --git a/sino-activity/src/main/resources/templates/activity/info/configEdit.html b/sino-activity/src/main/resources/templates/activity/info/configEdit.html index 97a325833..7adc2e90a 100644 --- a/sino-activity/src/main/resources/templates/activity/info/configEdit.html +++ b/sino-activity/src/main/resources/templates/activity/info/configEdit.html @@ -132,17 +132,27 @@ $(document).ready(function() { var PRIZECODE = [[${drawConfig.PRIZECODE}]]; - var job= ""; + var job= ""; $.ajax({ url:prefix + "/prizeInfo", success: function (data) { for(var i in data){ - if(data[i].prizecode==PRIZECODE){ + if (job.length==0){ + + if(data[i].prizecode==PRIZECODE){ + job = "" + } + job = "" + + }else{ + if(data[i].prizecode==PRIZECODE){ job += "" } job += "" + } + } $("#PRIZECODE").html(job); diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html index 904867b1c..518ff5f26 100644 --- a/sino-activity/src/main/resources/templates/activity/info/edit.html +++ b/sino-activity/src/main/resources/templates/activity/info/edit.html @@ -196,27 +196,43 @@ var WILLDRAWAWARDPRIZE = [[${drawInfo.WILLDRAWAWARDPRIZE}]]; var FIRSTAWARDPRIZE = [[${drawInfo.FIRSTAWARDPRIZE}]]; - var job= ""; - var jobj= ""; + var job= ""; + var jobj= ""; $.ajax({ url:prefix + "/prizeInfo", success: function (data) { for(var i in data){ - if(data[i].prizecode==WILLDRAWAWARDPRIZE){ - job += "" - } - job += "" + if (job.length==0){ + if(data[i].prizecode==WILLDRAWAWARDPRIZE){ + job = "" + } + job = "" + } + else{ + if(data[i].prizecode==WILLDRAWAWARDPRIZE){ + job += "" + } + job += "" + } } $("#willdrawawardprize").html(job); for(var i in data){ - if(data[i].prizecode==FIRSTAWARDPRIZE){ - jobj += "" - } - jobj += "" + if(jobj.length==0){ + if(data[i].prizecode==FIRSTAWARDPRIZE){ + jobj = "" + } + jobj = "" + }else{ + + if(data[i].prizecode==FIRSTAWARDPRIZE){ + jobj += "" + } + jobj += "" + } } $("#firstawardprize").html(jobj); From c26bda2ac16639650d8e2ab5be0102d17f42edd0 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Tue, 30 Mar 2021 10:32:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/activity/info/info.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/info/info.html b/sino-activity/src/main/resources/templates/activity/info/info.html index e810fb908..87d5da377 100644 --- a/sino-activity/src/main/resources/templates/activity/info/info.html +++ b/sino-activity/src/main/resources/templates/activity/info/info.html @@ -80,16 +80,16 @@ { field: 'drawtype', - title: '抽奖活动类型', + title: '活动类型', visible: false }, { field: 'drawname', - title: '抽奖活动名称' + title: '活动名称' }, { field: 'drawcode', - title: '抽奖活动代码', + title: '活动编码', }, { field: 'expeno', From 25a34b08e3d920c423ab4f4d5278a023636cc2db Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Tue, 30 Mar 2021 10:33:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/activity/info/configList.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/info/configList.html b/sino-activity/src/main/resources/templates/activity/info/configList.html index beb8a410c..5f6364b93 100644 --- a/sino-activity/src/main/resources/templates/activity/info/configList.html +++ b/sino-activity/src/main/resources/templates/activity/info/configList.html @@ -11,11 +11,11 @@
From 86290b50de24424bc84f88e45859d1c40417d757 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Tue, 30 Mar 2021 10:38:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/activity/info/info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sino-activity/src/main/resources/templates/activity/info/info.html b/sino-activity/src/main/resources/templates/activity/info/info.html index 87d5da377..b33093807 100644 --- a/sino-activity/src/main/resources/templates/activity/info/info.html +++ b/sino-activity/src/main/resources/templates/activity/info/info.html @@ -166,7 +166,7 @@ DRAWCODE = (drawcode.length) >0 ?drawcode :null; DRAWNAME = (drawname.length) >0? drawname :null; var url = prefix +'/prizeDetail/' + DRAWCODE +"/" + encodeURIComponent(encodeURIComponent(DRAWNAME));; - $.modal.openInFoFull("奖品维护", url) + $.modal.openInFoFull("奖项维护", url) }