From 8e7280b07e51ec4109bce0c5cf1bf25e9f6c1a11 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 21 Apr 2021 14:47:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E5=A5=96=E5=93=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/prizeInfo/edit.html | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/edit.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/edit.html index 67a9ed32d..239092877 100644 --- a/sino-activity/src/main/resources/templates/activity/prizeInfo/edit.html +++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/edit.html @@ -3,6 +3,7 @@ +
@@ -37,6 +38,26 @@
+
+ +
+
+
+ +
+
+ 选择图片更改 + + 清除 +
+
+
+ +
@@ -84,6 +105,7 @@
+ \ No newline at end of file From 04b87d7ac5c23d94c8b66787befa655eec47b0fb Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 21 Apr 2021 14:53:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/info/add.html | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 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 f25981899..dc08afe29 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -47,7 +47,7 @@ top: 100px; font-size: 37px; left: 0px; - color: #F00; + color: black; width: 100%; } @@ -57,7 +57,7 @@ top: 150px; font-size: 20px; left: 0px; - color: #F00; + color: black; width: 100%; } @@ -66,7 +66,7 @@ position: absolute; top: 70%; font-size: 20px; - color: #F00; + color: black; left: 0px; width: 100%; } @@ -76,7 +76,7 @@ position: absolute; top: 78%; font-size: 20px; - color: #F00; + color: black; left: 0px; width: 100%; } @@ -97,7 +97,7 @@ top: 10%; font-size: 37px; left: 0; - color: #F00; + color: black; width: 100%; } @@ -107,7 +107,7 @@ top: 25%; font-size: 20px; left: 0; - color: #F00; + color: black; width: 100%; } @@ -117,7 +117,7 @@ top: 50%; font-size: 15px; left: 0; - color: #F00; + color: black; width: 100%; } @@ -127,7 +127,7 @@ top: 55%; font-size: 10px; left: 0; - color: #F00; + color: black; width: 80%; } @@ -137,7 +137,7 @@ top: 60%; font-size: 20px; left: 0; - color: #F00; + color: black; width: 100%; } @@ -146,7 +146,7 @@ position: absolute; top: 88%; font-size: 20px; - color: #F00; + color: black; left: 0px; width: 100%; } @@ -158,7 +158,7 @@ top: 20%; font-size: 20px; left: 0%; - color: #F00; + color: black; width: 100%; } @@ -168,7 +168,7 @@ top: 50%; font-size: 10px; left: 0%; - color: #F00; + color: black; width: 100%; } @@ -178,7 +178,7 @@ top: 50%; font-size: 37px; left: 25%; - color: #F00; + color: black; width: 100%; } @@ -192,7 +192,7 @@ top: 50%; font-size: 37px; left: 0%; - color: #F00; + color: black; width: 100%; } @@ -202,7 +202,7 @@ top: 70%; font-size: 25px; left: 0%; - color: #F00; + color: black; width: 100%; } From f8a8488b83ef66890cfc08b51c09aa8a87ccacb3 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 21 Apr 2021 15:14:44 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=90=8E=E7=AB=AF-=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=AD=A5=E9=A1=B5=E9=9D=A2=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/info/add.html | 58 ++++++++----------- 1 file changed, 24 insertions(+), 34 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 dc08afe29..2a1bfd98b 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -363,22 +363,25 @@
- -
+
+
- -
-
-
+
+
+
+
选择图片更改 - - 清除 + + 清除 +
+
+
-
@@ -394,19 +397,6 @@
- - - - - - - - - - - - -
@@ -419,18 +409,18 @@
-
-
-
- -
-
-
+
+
+
+ +
+
例如：http：//xx -
-
- +
+
+
+
From a72407644ea092d6a177236f510253ff9d3a4371 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 21 Apr 2021 15:24:39 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=90=8E=E7=AB=AF-=E7=AC=AC=E5=9B=9B?= =?UTF-8?q?=E6=AD=A5=E9=A1=B5=E9=9D=A2=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/activity/info/add.html | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 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 2a1bfd98b..16aec60fb 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -482,7 +482,6 @@
-
@@ -505,8 +504,6 @@
- -
@@ -532,8 +529,6 @@
- -
@@ -556,8 +551,6 @@
- -
@@ -573,12 +566,9 @@
- -
-
-
+
+
-
@@ -1010,6 +1000,10 @@ height:200, lang: 'zh-CN' }); + $('.summernote1').summernote({ + height:200, + lang: 'zh-CN' + }); // 工具栏按钮 var btnFinish = $('').text('完成') .addClass('btn btn-info') From 404bfa5400ecc365c01fc9fd2f803a20b0b32dcc Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 21 Apr 2021 16:53:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=90=8E=E7=AB=AF-=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/info/add.html | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 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 16aec60fb..cf1b94e93 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -250,8 +250,8 @@
- +
@@ -286,7 +286,7 @@
+ type="text" maxlength="30" required>
@@ -298,7 +298,7 @@
+ placeholder="yyyy-MM-dd HH:mm:ss" type="text" required>
@@ -310,7 +310,7 @@
+ placeholder="yyyy-MM-dd HH:mm:ss" type="text" required>
@@ -345,7 +345,7 @@
+ maxlength="30" onkeyup="updatePic(this)" required>
@@ -357,7 +357,7 @@
+ maxlength="30" onkeyup="updatePic(this)" required>
@@ -374,13 +374,13 @@ 选择图片更改 + onchange="syncPic(this)" required> 清除 - + @@ -392,7 +392,7 @@ + maxlength="30" onkeyup="updatePic(this)" required> @@ -400,7 +400,7 @@
- +
- +
例如：http：//xx @@ -470,7 +470,7 @@
- +
@@ -506,7 +506,7 @@
- +
- +
- +
- +
+ type="text" maxlength="30" th:value="*{drawInfo.DRAWNAME}" required>
@@ -286,7 +286,7 @@
+ type="text" maxlength="30" th:value="*{drawInfo.EXPENOVALUE}" required>
@@ -298,7 +298,7 @@
+ placeholder="yyyy-MM-dd HH:mm:ss" type="text" required>
@@ -310,7 +310,7 @@
+ placeholder="yyyy-MM-dd HH:mm:ss" type="text" required>
@@ -344,7 +344,7 @@
+ maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actTitle}" required>
@@ -356,7 +356,7 @@
+ maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actDesc}" required>
@@ -374,7 +374,7 @@
选择图片更改 - + 清除
@@ -390,7 +390,7 @@ + maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}" required>
@@ -411,7 +411,7 @@
- +
- +
@@ -479,7 +479,7 @@
- +
@@ -517,7 +517,7 @@
- +
- +
- +
- +