Merge remote-tracking branch 'origin/0727RecommendActive' into 0727RecommendActive

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/LocalAdminController.java

@@ -211,6 +211,11 @@ public class LocalAdminController extends BaseController
     {
         return activityPrefix + "/affiliatedActivity/list";
     }
+    @GetMapping("/affiliatedActivityadd") // 关联活动-编辑
+    public String affiliatedActivityadd()
+    {
+        return activityPrefix + "/affiliatedActivity/add";
+    }
     @GetMapping("/affiliatedActivityEdit") // 关联活动-编辑
     public String affiliatedActivityEdit()
     {

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

@@ -50,7 +50,7 @@
             margin-right: 10px;
         }
         .storeList, #selectShow, .dropdown-menu, .input-group {
-            width: 270px !important;
+            width: 320px !important;
         }
         .activityStore_item {
             display: flex;
@@ -68,7 +68,6 @@
 
         #addClassify2, #detailPro {
             width: 450px;
-            height: 260px;
             padding-top: 20px;
         }
         .addAvatarItem .selectClassifyOne {
@@ -167,7 +166,6 @@
             </span>
             <div class="input-group" style="width: 300px;">
                 <select name="activeType" id="activeType" class="form-control m-b">
-                    <option value="">所有</option>
                     <option value="1">NFT</option>
                     <option value="2">组合购</option>
                     <option value="3">演出</option>
@@ -256,7 +254,9 @@
 
     let prefix2 = ctx + "local";
     let itemId = Number(getUrlParms('id'))
-    let affiliatedUrl = ['', 'goblin/common/sku', 'goblin/common/mix', 'kylin/performances/roadShow/performance/status', 'compilations/goodsList']
+    let affiliatedUrl = ['goblin/common/sku', 'goblin/common/mix', 'kylin/performances/roadShow/performance/status', 'compilations/goodsList']
+    let currentUrl = 'goblin/common/sku'
+    let activeTypeChangeVal = 1
     let listData = []
     let isOneDom = $('#addClassify2').find($('.addAvatarItem')).length + 1 // 判断是否默认一组表单
     let _recommendId = ''
@@ -281,6 +281,13 @@
             });
         });
 
