Merge branch 'dev_goblin' of gitlab.zhengzai.tv:dongjingwei/liquidnet-bus-v1 into dev_goblin

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

@@ -148,5 +148,10 @@ public class LocalAdminController extends BaseController
     {
         return prefix2 + "/goodsIntersection/index";
     }
+    @GetMapping("/newRecommended")
+    public String newRecommended()
+    {
+        return prefix2 + "/homeSet/newRecommended";
+    }
 
 }

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

@@ -187,7 +187,7 @@
                     }
                 })
             })
-            promiseMethods('/goblin-front-cube/list', 'post').then(res => {
+            promiseMethods('/goblin-front-cube/list', 'post', {type: 1}).then(res => {
                 let { data } = res;
                 if (data && data.length > 0) {
                     let arr = data[0].spuId.split(',');
@@ -201,6 +201,7 @@
                         $("#optionsRadios4").attr('checked', true).parent().siblings().children().removeAttr('checked');
                     }
                     mid = data[0].mid;
+                    cubeId = data[0].cubeId;
                     for (var i = 0; i < data.length; i++) {
                         let str = '';
                         str += `<div class="items" data-id="${data[i].mid}">
@@ -261,7 +262,7 @@
         $("input[name=optionsRadios]").change(function(e){
             $("#bannerList").empty();
             count = e.target.value;
-            promiseMethods('/goblin-front-cube/list', 'post').then(res => {
+            promiseMethods('/goblin-front-cube/list', 'post', {type: 1}).then(res => {
                 let { data } = res;
                 if (data && data.length > 0) {
                     let arr = data[0].spuId.split(',');
@@ -390,6 +391,7 @@
                 rowType: $('input[name="optionsRadios"]:checked').val(),
                 spuId: [],
                 spuName: '',
+                type: 1,
                 updateTime: updateTime || ''
             }];
             let domData = $('.items');

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

@@ -155,6 +155,7 @@
                 <button type="button" class="btn btn-warning" onclick="goArea(2)">活动banner</button>
                 <button type="button" class="btn btn-success" onclick="goArea(4)">魔方</button>
                 <button type="button" class="btn btn-info" onclick="goArea(7)">精选商品</button>
+                <button type="button" class="btn btn-info" onclick="goArea(8)">新品推荐</button>
                 <!-- <button type="button" class="btn" disabled onclick="goArea(3)">限时秒杀</button> -->
             </div>
             <button type="button" class="btn btn-danger gitHot" onclick="git()">上线</button>
@@ -235,6 +236,8 @@
                     $.modal.open('精选商品', prefix2 + "/carefullyGoods?id=" + num,900,800, cancel)
                     // $.modal.openTab('精选商品', prefix2 + "/carefullyGoods?id=" + num)
                     break;
+                case 8:
+                    $.modal.open('新品推荐', prefix2 + "/newRecommended?id=" + num,900,800, cancel)
             }
         }
         function delSp (num) {

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

@@ -544,9 +544,20 @@
                 showCancel: false,
                 showClose: false,
                 autoReplace: true,
+                minImageWidth: '764',
+                maxImageWidth: '764',
+                minImageHeight: '1018',
+                maxImageHeight: '1018',
+                previewSettings: {
+                    image: {
+                        width: '764px',
+                        height: '1018px'
+                    }
+                },
                 dropZoneTitle: "请上传文件",
                 maxFileCount: 1
             }).on("filebatchselected", function (event, files) {         //默认上传
+                console.log(files,$(this))
                 $(this).fileinput("upload");
             })
             .on("fileuploaded", function (event, data) {       //上传回调事件