From 16829f6138c0026bdd84eb9c185a5e96a6da191b Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Thu, 8 Apr 2021 15:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/ruoyi/js/ry-ui.js   |  2 +-
 .../controller/DrawInfoController.java        | 16 ++++++++----
 .../templates/activity/info/add.html          | 25 ++++++++++++++++---
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 581c36be5..e35b73ff6 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -1786,7 +1786,7 @@ var customSerialize = function(form, json, callback) {
         next_node[k2] = v;
     });
     if (arguments[1] && arguments[1] == true) {
-        var json = JSON.stringify(res2);
+        var json = JSON.stringify(res3);
         // if (callback) callback(json);
         return json;
     } else {
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 6ca42a447..d966af34d 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
@@ -7,22 +7,20 @@ import java.util.List;
 
 
 import com.alibaba.fastjson.JSON;
+import com.sinosoft.activity.domain.ActConfig;
 import com.sinosoft.activity.domain.DrawInfo;
 import com.sinosoft.activity.domain.DrawPrizeInfo;
 import com.sinosoft.activity.domain.DrawRule;
 import com.sinosoft.activity.service.IDrawInfoService;
 import com.sinosoft.activity.service.IDrawPrizeInfoService;
 import com.sinosoft.activity.service.IDrawRuleService;
+import com.sinosoft.activity.vo.ActVO;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 
@@ -117,6 +115,14 @@ public class DrawInfoController extends BaseController
         return toAjax(i);
     }
 
+    @PostMapping("/add/test")
+    @ResponseBody
+    public AjaxResult addtest(@RequestBody ActVO vo){
+        ActConfig actConfig = vo.getActConfig();
+        return null;
+    }
+
+
     /**
      * 修改抽奖活动管理
      */
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 d81458901..9937c3ef0 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -241,7 +241,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">状态：</label>
                                         <div class="col-sm-8">
-                                            <select name="drawInfo-STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
+                                            <select name="drawInfo-status" class="form-control" th:with="type=${@dict.getType('start_stop')}">
                                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  ></option>
                                             </select>
                                         </div>
@@ -981,8 +981,27 @@
             .addClass('btn btn-info')
             .on('click', function () {
                 //添加保存逻辑
-                var data = customSerialize("form-info-add",false);
-
+                var data = customSerialize("form-info-add",true);
+                alert(data);
+                $.ajax({
+                    url: prefix + "/add/test",
+                    data: data,
+                    type: "post",
+                    contentType: "application/json;charset=UTF-8",
+                    success: function(result) {
+                        if (result.code == web_status.SUCCESS) {
+                            layer.msg("保存成功,正在刷新数据请稍后……", {
+                                icon: 1,
+                                time: 500,
+                                shade: [0.1, '#8F8F8F']
+                            },function() {
+                                location.reload();
+                            });
+                        } else {
+                            alert(result.msg);
+                        }
+                    }
+                })
             });
         var btnCancel = $('<a id="btn-cancel"></a>').text('取消')
             .addClass('btn btn-danger')