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

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

@@ -201,7 +201,6 @@
                 <div class="selectClassifyOne">
                     <span class="span-label"><i style="color: red;">*</i>关联类型：</span>
                     <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>
@@ -229,9 +228,9 @@
                 <div class="selectClassifyOne">
                     <span class="span-label"><i style="color: red;">*</i>时间范围：</span>
                     <div class="date-range"  style="margin-bottom: 15px;">
-                        <input type="text" style="width: 200px;float: left" class="form-control" id="startTime" placeholder="开始时间选择" name="startTime"/>
+                        <input type="text" style="width: 200px;float: left" class="form-control" id="startTime" autocomplete=“off” placeholder="开始时间选择" name="startTime"/>
                         <span class="control-label" style="float: left;margin-left: 10px;margin-right: 10px"> - </span>
-                        <input type="text" style="width: 200px;float: left" class="form-control" id="endTime" placeholder="结束时间选择" name="endTime"/>
+                        <input type="text" style="width: 200px;float: left" class="form-control" id="endTime" autocomplete=“off” placeholder="结束时间选择" name="endTime"/>
                     </div>
                 </div>
 
@@ -269,7 +268,6 @@
                 <div class="selectClassifyOne">
                     <span class="span-label"><i style="color: red;">*</i>推荐类型：</span>
                     <select name="activeType" id="listActiveType1" class="form-control m-b" style="width: 170px;">
-                        <option value="">所有</option>
                         <option value="1">NFT</option>
                         <option value="2">组合购</option>
                         <option value="3">演出</option>
@@ -299,8 +297,8 @@
     let listData = [] // 临时暂存 嵌套活动推荐
     let activeTypeChangeVal = 0 // 关联id select
     let activeTypeChangeValChild = 0 // list 中 关联id select
-    let affiliatedUrl = ['', 'goblin/common/sku', 'goblin/common/mix', 'kylin/performances/roadShow/performance/status', 'compilations/goodsList']
-    let currentUrl = ''
+    let affiliatedUrl = ['goblin/common/sku', 'goblin/common/mix', 'kylin/performances/roadShow/performance/status', 'compilations/goodsList']
+    let currentUrl = 'goblin/common/sku'
     let currentChildUrl = ''
     let affiliatedData = []
     let affiliatedChildData = []
@@ -322,7 +320,7 @@
             modalName: "关联",
             columns: [
                 {
-                    field: 'name',
+                    field: 'activeName',
                     title: '活动名称'
                 },
                 {
@@ -343,7 +341,7 @@
                 },
                 {
                     field: 'name',
-                    title: '活动名称'
+                    title: '关联名称'
                 },
                 {
                     field: 'createdAt',
@@ -377,13 +375,13 @@
         // 选择select
         $('#activeType').change(function () {
             activeTypeChangeVal = Number($(this).val()) // 1 2 3 4
-            currentUrl = affiliatedUrl[activeTypeChangeVal]
+            currentUrl = affiliatedUrl[activeTypeChangeVal-1]
 
         })
 
         $('#listActiveType1').change(function () {
             activeTypeChangeValChild = Number($(this).val()) // 1 2 3 4
-            currentChildUrl = affiliatedUrl[activeTypeChangeValChild]
+            currentChildUrl = affiliatedUrl[activeTypeChangeValChild-1]
         })
 
         // 监听 模糊搜索