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

@@ -22,16 +22,16 @@
         .function_area {
             position: relative;
         }
-        .function_area .kingAreaMode {
+        .function_area .banner {
             position: absolute;
             width: 373px;
-            height: 246px;
+            height: 180px;
             background: rgba(0,0,0,0);
             left: 1px;
             top: 104px;
             cursor: pointer;
         }
-        .kingAreaMode span, .searchAreaModeSp {
+        .banner span, .searchAreaModeSp {
             /* display: inline-block; */
             position: relative;
             width: 20px;
@@ -46,11 +46,11 @@
             cursor: pointer;
             display: none;
         }
-        .kingAreaMode:hover,.searchAreaMode:hover {
+        .banner:hover,.searchAreaMode:hover {
             border-radius: 8px;
             border: 2px dashed yellowgreen;
         }
-        .kingAreaMode:hover .kingAreaModeSp,.searchAreaMode:hover .searchAreaModeSp {
+        .banner:hover .bannerSp,.searchAreaMode:hover .searchAreaModeSp {
             display: inline-block;
         }
         .searchAreaMode {
@@ -75,7 +75,6 @@
                 <button type="button" class="btn btn-warning" onclick="goArea(2)">活动banner</button>
                 <button type="button" class="btn btn-info" onclick="goArea(3)">限时秒杀</button>
                 <button type="button" class="btn btn-success" onclick="goArea(4)">魔方</button>
-                <button type="button" class="btn" onclick="goArea(6)">顶部banner</button>
                 <button type="button" class="btn" onclick="goArea(7)">精选商品</button>
             </div>
         </div>
@@ -87,8 +86,8 @@
                 <div class="searchAreaMode" onclick="goArea(5)">
                     <!-- <span class="searchAreaModeSp" onclick="delSearchAreaModeSpp()">X</span> -->
                 </div>
-                <div class="kingAreaMode">
-                    <span class="kingAreaModeSp" onclick="delKingAreaModeSp()">X</span>
+                <div class="banner" onclick="goArea(6)">
+                    <!-- <span class="bannerSp" onclick="delbannerSp()">X</span> -->
                 </div>
                 <iframe src="http://172.16.2.214:8080/#/goods/home?place=admin" width="375" height="896" frameborder="0"></iframe>
             </div>
@@ -120,7 +119,7 @@
                     break;
             }
         }
-        function delKingAreaModeSp () {
+        function delbannerSp () {
             console.log($('.goods-banner-props'), '有吗')
         }
     </script>

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

@@ -175,7 +175,8 @@
         });
         $(function () {
             var options = {
-                url: prefix2 + "/goblin/marketing/zhengzai/list",
+                url: "/goblin/marketing/zhengzai/list",
+                type: 'get',
                 createUrl: prefix2 + "/addNewActivity",
                 detailUrl: prefix2 + "/addNewActivity?id={id}",
                 removeUrl: prefix + "/cancel/{id}",
@@ -194,33 +195,44 @@
                         checkbox: true
                     },
                     {
-                        field: 'valFace',
+                        field: 'name',
                         title: '活动名称'
                     },
                     {
-                        field: 'bindType',
+                        field: 'status',
                         title: '状态',
                         formatter: function(value, row, index) {
                             // $('.pull-right').hide()
-                            return $.table.selectDictLabel(dicCouponBindType, value);
+                            if (value == -1) {
+                                return '全部'
+                            } else if (value == 0) {
+                                return '等待开始'
+                            } else if (value == 1) {
+                                return '进行中'
+                            } else if (value == 2) {
+                                return '活动结束'
+                            } else {
+                                return '停用'
+                            }
                         }
                     },
                     {
                         field: 'bindType',
                         title: '有效期',
                         formatter: function(value, row, index) {
-                            return '2021年08月05日18:00:00 - 2021年08月30日18:00:00'
+                            return row.startTime + '  -  ' + row.endTime
                         }
                     },
                     {
-                        field: 'bindType',
+                        field: 'createdAt',
                         title: '创建时间',
-                        formatter: function(value, row, index) {
-                            return '2021年08月05日18:00:00'
-                        }
+                        // formatter: function(value, row, index) {
+                        //     console.log(value)
+                        //     // return $.common.dateFormat(value, 'yyyy-MM-dd HH:mm:ss')
+                        // }
                     },
                     {
-                        field: 'bindType',
+                        field: 'comment',
                         title: '店铺数量'
                     },
                     {