From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html
index f5a1f04..2cbe29c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html
@@ -121,7 +121,7 @@
</div>
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
-<script type="text/javascript" th:src="@{/plugin/echarts/echarts.all.js}"></script>
+<script type="text/javascript" th:src="@{/plugin/echarts/echarts.min.js}"></script>
<script type="text/javascript" th:src="@{/plugin/echarts/macarons.js}"></script>
<script type="text/javascript" th:src="@{/plugin/dateformat.js}"></script>
<script type="text/javascript" th:src="@{/plugin/StringUtil.js}"></script>
@@ -141,12 +141,12 @@
var myChart1 = echarts.init(document.getElementById('echarts-line-chart1'), 'macarons');
var myChart2 = echarts.init(document.getElementById('echarts-line-chart2'), 'macarons');
var myChart3 = echarts.init(document.getElementById('echarts-line-chart3'), 'macarons');
- /*
- 点击事件
- myChart1.on('click', function (params) {
- console.log(params);
- });
-*/
+ /*
+ 点击事件
+ myChart1.on('click', function (params) {
+ console.log(params);
+ });
+ */
// 指定图表的配置项和数据
function getption() {
return {
@@ -166,7 +166,10 @@
}
},
tooltip: {
- trigger: 'axis'
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
},
xAxis: {
type: 'category',
--
Gitblit v1.9.1