From 79a24d0c4a2bb91e827daa1271ce6cb5bdf9dc69 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Mon, 12 Apr 2021 16:41:15 +0800 Subject: [PATCH 1/3] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sinosoft/activity/controller/DrawInfoController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java index 19d4df37b..caa8fcb8e 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java @@ -178,7 +178,7 @@ public class DrawInfoController extends BaseController ActPageConfigSubscribe actPageConfigSubscribe= iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(drawInfo.getDRAWCODE()); vo.setActPageConfigSubscribe(actPageConfigSubscribe); mmap.put("vo",vo); - return prefix + "/edit"; + return prefix + "/edit1"; } /** @@ -188,7 +188,7 @@ public class DrawInfoController extends BaseController @Log(title = "抽奖活动管理", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(ActVO vo) + public AjaxResult editSave(@RequestBody ActVO vo) { try{ logger.info("前台传参"+ JSON.toJSONString(vo)); From 96ef2dcd130a6dc42ac8796916e907cbd5ea1ec4 Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Tue, 13 Apr 2021 09:53:32 +0800 Subject: [PATCH 2/3] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/info/edit1.html | 92 ++++++++++++------- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html index 6d3e73455..b5e32767e 100644 --- a/sino-activity/src/main/resources/templates/activity/info/edit1.html +++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html @@ -15,8 +15,8 @@ .leftarea { float: left; - width: 50%; - height: 300px; + width: 60%; + height: 500px; } .sw > .tab-content { @@ -140,21 +140,19 @@ /* 配置分享信息*/ .drawShareTitlePri { - text-align: center; position: absolute; - top: 40%; + top: 45%; font-size: 20px; - left: 28%; + left: 73%; color: #F00; width: 100%; } .drawShareDescribePri { - text-align: center; position: absolute; top: 50%; font-size: 10px; - left: 25%; + left: 73%; color: #F00; width: 100%; } @@ -162,9 +160,9 @@ .drawShareImgPic { text-align: center; position: absolute; - top: 50%; + top: 52%; font-size: 37px; - left: 35%; + left: 38%; color: #F00; width: 100%; } @@ -579,7 +577,7 @@
+
@@ -965,10 +963,7 @@
});
- function submitHandler() {
- var data = $("#form-info-add").serializeArray();
- $.operate.saveModal(prefix + "/add", data);
- }
+
//时间段抽奖配置
function dailyflag() {
@@ -1146,9 +1141,42 @@
}
}
});
+ //记载步骤5数据
+ var title = $("#title").val();
+ $("#titlePri").text(title);
+ var describe = $("#describe").val();
+ $("#describePri").text(describe);
+ var agreement = $("#agreement").val();
+ $("#agreementPri").text(agreement);
+ var btn = $("#btn").val();
+ $("#btnPri").text(btn);
+ var pictureval = $("#pictureval").val();
+ $("#pictureimg").attr("src", picval);
+ $("input[type='checkbox'][name ^='actPageConfigUserinfo']").each(function (){
+ var id = this.id;
+ var boolean = $("#" + id).prop("checked");
+ if (boolean) {
+ $("#" + id + "Pri").attr('type', 'text');
+ } else {
+ $("#" + id + "Pri").attr('type', 'hidden');
+ }
+ });
-
+ //记载步骤6数据
+ var shareDescribe = $("#shareDescribe").val();
+ $("#shareDescribePri").text(shareDescribe);
+ var shareTitle = $("#shareTitle").val();
+ $("#shareTitlePri").text(shareTitle);
+ var shareImgval = $("#shareImgval").val();
+ $("#shareImgimg").attr("src", shareImgval);
+ //记载步骤7数据
+ var qrCode = $("#qrCode").val();
+ $("#qrCodePri").text(qrCode);
+ var backdropImgval = $("#backdropImgval").val();
+ $("#backdropImgimg").attr("src", backdropImgval);
+ var qrCodeImgval = $("#qrCodeImgval").val();
+ $("#qrCodeImgimg").attr("src", qrCodeImgval);
});
// 显示步骤时将触发事件
@@ -1279,7 +1307,7 @@
}
function activityTemplate(val) {
- var path = "../../../img/act/";
+ var path = "../../img/act/";
$(val).addClass('btn-success').siblings().removeClass('btn-success');
var id = val.id;
var valus = $("#"+id+".btn-success").attr("value");
From 85e769e4b9a918a23c13bb387d403341cef9d541 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 10:07:30 +0800
Subject: [PATCH 3/3] =?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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../activity/ActPageConfigUserinfoMapper.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
index d088c24dd..0656f0def 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
@@ -110,14 +110,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"