From b31ae14c493b58c21d8c4cb78d3ffd38bbd5dea5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 16:53:29 +0800
Subject: [PATCH] refactor(mall): 优化团队信息初始化和数据结构
---
src/main/resources/templates/febs/views/modules/order/orderRefundList.html | 314 ++++++++++++++++++++++-----------------------------
1 files changed, 137 insertions(+), 177 deletions(-)
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 ceb8f7a..d4e0b29 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderRefundList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderRefundList.html
@@ -5,35 +5,40 @@
<div class="layui-card-body febs-table-full">
<form class="layui-form layui-table-form" lay-filter="user-table-form">
<div class="layui-form-item">
-<!-- <div class="layui-col-md10">-->
+ <div class="layui-col-md10">
+ <div class="layui-inline">
+ <label class="layui-form-label">退款人：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="退款人" name="refundMemberName" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">手机号码：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="手机号码" name="refundMemberPhone" autocomplete="off" class="layui-input">
+ </div>
+ </div>
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
-<!-- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">-->
+<!-- <input type="text" placeholder="团长" name="leaderName" autocomplete="off" class="layui-input">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
-<!-- <input type="text" placeholder="电话号码" name="phone" autocomplete="off" class="layui-input">-->
+<!-- <input type="text" placeholder="团长手机号码" name="leaderPhone" autocomplete="off" class="layui-input">-->
<!-- </div>-->
<!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <label class="layui-form-label layui-form-label-sm">订单状态</label>-->
-<!-- <div class="layui-input-inline">-->
-<!-- <select name="status">-->
-<!-- <option value="">请选择</option>-->
-<!-- <option value="1">已申请</option>-->
-<!-- <option value="2">同意退款</option>-->
-<!-- <option value="3">驳回退款</option>-->
-<!-- <option value="4">已提交物流信息</option>-->
-<!-- <option value="5">已退款</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">退款状态</label>
+ <div class="layui-input-inline">
+ <select name="state">
+ <option value="">请选择</option>
+ <option value="1">成功</option>
+ <option value="2">失败</option>
+ <option value="3">退款中</option>
+ </select>
+ </div>
+ </div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -47,6 +52,18 @@
</div>
</form>
<table lay-filter="orderRefundTable" lay-data="{id: 'orderRefundTable'}"></table>
+ <style type="text/css">
+ .layui-table-cell{
+ text-align:center;
+ height: auto;
+ white-space: nowrap; /*文本不会换行，在同一行显示*/
+ overflow: hidden; /*超出隐藏*/
+ text-overflow: ellipsis; /*省略号显示*/
+ }
+ .layui-table img{
+ max-width:100px
+ }
+ </style>
</div>
</div>
</div>
@@ -60,10 +77,36 @@
<a lay-event="edit" shiro:hasPermission="user:update"><i
class="layui-icon febs-edit-area febs-blue"></i></a>
</script>
+
+<script type="text/html" id="refundPicItem">
+ {{# if(d.refundPicList == undefined || d.refundPicList == '' || d.refundPicList == null){ }}
+ 暂无图片
+ {{# } else { }}
+ {{# for(var i=0;i < d.refundPicList.length;i++){ }}
+ <a href="javascript:;" onclick="showBigImage('{{ d.refundPicList[i]}}')">
+ <img id="refundPic" width='100' style="cursor: pointer;" height='100' src="{{ d.refundPicList[i]}}"/>
+ </a>
+ {{# } }}
+ {{# } }}
+</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
+ //图片放大
+ function showBigImage(url) {
+ layer.open({
+ type: 1,
+ title: "图片",
+ skin: 'layui-layer-rim', //加上边框
+ area: ['80%', '100%'], //宽高
+ shadeClose: true, //开启遮罩关闭
+ end: function (index, layero) {
+ return false;
+ },
+ content: '<img src="' + url + '" alt="Big Image" style="max-width: 100%; height: auto;">'
+ });
+ }
// 引入组件并初始化
- layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ layui.use([ 'jquery', 'form', 'table', 'febs', 'formSelects'], function () {
var $ = layui.jquery,
febs = layui.febs,
form = layui.form,
@@ -85,70 +128,40 @@
table.on('tool(orderRefundTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
- // if (layEvent === 'refunding') {
- // febs.modal.open( '退款进度', 'modules/order/refunding/' + data.id, {
- // maxmin: true,
- // });
- // }
- // if (layEvent === 'refundOrderDetail') {
- // febs.modal.open( '订单详情', 'modules/order/refundOrderDetail/' + data.id, {
- // maxmin: true,
- // });
- // }
- // if (layEvent === 'agree') {
- // febs.modal.confirm('同意', '同意此次退款申请？', function () {
- // agreeRefund(data.id);
- // });
- // }
- // if (layEvent === 'agreeWithAddress') {
- // febs.modal.open('选择退货地址', 'modules/order/withAddress/' + data.id, {
- // btn: ['确认', '取消'],
- // yes: function (index, layero) {
- // $('#address-choose').find('#submit').trigger('click');
- // },
- // btn2: function () {
- // layer.closeAll();
- // }
- // });
- // }
- // if (layEvent === 'disagree') {
- // febs.modal.confirm('拒绝', '拒绝此次退款申请？', function () {
- // disagreeRefund(data.id);
- // });
- // }
- // if (layEvent === 'refundConfirm') {
- // febs.modal.confirm('退款确认', '确认已退款？', function () {
- // refundConfirm(data.id);
- // });
- // }
- // if (layEvent === 'paymentInfo') {
- // febs.modal.open( '收款信息', 'modules/order/refundPayInfo/' + data.id, {
- // maxmin: true,
- // });
- // }
+ switch (obj.event) {
+ case 'show_image':
+ layer.photos({
+ photos:{"data": data.image_list}
+ ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
+ });
+ break;
+ case 'agree':
+ var objReq = {};
+ objReq.orderId = data.orderId;
+ objReq.itemId = data.itemId;
+ objReq.agreeState = 1
+ febs.modal.confirm('订单退款', '是否同意订单退款？', function () {
+ febs.post(ctx + 'admin/order/refundOperation', objReq, function () {
+ febs.alert.success('操作成功');
+ $('#febs-order-refund').find('#reset').click();
+ });
+ });
+ break;
+ case 'disagree':
+ var objReq = {};
+ objReq.orderId = data.orderId;
+ objReq.itemId = data.itemId;
+ objReq.agreeState = 2;
+ febs.modal.confirm('订单退款', '是否拒绝订单退款？', function () {
+ febs.post(ctx + 'admin/order/refundOperation', objReq, function () {
+ febs.alert.success('操作成功');
+ $('#febs-order-refund').find('#reset').click();
+ });
+ });
+ break;
+
+ }
});
-
- // function agreeRefund(id) {
- // febs.get(ctx + 'admin/order/agreeRefund/' + id, null, function () {
- // febs.alert.success('操作成功');
- // $query.click();
- // });
- // }
- //
- // function disagreeRefund(id) {
- // febs.get(ctx + 'admin/order/disagreeRefund/' + id, null, function () {
- // febs.alert.success('操作成功');
- // $query.click();
- // });
- // }
- //
- // function refundConfirm(id) {
- // febs.get(ctx + 'admin/order/refundConfirm/' + id, null, function () {
- // febs.alert.success('操作成功');
- // $query.click();
- // });
- // }
-
// 查询按钮
$query.on('click', function () {
var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
@@ -168,94 +181,40 @@
id: 'orderRefundTable',
url: ctx + 'admin/order/orderRefundList',
cols: [[
- {field: 'id', title: '订单编号', minWidth: 150,align:'left'},
- // {field: 'buyName', title: '用户名', minWidth: 150,align:'left'},
- // {field: 'buyPhone', title: '账号', minWidth: 150,align:'left'},
- // {field: 'buyBindPhone', title: '手机号', minWidth: 150,align:'left'},
- // {field: 'beforeStatus', title: '发货状态',
- // templet: function (d) {
- // if (d.beforeStatus === 1) {
- // return '<span style="color:red;">待支付</span>'
- // } else if (d.beforeStatus === 2) {
- // return '<span style="color:green;">待发货</span>'
- // }else if (d.beforeStatus === 3) {
- // return '<span style="color:green;">待收货</span>'
- // }else if (d.beforeStatus === 4) {
- // return '<span style="color:green;">已完成</span>'
- // }else if (d.beforeStatus === 5) {
- // return '<span style="color:green;">退款中</span>'
- // }else if (d.beforeStatus === 6) {
- // return '<span style="color:green;">已退款</span>'
- // }else if (d.beforeStatus === 7) {
- // return '<span style="color:green;">已取消</span>'
- // }else{
- // return ''
- // }
- // }, minWidth: 80,align:'center'},
- // {field: 'amount', title: '退款金额', minWidth: 150,align:'left'},
- // {field: 'type', title: '退款类型',
- // templet: function (d) {
- // if (d.type === 1) {
- // return '<span">仅退款不退货</span>'
- // } else if (d.type === 2) {
- // return '<span>退款退货</span>'
- // }else{
- // return ''
- // }
- // }, minWidth: 80,align:'center'},
- // {field: 'reason', title: '退款原因', minWidth: 150,align:'left'},
- // {field: 'status', title: '状态',
- // templet: function (d) {
- // if (d.status === 1) {
- // return '<span style="color:red;">已申请</span>'
- // } else if (d.status === 2) {
- // return '<span>同意退款</span>'
- // }else if (d.status === 3) {
- // return '<span>驳回退款</span>'
- // }else if (d.status === 4) {
- // return '<span>已提交物流信息</span>'
- // }else if (d.status === 5) {
- // return '<span>已退款</span>'
- // }else{
- // return ''
- // }
- // }, minWidth: 80,align:'center'},
- // {field: 'addressDetail', title: '收货信息', minWidth: 150,align:'left'},
- // {field: 'createdTime', title: '创建时间', minWidth: 150,align:'left'},
- // {title: '操作',
- // templet: function (d) {
- // if(d.status === 1){
- // if(d.type === 1){
- // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
- // }else if(d.type === 2){
- // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agreeWithAddress" shiro:hasPermission="user:update">同意</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
- // }else{
- // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
- // }
- // }else if(d.status === 4){
- // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundConfirm" shiro:hasPermission="user:update">退款确认</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
- // }else{
- // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
- // }
- //
- // },minWidth: 300,align:'center'}
+ {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
+ {field: 'refundNo', title: '退款编号', minWidth: 150,align:'left'},
+ {field: 'orderTime', title: '下单时间', minWidth: 150,align:'left'},
+ {field: 'refundMemberName', title: '退款人', minWidth: 100,align:'left'},
+ {field: 'refundMemberPhone', title: '退款人手机号码', minWidth: 150,align:'left'},
+ {field: 'goodsName', title: '商品名称', minWidth: 150,align:'left'},
+ {field: 'amount', title: '退款金额', minWidth: 100,align:'left'},
+ // {field: 'leaderName', title: '团长', minWidth: 100,align:'left'},
+ // {field: 'leaderPhone', title: '团长手机号码', minWidth: 150,align:'left'},
+ {field: 'state', title: '退款状态',
+ templet: function (d) {
+ if (d.state === 1) {
+ return '<span>成功</span>'
+ } else if (d.state === 2) {
+ return '<span style="color:red;">失败</span>'
+ }else if (d.state === 3) {
+ return '<span style="color:green;">退款中</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 80,align:'center'},
+ {field: 'refundReason', title: '退款原因', minWidth: 150,align:'left'},
+ {field: 'refundRemark', title: '退款说明', minWidth: 150,align:'left'},
+ {field: 'refundPicList', title: '退款图片', templet: '#refundPicItem', minWidth: 200,align:'center'},
+ {title: '操作',
+ templet: function (d) {
+ if(d.state === 3){
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree">同意</button>'
+ +'<button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="disagree">拒绝</button>'
+ } else {
+ return '';
+ }
+
+ },minWidth: 200,align:'center'}
]]
});
}
@@ -263,10 +222,11 @@
// 获取查询参数
function getQueryParams() {
return {
- // name: $searchForm.find('input[name="name"]').val().trim(),
- // phone: $searchForm.find('input[name="phone"]').val().trim(),
- // orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
- // status: $searchForm.find("select[name='status']").val(),
+ refundMemberName: $searchForm.find('input[name="refundMemberName"]').val().trim(),
+ refundMemberPhone: $searchForm.find('input[name="refundMemberPhone"]').val().trim(),
+ // leaderName: $searchForm.find('input[name="leaderName"]').val().trim(),
+ // leaderPhone: $searchForm.find('input[name="leaderPhone"]').val().trim(),
+ state: $searchForm.find("select[name='state']").val(),
};
}
--
Gitblit v1.9.1