From 4f0a17c41eaf8cf31d3d15d7977caa428dcf9e75 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 10 Apr 2024 17:08:25 +0800
Subject: [PATCH] 轮播图调整 1、按照编号排序

---
 src/main/java/cc/mrbird/febs/mall/entity/PlatformBanner.java                     |    4 
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java       |    4 
 src/main/resources/mapper/modules/PlatformBannerMapper.xml                       |    2 
 src/main/resources/templates/febs/views/modules/banner/platformBannerDetail.html |  124 ++++++++++----------
 src/main/resources/templates/febs/views/modules/banner/platformBanner.html       |   48 ++++---
 src/main/resources/templates/febs/views/modules/banner/platformBannerAdd.html    |  121 ++++++++++---------
 6 files changed, 157 insertions(+), 146 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/PlatformBanner.java b/src/main/java/cc/mrbird/febs/mall/entity/PlatformBanner.java
index bd68690..1bbf5d2 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/PlatformBanner.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/PlatformBanner.java
@@ -38,9 +38,9 @@
      */
     private int showPort;
     /**
-     * 联系方式
+     * 排序
      */
-    private String sort;
+    private int sort;
     /**
      * 是否置顶 1-是2-否
      */
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java
index b912e2d..b2d0eec 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java
@@ -60,8 +60,8 @@
     @Override
     public FebsResponse findAllBanner() {
         QueryWrapper<PlatformBanner> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByAsc("is_top");
-        queryWrapper.orderByAsc("created_time");
+        queryWrapper.orderByAsc("sort");
+//        queryWrapper.orderByAsc("created_time");
         List<PlatformBanner> paymentMethodList = platformBannerMapper.selectList(queryWrapper);
         if(CollUtil.isNotEmpty(paymentMethodList)){
             for(PlatformBanner platformBanner : paymentMethodList){
diff --git a/src/main/resources/mapper/modules/PlatformBannerMapper.xml b/src/main/resources/mapper/modules/PlatformBannerMapper.xml
index 4421d20..311c69e 100644
--- a/src/main/resources/mapper/modules/PlatformBannerMapper.xml
+++ b/src/main/resources/mapper/modules/PlatformBannerMapper.xml
@@ -7,7 +7,7 @@
 			*
 		FROM
 			platform_banner
-			order by created_time desc
+			order by sort asc
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/banner/platformBanner.html b/src/main/resources/templates/febs/views/modules/banner/platformBanner.html
index 7f7cb73..768bc1f 100644
--- a/src/main/resources/templates/febs/views/modules/banner/platformBanner.html
+++ b/src/main/resources/templates/febs/views/modules/banner/platformBanner.html
@@ -60,17 +60,8 @@
 </script>
 <!-- 表格操作栏 start -->
 <script type="text/html" id="user-option">
-<!--    <span shiro:lacksPermission="user:view,user:update,user:delete">-->
-<!--        <span class="layui-badge-dot febs-bg-orange"></span> 无权限-->
-<!--    </span>-->
-<!--    <a lay-event="edit" shiro:hasPermission="user:update">编辑-->
-    <a lay-event="edit">编辑
-		<i class="layui-icon febs-edit-area febs-blue"></i>
- 	</a>
-<!--    <a lay-event="delete" shiro:hasPermission="user:update">删除-->
-    <a lay-event="delete">删除
-		<i class="layui-icon febs-edit-area febs-blue"></i>
- 	</a>
+    <button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>
+    <button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delete">删除</button>
 </script>
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
@@ -101,7 +92,7 @@
                 layEvent = obj.event;
             
             if (layEvent === 'edit') {
-                febs.modal.open('轮播图设置', 'modules/banner/platformBannerUpdate/' + data.id, {
+                febs.modal.open('轮播图', 'modules/banner/platformBannerUpdate/' + data.id, {
                     btn: ['提交', '取消'],
                     yes: function (index, layero) {
                         $('#banner-update').find('#submit').trigger('click');
@@ -114,6 +105,21 @@
             if (layEvent === 'delete') {
                 febs.modal.confirm('删除', '您是否确认删除?', function () {
                 	deleteUsers(data.id);
+                });
+            }
+            if (layEvent === 'seeImgThumb') {
+                var t = $view.find('#seeImgThumb'+data.id+'');
+                //页面层
+                layer.open({
+                    type: 1,
+                    title: "图片",
+                    skin: 'layui-layer-rim', //加上边框
+                    area: ['80%', '80%'], //宽高
+                    shadeClose: true, //开启遮罩关闭
+                    end: function (index, layero) {
+                        return false;
+                    },
+                    content: '<div style="text-align:center"><img src="' + $(t).attr('src') + '" /></div>'
                 });
             }
         });
@@ -134,7 +140,7 @@
      	
      	// 刷新按钮
         $add.on('click', function () {
-        	febs.modal.open('轮播图新增', 'modules/banner/platformBannerAdd/', {
+        	febs.modal.open('轮播图', 'modules/banner/platformBannerAdd/', {
                 btn: ['提交', '取消'],
                 yes: function (index, layero) {
                     $('#banner-add').find('#submit').trigger('click');
@@ -157,19 +163,19 @@
                 id: 'bannerTable',
                 url: ctx + 'admin/banner/platformBanner',
                 cols: [[
-                	{field: 'id', title: '', minWidth: 10,align:'left'},
+                	{field: 'id', title: '编号', minWidth: 10,align:'left'},
                 	{field: 'name', title: '标题', minWidth: 120,align:'center'},
-                    {field: 'imageUrl', title: '图片链接',
+                	{field: 'sort', title: '排序', minWidth: 120,align:'center'},
+
+                    {field: 'imageUrl', title: '缩略图',
                         templet: function (d) {
-                            return '<img src="'+d.imageUrl+'" >'
-                        }, minWidth: 200,align:'center'},
-                    // {field: 'sort', title: '联系方式', minWidth: 200,align:'center'},
-                    
+                            return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.imageUrl+'" alt=""></a>';
+                        }, minWidth: 150,align:'center'},
                     {title: '是否可跳转', templet: '#isJump', minWidth: 60,align:'center'},
                     {field: 'jumpUrl', title: '跳转链接', minWidth: 200,align:'center'},
-                    {title: '跳转外部或内部', templet: '#isInside', minWidth: 60,align:'center'},
+                    // {title: '跳转外部或内部', templet: '#isInside', minWidth: 60,align:'center'},
                     // {title: '显示端口', templet: '#showPort', minWidth: 60,align:'center'},
-                    {title: '是否置顶', templet: '#isTop', minWidth: 60,align:'center'},
+                    // {title: '是否置顶', templet: '#isTop', minWidth: 60,align:'center'},
                     
                     {title: '操作', toolbar: '#user-option', minWidth: 140, fixed : 'right'}
                 ]]
diff --git a/src/main/resources/templates/febs/views/modules/banner/platformBannerAdd.html b/src/main/resources/templates/febs/views/modules/banner/platformBannerAdd.html
index 5928f1c..8113ddd 100644
--- a/src/main/resources/templates/febs/views/modules/banner/platformBannerAdd.html
+++ b/src/main/resources/templates/febs/views/modules/banner/platformBannerAdd.html
@@ -19,78 +19,81 @@
 </style>
 <div class="layui-fluid" id="banner-add">
     <form class="layui-form" action="" lay-filter="banner-add-form">
+
         <div class="layui-form-item febs-hide">
             <label class="layui-form-label febs-form-item-require">用户id:</label>
             <div class="layui-input-block">
                 <input type="text" name="id">
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">标题:</label>
-            <div class="layui-input-block">
-                <input type="text" name="name"
-                		autocomplete="off" class="layui-input" >
+        <div class="layui-card-body">
+            <blockquote class="layui-elem-quote blue-border">新增</blockquote>
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">标题:</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="name" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">排序:</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="sort" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                    </div>
+                    <div class="layui-word-aux" style="margin-left: 100px;">按照排序从小到大排列展示</div>
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">图片:</label>
-            <div class="layui-upload">
-                <button type="button" class="layui-btn" id="test1">上传图片</button>
-                <div class="layui-input-block">
-                    <div class="layui-upload-list">
-                        <img class="layui-upload-img" id="imageUrls" width="100%" >
+
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">图片:</label>
+                    <div class="layui-upload">
+                        <button type="button" class="layui-btn" id="test1">上传图片</button>
+                        <div class="layui-input-block">
+                            <div class="layui-upload-list">
+                                <img class="layui-upload-img" id="imageUrls" style="width: 130px" >
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">图片链接:</label>
-            <div class="layui-input-block">
-                <input type="text" id="imageUrl" name="imageUrl"
-                       autocomplete="off" class="layui-input" readonly>
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <label class="layui-form-label febs-form-item-require">图片链接:</label>
+                <div class="layui-input-block">
+                    <input type="text" id="imageUrl" name="imageUrl"
+                           autocomplete="off" class="layui-input" readonly>
+                </div>
             </div>
-        </div>
-<!--        <div class="layui-form-item">-->
-<!--            <label class="layui-form-label febs-form-item-require">联系方式:</label>-->
-<!--            <div class="layui-input-block">-->
-<!--                <input type="text" name="sort" minlength="4" maxlength="10" -->
-<!--                       lay-verify="range|sort" autocomplete="off" class="layui-input" >-->
-<!--            </div>-->
-<!--        </div>-->
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">是否置顶:</label>
-            <div class="layui-input-block">
-                <input type="radio" name="isTop" value="1" title="是" checked="">
-                <input type="radio" name="isTop" value="2" title="否">
+
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">是否跳转:</label>
+                    <div class="layui-input-block">
+                        <input type="radio" name="isJump" value="1" title="是" checked="">
+                        <input type="radio" name="isJump" value="2" title="否">
+                    </div>
+                </div>
             </div>
-        </div>
-<!--        <div class="layui-form-item">-->
-<!--            <label class="layui-form-label febs-form-item-require">显示端口:</label>-->
-<!--            <div class="layui-input-block">-->
-<!--                <input type="radio" name="showPort" value="1" title="pc" checked="">-->
-<!--                <input type="radio" name="showPort" value="2" title="手机">-->
-<!--            </div>-->
-<!--        </div>-->
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">是否可跳转:</label>
-            <div class="layui-input-block">
-                <input type="radio" name="isJump" value="1" title="是" checked="">
-                <input type="radio" name="isJump" value="2" title="否">
+
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label">跳转链接:</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="jumpUrl"
+                               autocomplete="off" class="layui-input" >
+                    </div>
+                    <div class="layui-word-aux" style="margin-left: 100px;">图片需要跳转到商品详情,填写商品编号</div>
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">跳转链接:</label>
-            <div class="layui-input-block">
-                <input type="text" name="jumpUrl"
-                        autocomplete="off" class="layui-input" >
-            </div>
-            <div class="layui-form-mid layui-word-aux">图片需要跳转到商品详情,请填写商品编号。</div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">跳转外部或内部:</label>
-            <div class="layui-input-block">
-                <input type="radio" name="isInside" value="1" title="内" checked="">
-                <input type="radio" name="isInside" value="2" title="外">
+
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">跳转外部或内部:</label>
+                    <div class="layui-input-block">
+                        <input type="radio" name="isInside" value="1" title="内" checked="">
+                        <input type="radio" name="isInside" value="2" title="外">
+                    </div>
+                </div>
             </div>
         </div>
         <div class="layui-form-item febs-hide">
diff --git a/src/main/resources/templates/febs/views/modules/banner/platformBannerDetail.html b/src/main/resources/templates/febs/views/modules/banner/platformBannerDetail.html
index f696b90..86c059d 100644
--- a/src/main/resources/templates/febs/views/modules/banner/platformBannerDetail.html
+++ b/src/main/resources/templates/febs/views/modules/banner/platformBannerDetail.html
@@ -22,75 +22,77 @@
         <div class="layui-form-item febs-hide">
             <label class="layui-form-label febs-form-item-require">用户id:</label>
             <div class="layui-input-block">
-                <input type="text" name="id" data-th-value="${member.id}">
+                <input type="text" name="id">
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">标题:</label>
-            <div class="layui-input-block">
-                <input type="text" name="name"  data-th-id="${member.name}"
-                        autocomplete="off" class="layui-input" >
+        <div class="layui-card-body">
+            <blockquote class="layui-elem-quote blue-border">编辑</blockquote>
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">标题:</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="name" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">排序:</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="sort" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                    </div>
+                    <div class="layui-word-aux" style="margin-left: 100px;">按照排序从小到大排列展示</div>
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">图片:</label>
-            <div class="layui-upload">
-                <button type="button" class="layui-btn" id="test1">上传图片</button>
-                <div class="layui-input-block">
-                    <div class="layui-upload-list">
-                        <img class="layui-upload-img" id="imageUrls" width="100%" >
+
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">图片:</label>
+                    <div class="layui-upload">
+                        <button type="button" class="layui-btn" id="test1">上传图片</button>
+                        <div class="layui-input-block">
+                            <div class="layui-upload-list">
+                                <img class="layui-upload-img" id="imageUrls" style="width: 130px" >
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">图片链接:</label>
-            <div class="layui-input-block">
-                <input type="text" id="imageUrl" name="imageUrl"
-                        autocomplete="off" class="layui-input" readonly>
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <label class="layui-form-label febs-form-item-require">图片链接:</label>
+                <div class="layui-input-block">
+                    <input type="text" id="imageUrl" name="imageUrl"
+                           autocomplete="off" class="layui-input" readonly>
+                </div>
             </div>
-        </div>
-<!--        <div class="layui-form-item">-->
-<!--            <label class="layui-form-label febs-form-item-require">联系方式:</label>-->
-<!--            <div class="layui-input-block">-->
-<!--                <input type="text" name="sort" minlength="4" maxlength="10" data-th-id="${member.sort}"-->
-<!--                       lay-verify="range|sort" autocomplete="off" class="layui-input" >-->
-<!--            </div>-->
-<!--        </div>-->
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">是否置顶:</label>
-            <div class="layui-input-block">
-                <input type="radio" name="isTop" value="1" title="是">
-                <input type="radio" name="isTop" value="2" title="否">
+
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">是否跳转:</label>
+                    <div class="layui-input-block">
+                        <input type="radio" name="isJump" value="1" title="是" checked="">
+                        <input type="radio" name="isJump" value="2" title="否">
+                    </div>
+                </div>
             </div>
-        </div>
-<!--        <div class="layui-form-item">-->
-<!--            <label class="layui-form-label febs-form-item-require">显示端口:</label>-->
-<!--            <div class="layui-input-block">-->
-<!--                <input type="radio" name="showPort" value="1" title="pc">-->
-<!--                <input type="radio" name="showPort" value="2" title="手机">-->
-<!--            </div>-->
-<!--        </div>-->
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">是否可跳转:</label>
-            <div class="layui-input-block">
-                <input type="radio" name="isJump" value="1" title="是">
-                <input type="radio" name="isJump" value="2" title="否">
+
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label">跳转链接:</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="jumpUrl"
+                               autocomplete="off" class="layui-input" >
+                    </div>
+                    <div class="layui-word-aux" style="margin-left: 100px;">图片需要跳转到商品详情,填写商品编号</div>
+                </div>
             </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">跳转链接:</label>
-            <div class="layui-input-block">
-                <input type="text" name="jumpUrl"  data-th-id="${member.jumpUrl}"
-                        autocomplete="off" class="layui-input" >
-            </div>
-            <div class="layui-form-mid layui-word-aux">图片需要跳转到商品详情,请填写商品编号。</div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">跳转外部或内部:</label>
-            <div class="layui-input-block">
-                <input type="radio" name="isInside" value="1" title="内">
-                <input type="radio" name="isInside" value="2" title="外">
+
+            <div class="layui-row layui-col-space10 layui-form-item">
+                <div class="layui-col-lg6">
+                    <label class="layui-form-label febs-form-item-require">跳转外部或内部:</label>
+                    <div class="layui-input-block">
+                        <input type="radio" name="isInside" value="1" title="内" checked="">
+                        <input type="radio" name="isInside" value="2" title="外">
+                    </div>
+                </div>
             </div>
         </div>
         <div class="layui-form-item febs-hide">
@@ -145,7 +147,7 @@
                 "isInside": member.isInside,
                 // "showPort": member.showPort,
                 "jumpUrl": member.jumpUrl,
-                // "sort": member.sort,
+                "sort": member.sort,
                 "isTop": member.isTop,
                 "isJump": member.isJump
             });

--
Gitblit v1.9.1