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/add.html

@@ -326,11 +326,12 @@
             } else if (activeTypeChangeVal == 2) { // 组合购
                 _params['title'] = val
             } else if (activeTypeChangeVal == 3) { // 演出
-                _params['status'] = '(3,6,7,9,10)'
+                _params['status'] = '(3,6,7,8,9,10)'
                 _params['title'] = val
             } else if (activeTypeChangeVal == 4) { // 商品
                 _params['name'] = val
             }
+            console.log('searchSelect', activeTypeChangeVal, _params)
             $.ajax({
                 type: 'get',
                 url: ctx + currentUrl,
@@ -535,8 +536,6 @@
             searchAjax(val, index)
         })
 
-        console.log('varObj', varObj)
-
     }
 
     function searchAjax (val, index) {
@@ -550,7 +549,7 @@
             } else if (_selectVal == 2) { // 组合购
                 _params['title'] = val
             } else if (_selectVal == 3) { // 演出
-                _params['status'] = '(3,6,7,9,10)'
+                _params['status'] = '(3,6,7,8,9,10)'
                 _params['title'] = val
             } else if (_selectVal == 4) { // 商品
                 _params['name'] = val
@@ -568,8 +567,6 @@
                     let yan = res.value || []
                     let sp = res.data || []
 
-                    console.log('_selectVal', _selectVal)
-
                     if (_selectVal == 1) {
                         _data = nft?.map(item => { // 组装返回nft数据
                             return { id: item.spuId, value: item.spuName }

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

@@ -311,7 +311,6 @@
         $('#activeType').change(function () {
             activeTypeChangeVal = Number($(this).val()) // 1 2 3 4
             currentUrl = affiliatedUrl[activeTypeChangeVal - 1] // 获取选中的，对应地址
-
         })
 
         // 监听 模糊搜索
@@ -323,30 +322,41 @@
             } else if (activeTypeChangeVal == 2) { // 组合购
                 _params['title'] = val
             } else if (activeTypeChangeVal == 3) { // 演出
-                _params['status'] = '(3,6,7,9,10)'
                 _params['title'] = val
+                _params['status'] = '(3,6,7,8,9,10)'
             } else if (activeTypeChangeVal == 4) { // 商品
                 _params['name'] = val
-                // _params['title'] = val
             }
+
             $.ajax({
                 type: 'get',
                 url: ctx + currentUrl,
                 contentType: "application/json;charset=UTF-8",
                 data: _params,
                 success: function(res) {
-                    let forData = activeTypeChangeVal === 3 ? res.value : res.data
-                    let _data = forData.map(item => {
-                        if (activeTypeChangeVal === 1) { // NFT
+                    let _data = []
+                    let nft = res.data || []
+                    let group = res.data || []
+                    let yan = res.value || []
+                    let sp = res.data || []
+
+                    if (activeTypeChangeVal == 1) {
+                        _data = nft?.map(item => { // 组装返回nft数据
                             return { id: item.spuId, value: item.spuName }
-                        } else if (activeTypeChangeVal === 2) {
+                        })
+                    } else if (activeTypeChangeVal == 2) {
+                        _data = group?.map(item => {
                             return { id: item.mixId, value: item.sellName }
-                        } else if (activeTypeChangeVal === 3) {
+                        })
+                    } else if (activeTypeChangeVal == 3) {
+                        _data = yan?.map(item => {
                             return { id: item.performancesId, value: item.title }
-                        } else if (activeTypeChangeVal === 4) { // 商品
+                        })
+                    } else if (activeTypeChangeVal == 4) {
+                        _data = sp?.map(item => {
                             return { id: item.spuId, value: item.name }
-                        }
-                    })
+                        })
+                    }
                     search.update(_data)
 
                 }
@@ -375,6 +385,8 @@
 
                     $('#activeType').find(`option[value=${res.activeType}]`).attr('selected', true)
 
+                    activeTypeChangeVal = res.activeType
+
                     currentUrl = affiliatedUrl[res.activeType - 1]
 
                     $('#search input').attr('value', res.name)
@@ -569,8 +581,6 @@
             searchAjax(val, index)
         })
 
-        console.log('varObj', varObj)
-
     }
 
     function searchAjax (val, index) {
@@ -584,7 +594,7 @@
             } else if (_selectVal == 2) { // 组合购
                 _params['title'] = val
             } else if (_selectVal == 3) { // 演出
-                _params['status'] = '(3,6,7,9,10)'
+                _params['status'] = '(3,6,7,8,9,10)'
                 _params['title'] = val
             } else if (_selectVal == 4) { // 商品
                 _params['name'] = val
@@ -645,7 +655,6 @@
             status: Number($("#status").find("option:selected").val())
         }
 
-
         if (!_params.activeName) {
             layer.msg('请填写活动名称')
             return