Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/index.html

@@ -237,30 +237,30 @@
             switch(num) {
                 case 1:
                     // $.modal.open('添加用户', prefix2 + "/form", '900', '320', callback);
-                    $.modal.open('金刚位', prefix2 + "/kingArea?id=" + 1212,560,800, cancel)
+                    $.modal.open('金刚位', prefix2 + "/kingArea?id=" + 1212,900,560, cancel)
                     break;
                 case 5:
-                    $.modal.open('商品搜索', prefix2 + "/searchStore?id=" + 1212,560,800, cancel)
+                    $.modal.open('商品搜索', prefix2 + "/searchStore?id=" + 1212,900,560, cancel)
                     // $.modal.openTab('商品搜索', prefix2 + "/searchStore?id=" + 1212)
                     break;
                 case 6:
-                    $.modal.open('顶部banner', prefix2 + "/topBanner?id=" + num,560,800, cancel)
+                    $.modal.open('顶部banner', prefix2 + "/topBanner?id=" + num,900,560, cancel)
                     // $.modal.openTab('顶部banner', prefix2 + "/topBanner?id=" + num)
                     break;
                 case 2:
-                    $.modal.open('活动banner', prefix2 + "/topBanner?id=" + num,560,800, cancel)
+                    $.modal.open('活动banner', prefix2 + "/topBanner?id=" + num,900,560, cancel)
                     // $.modal.openTab('活动banner', prefix2 + "/topBanner?id=" + num)
                     break;
                 case 4:
-                    $.modal.open('魔方位', prefix2 + "/RubikArea?id=" + num,560,800, cancel)
+                    $.modal.open('魔方位', prefix2 + "/RubikArea?id=" + num,900,560, cancel)
                     // $.modal.openTab('魔方位', prefix2 + "/RubikArea?id=" + num)
                     break;
                 case 7:
-                    $.modal.open('精选商品', prefix2 + "/carefullyGoods?id=" + num,560,800, cancel)
+                    $.modal.open('精选商品', prefix2 + "/carefullyGoods?id=" + num,900,560, cancel)
                     // $.modal.openTab('精选商品', prefix2 + "/carefullyGoods?id=" + num)
                     break;
                 case 8:
-                    $.modal.open('新品推荐', prefix2 + "/newRecommended?id=" + num,560,800, cancel)
+                    $.modal.open('新品推荐', prefix2 + "/newRecommended?id=" + num,900,560, cancel)
             }
         }
         function delSp (num) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/topBanner.html

@@ -193,6 +193,7 @@
                 $("#tall").html('');
                 $("#tags").hide();
                 $("#activeTags").show();
+                $("#showMiddleBanner").show();
             } else {
                 type = 1
                 $("#tags").show();
@@ -408,7 +409,7 @@
                 data.push({...obj})
             });//foreach js6章封装的方法
             promiseMethods('/frontBanner/updateOrCreate', 'post', JSON.stringify(data), 'application/json').then(res => {
-                // if (type == 2) {
+                if (type == 2) {
                     let data = {
                         "mid": 1,
                         "moudleIndexId": "708753099180072962244503",
@@ -420,7 +421,9 @@
                         "status": 0
                     };
                     return promiseMethods('/front-index/update', 'post', JSON.stringify(data), 'application/json')
-                // }
+                } else {
+                    $.operate.successCallback(res);
+                }
             }).then(res => {
                 layer.msg("保存成功！")
                 $.operate.successCallback(res);