修改标签库

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

@@ -101,7 +101,7 @@ public class GoblinSelfTagController extends BaseController {
         selfTag.setTagName(tagName);
         selfTag.setTagPic(tagPic);
         selfTag.setTagType("0");
-        selfTag.setTagBelong("1");
+        selfTag.setTagBelong("0");
 
         return toAjax(goblinSelfTagService.save(selfTag));
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/extag/extag.html

@@ -345,7 +345,7 @@
         }
         $.ajax({
             type: 'post',
-            url: '/goblin/tag/addSave',
+            url: '/goblin/extag/addSave',
             data: data,
             success: function(res) {
                 console.log(res)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/activityStoreList.html

@@ -181,7 +181,7 @@
         // }
         function goDetail(name, storeId, time, marketId) {
             console.log(name, storeId, time, marketId, '????')
-            $.modal.openTab(name, prefix2 + "/storeDetail?storeId=" + storeId + '&time=' + time + '&marketId=' + marketId)
+            $.modal.openTab(name, prefix2 + "/storeDetail?storeId=" + storeId + '&time=' + time + '&marketId=' + marketId + '&activityName=' + name)
         }
         $("#button-open-11").click(function(){
             $("button[name=refresh]").click()

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/addNewActivity.html

@@ -105,7 +105,7 @@
             </span>
             <div class="activityStore">
                 <button class="btn btn-primary" onclick="addItem()" style="margin-bottom: 12px;">新增</button>
-                <div class="activityStore_item" id="activityStore_item">
+                <div class="activityStore_item" id="activityStore_item" data-newTag="1">
                     <div class="input-group" style="margin-right: 12px;">
                         <input type="text" class="form-control storeList item1" placeholder="搜索店铺名称">
                         <div class="input-group-btn">
@@ -132,6 +132,7 @@
     let count = 1;
     var prefix2 = ctx + "local";
     let marketId = '';
+    let editDatas = 0;
     $(function() {
         let name = 'id';
         var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
@@ -161,6 +162,7 @@
                 console.log(res, 'res')
                 let basisData = res[0];
                 let { data } = res[1];
+                editDatas = data.length;
                 $("#selectShow").val(basisData.data.name);
                 $("#startTime").val(basisData.data.startTime);
                 $("#endTime").val(basisData.data.endTime);
@@ -211,10 +213,11 @@
         });
     }
     function addItem (item) {
+        console.log(item)
         count++;
         let body = '';
         if (item) {
-            body+=`<div class="activityStore_item">
+            body+=`<div class="activityStore_item" data-newTag="">
                 <div class="input-group" style="margin-right: 12px;">
                     <input type="text" class="form-control storeList item${count}" data-id="${item.storeId}" value="${item.storeName}" placeholder="搜索店铺名称">
                     <div class="input-group-btn">
@@ -225,7 +228,7 @@
                 <input type="text" class="layui-input form-control timeSp startTime${count}" id="startTime" value="${item.showTime}" autocomplete="off" placeholder="配置活动时间">
             </div>`
         } else {
-            body+=`<div class="activityStore_item">
+            body+=`<div class="activityStore_item" data-newTag="1">
                 <div class="input-group" style="margin-right: 12px;">
                     <input type="text" class="form-control storeList item${count}" placeholder="搜索店铺名称">
                     <div class="input-group-btn">
@@ -277,13 +280,26 @@
     }
     function save () {
         let obj = {};
-        let data = [];
+        let data = []; // 新增集合
+        let data2 = []; // 修改集合
         let domData = $(".activityStore_item");
         Array.prototype.forEach.call(domData,function(item,index){
             obj['marketId'] = marketId;
             obj['showTime'] = item.querySelector('.timeSp').value;
             obj['storeId'] = item.querySelector('.storeList').getAttribute('data-id');
+            obj['delTag'] = 0;
+            if (item.getAttribute('data-newTag')) {
+                obj['newTag'] = 1;
+            } else {
+                obj['newTag'] = 0;
+            }
             data.push({...obj});
+            // if (index < editDatas) {
+                
+            // } else {
+            //     data2.push({...obj});
+            // }
+            
         })
         console.log(data)
         promiseMethods('/goblin/marketing/zhengzai/store','post', JSON.stringify(data), 'application/json').then(res => {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/setGoodsRole.html

@@ -68,9 +68,34 @@
             });
         });
         $(function () {
+            let marketId = 'marketId';
+            let storeId = 'storeId';
+            let marketSpuId = 'marketSpuId';
+            var reg = new RegExp("(^|&)"+ marketId +"=([^&]*)(&|$)");
+            var reg2 = new RegExp("(^|&)"+ storeId +"=([^&]*)(&|$)");
+            var reg3 = new RegExp("(^|&)"+ marketSpuId +"=([^&]*)(&|$)");
+            var r = window.location.search.substr(1).match(reg);
+            var r2 = window.location.search.substr(1).match(reg2);
+            var r3 = window.location.search.substr(1).match(reg3);
+            let params = {
+                marketId: unescape(r[2]),
+                storeId: unescape(r2[2]),
+                marketSpuId: unescape(r3[2])
+            };
+            let data = [];
+            $.ajax({
+                url: '/goblin/marketing/zhengzai/sku',
+                type: 'post',
+                data: params,
+                success: function(params) {
+                    console.log(params)
+                    data = res.params;
+                }
+            })
+            return
             var options = {
                 id: 'setTable',
-                url: prefix + "/list",
+                // url: '/goblin/marketing/zhengzai/sku',
                 createUrl: prefix2 + "/addNewActivity",
                 detailUrl: prefix2 + "/addNewActivity?id={id}",
                 removeUrl: prefix + "/cancel/{id}",
@@ -84,6 +109,7 @@
                 showColumns: false,
                 showToggle: false,
                 pagination: false,
+                data: data,
                 columns: [
                     {
                         field: 'valFace',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/storeDetail.html

@@ -126,7 +126,7 @@
             <h3><span></span>基础信息</h3>
         </div>
         <div class="content_store_name">
-            <span>项目名称：</span><p>2022北京草莓音乐节</p>
+            <span>项目名称：</span><p id="titleName">2022北京草莓音乐节</p>
         </div>
         
         <div class="content_store_name">
@@ -170,6 +170,7 @@
         let name = 'storeId';
         let time = 'time';
         let marketId = 'marketId';
+        let activityName = 'activityName';
         var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
         var reg2 = new RegExp("(^|&)"+ time +"=([^&]*)(&|$)");
         var reg3 = new RegExp("(^|&)"+ marketId +"=([^&]*)(&|$)");
@@ -177,9 +178,9 @@
         var r2 = window.location.search.substr(1).match(reg2);
         var r3 = window.location.search.substr(1).match(reg3);
         $("#time").html(unescape(r2[2]));
-        $("#storeId").val();
-        $("#marketId").val();
-        console.log(unescape(r[2]),unescape(r2[2]),unescape(r3[2]), 'sha')
+        $("#titleName").text(GetQueryString(activityName));
+        $("#storeId").val(unescape(r[2]));
+        $("#marketId").val(unescape(r3[2]));
         let data = {
             marketId: unescape(r3[2]),
             storeId: unescape(r[2]),
@@ -257,15 +258,18 @@
                 $.table.init(options);
             }
         })
-       
     });
     var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
     var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
     var prefix = ctx + "candy/coupon/mgt";
     var prefix2 = ctx + "local";
-    
-    function setGoodsRole () {
-        let url = prefix2 + '/setGoodsRole'
+    function GetQueryString(name){
+        var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+        var r = window.location.search.substr(1).match(reg);
+        if(r!=null)return  unescape(r[2]); return null;
+    }
+    function setGoodsRole (marketId, storeId, marketSpuId) {
+        let url = prefix2 + '/setGoodsRole?marketId=' + marketId + '&storeId=' + storeId + '&marketSpuId=' + marketSpuId;
         console.log(url)
         $.modal.open("标题内容", url, '1280', '680');
     }