推荐商品,增加完成

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/affiliatedActivity/list.html

@@ -18,6 +18,12 @@
             width: 650px;
             padding-top: 20px;
         }
+        #addClassify2, #detailPro {
+            display: none;
+            width: 450px;
+            height: 260px;
+            padding-top: 20px;
+        }
         #addClassify .selectClassify {
             display: flex;
             align-items: center;
@@ -27,7 +33,7 @@
             display: flex;
         }
         .selectClassify .addAvatarItem .selectClassifyOne .span-label {
-            width: 100px;
+            width: 85px;
         }
         .picker {
             display: flex;
@@ -90,6 +96,12 @@
             color: red;
             height: 20px;
         }
+        .search-wrapper {
+            width: 100%;
+        }
+        .date-range {
+            width: 100%;
+        }
 
     </style>
 </head>
@@ -132,13 +144,12 @@
             <table id="bootstrap-table"></table>
         </div>
 
-        <!-- modal -->
-        <div id="addClassify"></div>
-
-        <!-- modal -->
-        <div id="addClassify2"></div>
-
     </div>
+    <!-- modal -->
+    <div id="addClassify"></div>
+
+    <!-- modal -->
+    <div id="addClassify2"></div>
 </div>
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: datetimepicker-js"/>
@@ -151,6 +162,7 @@
     var couType = [[${couType}]];
     var formData = new FormData();
     var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
+    let listData = []
 
     // 下线 modal
     let addActivityModalDom = `<div class="selectClassify">
@@ -212,7 +224,7 @@
                 <a class="layui-layer-btn1 layui-layer-btn1" onclick="closeModal()">取消</a>
             </div>`
 
-    let affiliatedChildModal = `<div class="selectClassify" style="width: 450px; height: 260px;">
+    let affiliatedChildModal = `<div class="selectClassify">
         <div class="addAvatarItem" style="padding: 20px;">
             <div class="selectClassifyOne" style="margin-bottom: 20px;">
                 <span class="span-label"><i style="color: red;">*</i>推荐商品：</span>
@@ -237,10 +249,11 @@
                 </select>
             </div>
         </div>
-        <div class="bottomBtn">
-            <a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="saveListAffiliated()">确定</a>
-            <a class="btn btn-default btn-xs layui-layer-btn2" href="javascript:void(0)" onclick="closeModal2()">取消</a>
-        </div>
+
+    </div>
+    <div class="bottomBtn">
+        <a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="saveListAffiliated()">确定</a>
+        <a class="btn btn-default btn-xs layui-layer-btn2" href="javascript:void(0)" onclick="closeModal2()">取消</a>
     </div>`
 
     function clickAffiliatedList(val, index) {
@@ -301,23 +314,26 @@
     // 保存
     function saveActivity () {
         let data = {
-            recommendId: $('#recommendId').val(),
+            recommendId: $('#recommendId').val() || '111',
             startTime: $('#startTime').val(),
             endTime: $('#endTime').val(),
-            activeType: $("#activeType").find("option:selected").text(),
-            status: $("#status").find("option:selected").text()
+            activeType: Number($("#activeType").find("option:selected").val()),
+            status: Number($("#status").find("option:selected").val()),
+            list: listData
         }
-        let isRequired = data.recommendId && data.startTime &&data.endTime &&data.activeType &&data.status
-        console.log('params', data)
+        let isRequired = data.recommendId && data.startTime &&data.endTime &&data.activeType
+        console.log('saveActivity-params', data)
         if (isRequired) { // 必填ok
             $.ajax({
                 url: `/kylin-recommend-active/addKylinRecommendActive`,
                 type: 'post',
-                data,
+                headers: {"Content-Type": "application/json;charset=UTF-8"},
+                data: JSON.stringify(data),
                 success: function(res) {
                     console.log('success', res)
                     if (res.code == 200) {
                         alert('新增成功')
+                        layer.close(layer.index)
                     } else {
                         layer.msg(res.msg)
                     }
@@ -331,7 +347,12 @@
     // 保存关联活动内容
     function saveListAffiliated() {
         let _recommendBindId = document.getElementsByName("recommendBindId")[0].value
-        let _type = $("#listActiveType").find("option:selected").text() // 已经获取
+        let _type = $("#listActiveType").find("option:selected").val() // 已经获取
+        listData.push({
+            recommendBindId: _recommendBindId || '666',
+            type: Number(_type)
+        })
+        layer.close(layer.index)
     }
 
     // 打开增加活动 modal
@@ -355,10 +376,10 @@
                 url: ctx + `goblin/common/mix`,
                 type: "get"
             },
-            chose: function(text, val) {
+            chose: function(text, val) { // 关闭重置
                 document.getElementsByName("recommendId")[0].value = val;
             },
-            success: function(res) {
+            success: function(res) { // 选择，赋值
                 console.log('remoteSearch-res', res)
             }
         })
@@ -395,7 +416,7 @@
         })
 
         layer.open({
-            type: 2,
+            type: 1,
             shade: .3,
             title: '增加关联推荐', // 不显示标题
             content: $('#addClassify2'), // 捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
@@ -418,8 +439,9 @@
 
     // 关闭模态框2
     function closeModal2 () {
-        $("#addClassify2").empty()
-        layer.close(2)
+        // $("#addClassify2").empty()
+        layer.close(layer.index)
+        $('#addClassify2').html('')
     }