From 752bf0d8b37b3b17212836fa7cb2a93c15aab4be Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 28 Dec 2023 12:32:31 +0800
Subject: [PATCH] 直推奖励，冻结的用户，则直推奖励销毁，用户未冻结才能领取成功
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
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 1b57287..f371842 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -7,6 +7,12 @@
<div class="layui-form-item">
<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="accountLogin" 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="name" autocomplete="off" class="layui-input">
@@ -121,6 +127,7 @@
<button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" id="importDeliver" lay-event="importDeliver">导入发货</button>
<button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" lay-event="exportDeliverDone">导出已发货订单</button>
<button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view">自定义打印</button>
+ <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" lay-event="exportDeliverAll">导出全部订单</button>
</div>
</script>
<!-- 表格操作栏 end -->
@@ -165,6 +172,10 @@
if (event == 'exportDeliver') {
window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2";
+ }
+
+ if (event == 'exportDeliverAll') {
+ window.location.href = ctx + "admin/order/exportOrderListAll?orderType=1&status=0";
}
if (event == 'exportDeliverDone') {
@@ -287,9 +298,10 @@
cols: [[
{type: 'checkbox',fixed: 'left'},
{field: 'orderNo', title: '订单编号', minWidth: 120,align:'left', totalRowText: '合计：'},
+ {field: 'accountLogin', title: '登录账户', minWidth: 120,align:'left'},
{field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
- {field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
- {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
+ {field: 'memberPhone', title: '手机号码', minWidth: 120,align:'left'},
+ // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
{field: 'remark', title: '备注', minWidth: 200,align:'left'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
@@ -366,6 +378,7 @@
return {
startTime: $searchForm.find('input[name="startTime"]').val().trim(),
endTime: $searchForm.find('input[name="endTime"]').val().trim(),
+ accountLogin: $searchForm.find('input[name="accountLogin"]').val().trim(),
name: $searchForm.find('input[name="name"]').val().trim(),
orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
goodsName: $searchForm.find('input[name="goodsName"]').val().trim(),
--
Gitblit v1.9.1