+        // 选择select
+        $('#activeType').change(function () {
+            activeTypeChangeVal = Number($(this).val()) // 1 2 3 4
+            currentUrl = affiliatedUrl[activeTypeChangeVal - 1] // 获取选中的，对应地址
+
+        })
+
         // 监听 模糊搜索
         let search = new searchSelect('#search', [], function(val) {
             let _params = {}
@@ -334,23 +341,24 @@
             promiseMethods('/kylin-recommend-active/getActiveById', 'post', { mid: itemId }).then(res => {
                 console.log('res', res)
                 if (res) {
-                    // $.operate.successCallback(res);
 
                     list = res.list
 
                     _recommendId = res.recommendId
 
-                    $('#activeName').attr('value', res.name)
+                    $('#activeName').attr('value', res.activeName)
 
                     $('#activeType').find(`option[value=${res.activeType}]`).attr('selected', true)
 
-                    $('#search input').attr('value', res.activeBindId)
+                    $('#search input').attr('value', res.activeBindName)
+
+                    $('#search input').attr('data-id', res.activeBindId)
 
                     $('#status').find(`option[value=${res.status}]`).attr('selected', true)
 
-                    $('#startTime').attr('value', res.startTime)
+                    $('#startTime').attr('value', $.common.dateFormat(new Date(res.startTime), 'yyyy-MM-dd HH:mm:ss'))
 
-                    $('#endTime').attr('value', res.endTime)
+                    $('#endTime').attr('value', $.common.dateFormat(new Date(res.endTime), 'yyyy-MM-dd HH:mm:ss'))
 
                     assembleDom(list)
 
@@ -364,7 +372,8 @@
                     // 回显 search
                     setTimeout(() => {
                         for (let i = 0; i < list.length; i++) {
-                            $('#listRemoteSearch' + (i + 1) + ' input').attr('value', list[i].recommendActiveId)
+                            $('#listRemoteSearch' + (i + 1) + ' input').attr('value', list[i].name)
+                            $('#listRemoteSearch' + (i + 1) + ' input').attr('data-id', list[i].recommendId)
                             $('#listActiveType' + (i + 1)).find(`option[value=${list[i].type}]`).attr('selected', true)
                         }
                     }, 800)
@@ -395,7 +404,6 @@
                 <div class="selectClassifyOne">
                     <span class="span-label"><i style="color: red;">*</i>推荐类型：</span>
                     <select id="listActiveType${index + 1}" value="${item.type}" class="form-control m-b">
-                        <option value="">所有</option>
                         <option value="1">NFT</option>
                         <option value="2">组合购</option>
                         <option value="3">演出</option>
@@ -411,19 +419,20 @@
 
     // 添加关联推荐 html 单个添加
     function addDom () {
+        let dynamicDomLength = $('#addClassify2').find($('.addAvatarItem')).length // dom1 dom2 dom3
+
         let dynamicAddDom = `<div class="addAvatarItem" style="padding: 20px;">
                 <div class="selectClassifyOne" style="margin-bottom: 20px;">
                     <span class="span-label"><i style="color: red;">*</i>推荐商品：</span>
                     <div class="search-wrapper">
                         <div class="search-wrapper" style="margin-bottom: 15px;">
-                            <div id="listRemoteSearch${isOneDom + 1}"  placeholder="请搜索" name="searchSelect${isOneDom + 1}"></div>
+                            <div id="listRemoteSearch${dynamicDomLength + 1}"  placeholder="请搜索" name="searchSelect${dynamicDomLength + 1}"></div>
                         </div>
                     </div>
                 </div>
                 <div class="selectClassifyOne">
                     <span class="span-label"><i style="color: red;">*</i>推荐类型：</span>
-                    <select id="listActiveType${isOneDom + 1}" class="form-control m-b">
-                        <option value="">所有</option>
+                    <select id="listActiveType${dynamicDomLength + 1}" class="form-control m-b">
                         <option value="1">NFT</option>
                         <option value="2">组合购</option>
                         <option value="3">演出</option>
@@ -433,13 +442,12 @@
 
 
         // 只有一组，可添加
-        if (isOneDom) {
-            console.log('只有一组，可添加', isOneDom)
+        if (dynamicDomLength) {
             $('#addClassify2').append(dynamicAddDom)
 
             setTimeout(() => {
-                varObj['listRemoteSearch'+(isOneDom+1)] = new searchSelect(`#listRemoteSearch${isOneDom + 1}`, [], function(val) {
-                    searchAjax(val, isOneDom + 1)
+                varObj['listRemoteSearch'+(dynamicDomLength+1)] = new searchSelect(`#listRemoteSearch${dynamicDomLength + 1}`, [], function(val) {
+                    searchAjax(val, dynamicDomLength + 1)
                 })
 
             }, 600)
@@ -483,7 +491,7 @@
             }
             $.ajax({
                 type: 'get',
-                url: ctx + affiliatedUrl[_selectVal],
+                url: ctx + affiliatedUrl[_selectVal - 1],
                 contentType: "application/json;charset=UTF-8",
                 data: _params,
                 success: function(res) {
@@ -519,8 +527,6 @@
 
                     varObj[Object.keys(varObj)[index - 1]].update(_data) // 更新数据
 
-
-
                 }
             })
         }
@@ -536,7 +542,7 @@
         for (let i = 0; i < evryGroup.length; i++) {
             listData.push({
                 recommendBindId: $('#listRemoteSearch' + (i+1)).find('input').attr('data-id'),
-                type: $("#listActiveType" + (i+1)).find("option:selected").val()
+                type: Number($("#listActiveType" + (i+1)).find("option:selected").val())
             })
 
 
@@ -544,15 +550,16 @@
 
         console.log('listData', listData)
 
+        // bindId - 关联 id
         let _params = {
             activeBindId: $('#search input').attr('data-id'),
             activeName: $('#activeName').val(),
             activeType: Number($("#activeType").find("option:selected").val()),
-            endTime: $('#endTime').val(),
+            endTime: $.common.dateFormat($('#endTime').val(), 'yyyy-MM-dd HH:mm:ss'),
             list: listData,
             mid: itemId,
             recommendId: _recommendId,
-            startTime: $('#startTime').val(),
+            startTime: $.common.dateFormat($('#startTime').val(), 'yyyy-MM-dd HH:mm:ss'),
             status: Number($("#status").find("option:selected").val())
         }
 
@@ -561,8 +568,10 @@
         // 修改活动
         promiseMethods('/kylin-recommend-active/updateKylinRecommendActive','post', JSON.stringify(_params), 'application/json').then(res => {
 
-            if (res.code == 200) {
-                $.operate.successCallback(res);
+            if (res.code == 0) {
+                layer.msg('修改成功')
+                $.operate.successTabCallback(res);
+                closeItem();
             } else {
                 layer.msg(res.message)
             }

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

@@ -179,7 +179,7 @@
         </div> -->
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-primary" onclick="openAddActivityModal()" shiro:hasPermission="monitor:job:export">
+            <a class="btn btn-primary" onclick="toadd()" shiro:hasPermission="monitor:job:export">
                 增加活动
             </a>
         </div>
@@ -311,7 +311,7 @@
     function clickAffiliatedList(val, index) {
         openAffiliatedModal(val, index)
     }
-
+    console.log(121212122)
     // document 加载
     $(function () {
         var options = {
@@ -612,6 +612,12 @@
 
     }
 
+    // 跳转 增加
+    function toadd () {
+        let url = ctx + 'local/affiliatedActivityadd';
+        $.modal.openTab("关联活动增加", url);
+    }
+
     // 跳转 编辑
     function toEdit (id) {
         let url = ctx + 'local/affiliatedActivityEdit?id=' + id;