From 04ff0392849be2bcddba6747679790b0bce464fb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 16 May 2025 14:07:34 +0800
Subject: [PATCH] refactor(mall): 调整订单相关功能和界面
---
src/main/resources/templates/febs/views/modules/order/orderRefundList.html | 10 ++++++++--
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2 +-
src/main/resources/templates/febs/views/modules/order/commentList.html | 2 +-
src/main/resources/templates/febs/views/modules/order/orderList.html | 10 +++++-----
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 46e9608..c8a99ec 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -950,7 +950,7 @@
mallGoodsComment.setSkuName(mallGoodsSku.getSkuName());
mallGoodsComment.setStyleId(mallGoodsSku.getStyleId());
mallGoodsComment.setStyleName(mallGoodsSku.getStyleName());
- mallGoodsComment.setShowState(MallGoodsComment.SHOW_STATE_ENABLE);
+ mallGoodsComment.setShowState(MallGoodsComment.SHOW_STATE_DISABLED);
mallGoodsCommentMapper.insert(mallGoodsComment);
}
}
diff --git a/src/main/resources/templates/febs/views/modules/order/commentList.html b/src/main/resources/templates/febs/views/modules/order/commentList.html
index 91e7f26..36aae45 100644
--- a/src/main/resources/templates/febs/views/modules/order/commentList.html
+++ b/src/main/resources/templates/febs/views/modules/order/commentList.html
@@ -100,7 +100,7 @@
{field: 'memberName', title: '昵称', minWidth: 100,align:'left'},
{field: 'orderNo', title: '订单编号', minWidth: 80,align:'left'},
{field: 'goodsName', title: '商品名称', minWidth: 80,align:'left'},
- {field: 'styleName', title: '样式', minWidth: 80,align:'left'},
+ // {field: 'styleName', title: '样式', minWidth: 80,align:'left'},
{field: 'skuName', title: '规格', minWidth: 80,align:'left'},
{field: 'showState', title: '是否展示', templet: '#showStateSwitch', minWidth: 80,align:'center'},
{field: 'images', title: '图片', align: 'center', templet: '#showScreenhost', width: 400},
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index c2dbb7e..04b159f 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -19,7 +19,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">状态</label>
+ <label class="layui-form-label layui-form-label-sm">状态：</label>
<div class="layui-input-inline">
<select name="status">
<option value="">请选择</option>
@@ -28,7 +28,7 @@
<option value="3">待收货</option>
<option value="4">已完成</option>
<!-- <option value="5">退款中</option>-->
-<!-- <option value="6">已退款</option>-->
+ <option value="6">已退款</option>
<option value="7">已取消</option>
</select>
</div>
@@ -52,7 +52,7 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">支付状态</label>
+ <label class="layui-form-label">支付状态：</label>
<div class="layui-input-inline">
<select name="payResult">
<option value="">请选择</option>
@@ -62,14 +62,14 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">开始时间</label>
+ <label class="layui-form-label">开始时间：</label>
<div class="layui-input-inline">
<input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="date"
placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">结束时间</label>
+ <label class="layui-form-label">结束时间：</label>
<div class="layui-input-inline">
<input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="date"
placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
diff --git a/src/main/resources/templates/febs/views/modules/order/orderRefundList.html b/src/main/resources/templates/febs/views/modules/order/orderRefundList.html
index 390b3d3..a786138 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderRefundList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderRefundList.html
@@ -29,7 +29,7 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">退款状态</label>
+ <label class="layui-form-label">退款状态：</label>
<div class="layui-input-inline">
<select name="state">
<option value="">请选择</option>
@@ -52,8 +52,9 @@
</div>
</form>
<table lay-filter="orderRefundTable" lay-data="{id: 'orderRefundTable'}"></table>
+
<style type="text/css">
- .layui-table-cell{
+ .layui-table cell{
text-align:center;
height: auto;
white-space: nowrap; /*文本不会换行，在同一行显示*/
@@ -63,6 +64,11 @@
.layui-table img{
max-width:100px
}
+
+ ::-webkit-scrollbar {
+ height: 20px !important;
+ background-color: #f4f4f4;
+ }
</style>
</div>
</div>
--
Gitblit v1.9.1