From b0da0a51ca31f48ec2870af2ed699719bb54fe10 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Mon, 12 Apr 2021 10:22:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8A=BD?=
 =?UTF-8?q?=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

---
 .../src/main/resources/static/img/bj.png      | Bin 0 -> 4836 bytes
 .../controller/DrawInfoController.java        |   1 +
 .../templates/activity/info/add.html          |  35 +++++++-----------
 3 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/static/img/bj.png

diff --git a/ruoyi-admin/src/main/resources/static/img/bj.png b/ruoyi-admin/src/main/resources/static/img/bj.png
new file mode 100644
index 0000000000000000000000000000000000000000..042d0c05178fb919d9b539fa7dc5c3fa57287d5a
GIT binary patch
literal 4836
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
NjP%UlFK)Uf{vSZe@^=6L

literal 0
HcmV?d00001

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 28f674b3c..c3dfd9c45 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
@@ -104,6 +104,7 @@ public class DrawInfoController extends BaseController
             //新增分享信息
             vo.getActConfig().setCreateTime(date);
             vo.getActConfig().setActCode(code);
+            vo.getActConfig().setActName(vo.getDrawInfo().getDRAWNAME());
             iActConfigService.insertActConfig(vo.getActConfig());
             //新增二维码信息
             vo.getActPageConfigSubscribe().setCreateTime(date);
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 f614c25c4..8c5e198dc 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.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%;
     }
@@ -568,7 +566,7 @@
                     </div>
                 </div>
                 <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 610px">
+                    <div style="height: 810px">
                         <div class="leftarea">
                             <h4 class="form-header h4">第五步-配置收集信息</h4>
                             <div class="row">
@@ -600,9 +598,8 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">协议内容：</label>
                                         <div class="col-sm-8">
-                                            <input id="agreement" name="actPageConfigUserinfo-agreement" height="100px"
-                                                   class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePri(this)">
+                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement"   cols="40" rows="6" onkeyup="updatePri(this)">
+                                            </textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -784,9 +781,8 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">分享描述：</label>
                                         <div class="col-sm-8">
-                                            <input id="shareDescribe" name="actConfig-shareDesc"
-                                                   placeholder="例如：参与活动，赢大奖" class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePri(this)">
+                                             <textarea id="shareDescribe"  name="actConfig-shareDesc"  cols="40" rows="6" onkeyup="updatePri(this)">
+                                            </textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -814,7 +810,7 @@
                             <h4 class="form-header h4">效果图</h4>
                             <div style="height: 210px">
                                 <div class="drawShareImg2Pic">
-                                    <img id="ss" src="../../img/shj.jpg" width="254" height="142">
+                                    <img id="ss" src="../../img/bj.png" height="170" width="340">
                                 </div>
                                 <div class="drawShareImgPic">
                                     <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
@@ -940,10 +936,7 @@
     });
 
 
-    function submitHandler() {
-        var data = $("#form-info-add").serializeArray();
-        $.operate.saveModal(prefix + "/add", data);
-    }
+
 
     //时间段抽奖配置
     function dailyflag() {