修改bug

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

@@ -355,6 +355,8 @@
                     closeModal();
                     reset()
                     $("button[name=refresh]").click()
+                } else {
+                    layer.msg(res.msg)
                 }
             }
         })

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

@@ -297,6 +297,9 @@
         $("#viewImg").attr('src', '');
     }
     function yes(index, layero) {
+        if (!$("#musicName").val() || !$("#viewImg").attr('src')) {
+            return layer.msg('请将内容填写完整！')
+        }
         let data = {
             tagName: $("#musicName").val(),
             tagPic: $("#viewImg").attr('src')

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

@@ -202,7 +202,11 @@
             data.status = status;
             promiseMethods('/goblin/marketing/zhengzai/status', 'post', data).then(res => {
                 if (res.code == 0) {
+                    if (type == 3) {
+                        layer.msg('删除成功！')
+                    } else {
                         layer.msg('修改状态成功！')
+                    }
                     setTimeout(() => {
                         $("#searchBtns").click(); 
                     }, 500);

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

@@ -282,10 +282,14 @@
         let data = []; // 新增集合
         let data2 = []; // 修改集合
         let domData = $(".activityStore_item");
+        let flag = false;
         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');
+            if (!item.querySelector('.timeSp').value || !item.querySelector('.storeList').getAttribute('data-id')) {
+                flag = true;
+            }
             obj['delTag'] = 0;
             if (item.getAttribute('data-newTag')) {
                 obj['newTag'] = 1;
@@ -300,8 +304,18 @@
             // }
             
         })
+        if (flag) {
+            layer.msg('请将选项填写完整！')
+            flag = false
+            return
+        }
         promiseMethods('/goblin/marketing/zhengzai/store','post', JSON.stringify(data), 'application/json').then(res => {
+            if (res.code == 0) {
                 $.operate.successCallback(res);
+            } else {
+                layer.msg(res.message)
+            }
+            
         })
     }
     function promiseMethods(url,type,data,contentType) {

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

@@ -121,7 +121,7 @@
                             align: 'center'
                         },
                         {
-                            field: 'bindType',
+                            field: 'priceMarketing',
                             // title: `线下售价<a onclick="setPrice(1)">批量</a>`,
                             title: `线下售价`,
                             width: '150',
@@ -132,17 +132,23 @@
                             // title: '库存限量<a onclick="setPrice(2)">批量</a>',
                             title: '库存限量',
                             width: '150',
-                            align: 'center'
+                            align: 'center',
+                            formatter: function (value, row, index) {
+                                let str = '';
+                                if (value == 0) {
+                                    str = '无限量';
+                                } else {
+                                    str = value;
+                                }
+                                return str
+                            }
                         },
                         {
                             field: 'buyRoster',
                             // title: '用户限购<a onclick="setPrice(3)">批量</a>',
                             title: '用户限购',
                             width: '150',
-                            align: 'center',
-                            formatter: function (value, row) {
-
-                            }
+                            align: 'center'
                         },
                         {
                             title: '购买条件',