From 748c59310b1280a034ecd4c4b22a1c0d66bdfd59 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Feb 2023 17:57:03 +0800
Subject: [PATCH] ali短信服务
---
src/main/resources/mapper/modules/MallSalesmanMapper.xml | 1 -
src/main/resources/templates/febs/views/modules/mallMember/addressAmountList.html | 9 +++++----
src/main/resources/templates/febs/views/modules/order/orderList.html | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallSalesmanMapper.xml b/src/main/resources/mapper/modules/MallSalesmanMapper.xml
index edf68f9..70c0859 100644
--- a/src/main/resources/mapper/modules/MallSalesmanMapper.xml
+++ b/src/main/resources/mapper/modules/MallSalesmanMapper.xml
@@ -27,7 +27,6 @@
</select>
<select id="selectAddressAmountListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallAddressInfoVo">
-
SELECT
a.province,
a.city
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/addressAmountList.html b/src/main/resources/templates/febs/views/modules/mallMember/addressAmountList.html
index 589e1a4..dc5f9e1 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/addressAmountList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/addressAmountList.html
@@ -97,12 +97,13 @@
elem: $view.find('table'),
id: 'addressAmountTable',
url: ctx + 'admin/mallMember/addressAmountList',
- defaultToolbar:[],
+ totalRow : true,
+ toolbar: '#tableToolBar',
cols: [[
- {field: 'province', title: '省', minWidth: 100,align:'left'},
+ {field: 'province', title: '省', minWidth: 100,align:'left',totalRowText:"合计"},
{field: 'city', title: '市', minWidth: 100,align:'left'},
- {field: 'orderCnt', title: '订单数量', minWidth: 100,align:'left'},
- {field: 'amount', title: '总金额', minWidth: 100,align:'left'}
+ {field: 'orderCnt', title: '订单数量', minWidth: 100,align:'left', totalRow:true},
+ {field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true}
]]
});
}
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 d257f3d..3c78844 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -113,7 +113,7 @@
<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="tableToolBar">
+<script type="text/html" id="tableToolBarOrder">
<div class="layui-btn-container">
<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverOne">导出待发货订单,系统自动发货</button>-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>-->
@@ -378,7 +378,7 @@
url: ctx + 'admin/order/orderList?orderType=1',
// defaultToolbar: [],
//系统自带打印导出
- toolbar: '#tableToolBar',
+ toolbar: '#tableToolBarOrder',
cols: [[
{type: 'checkbox', fixed: 'left'},
{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
--
Gitblit v1.9.1