From dc01638699f2ffdf4189ff1232f508802ef8e372 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Sun, 29 Sep 2019 16:40:23 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=A6=82=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Home/View/default/Query/dailySummary.html | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/Application/Home/View/default/Query/dailySummary.html b/Application/Home/View/default/Query/dailySummary.html
index 5ad23331d..59ce332c3 100644
--- a/Application/Home/View/default/Query/dailySummary.html
+++ b/Application/Home/View/default/Query/dailySummary.html
@@ -294,8 +294,15 @@
var data2 = [];
var dataName1 = '';
var dataName2 = '';
+ var xLabelInterval = 0;
+ var sdate = Date.parse($('#sdate').val()) / 1000;
+ var edate = Date.parse($('#edate').val()) / 1000;
var chartBox = echarts.init(document.getElementById('chart_box'));
+ if ((edate - sdate) > 1555200) {
+ xLabelInterval = 1;
+ }
+
switch (dataType) {
case 1:
data1 = roleNum;
@@ -338,7 +345,7 @@
top: "13%",
containLabel: true
},
- color: ["#72b332", '#35a9e0'],
+ color: ["#b32106", '#143f53'],
legend: {
data: [dataName1, dataName2],
show: true,
@@ -377,7 +384,7 @@
color: "#808080"
},
alignWithLabel: true,
- interval: 1,
+ interval: xLabelInterval,
},
axisLine: {
lineStyle: {
@@ -416,14 +423,12 @@
name: dataName1,
type: 'line',
smooth: true,
- symbol: 'circle',
data: data1
},
{
name: dataName2,
type: 'line',
smooth: true,
- symbol: 'circle',
data: data2
}
],
From 7e695b199f24e8c807e96301de3d13545eff8bde Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Sun, 29 Sep 2019 16:42:32 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=A6=82=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Home/View/default/Query/dailySummary.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Application/Home/View/default/Query/dailySummary.html b/Application/Home/View/default/Query/dailySummary.html
index 59ce332c3..5a5227cca 100644
--- a/Application/Home/View/default/Query/dailySummary.html
+++ b/Application/Home/View/default/Query/dailySummary.html
@@ -415,7 +415,8 @@
color: '#fff',
}
},
- min: 0
+ min: 0,
+ minInterval:1,
}
],
series: [
From 7880da772e8e7b3d6542e437c4f876563564844d Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Sun, 29 Sep 2019 17:15:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=B4=A6=E6=88=B7?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E2=80=98=E5=A1=AB=E5=86=99=E6=94=AF?=
=?UTF-8?q?=E4=BB=98=E5=AE=9D=E8=B4=A6=E5=8F=B7=E2=80=99=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Home/Controller/PromoteController.class.php | 8 ++++----
.../Home/View/default/Promote/base_info.html | 14 +++++++-------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index d17f86828..023febd51 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -362,10 +362,10 @@ class PromoteController extends BaseController
if ( !preg_match( $pattern, $_REQUEST['email'] ) ){
$this->error('邮箱地址错误', U('Promote/base_info'));exit;
}
- if (empty($_REQUEST['alipay_account']) ) {
- $this->error('请输入支付宝账号', U('Promote/base_info'));
- exit();
- }
+// if (empty($_REQUEST['alipay_account']) ) {
+// $this->error('请输入支付宝账号', U('Promote/base_info'));
+// exit();
+// }
$se['nickname'] = $_REQUEST['nickname'];
$se['real_name'] = $_REQUEST['real_name'];
$se['email'] = $_REQUEST['email'];
diff --git a/Application/Home/View/default/Promote/base_info.html b/Application/Home/View/default/Promote/base_info.html
index 270b1e091..7edb422c7 100644
--- a/Application/Home/View/default/Promote/base_info.html
+++ b/Application/Home/View/default/Promote/base_info.html
@@ -82,13 +82,13 @@
-
- | *支付宝账号： |
-
-
- 用于自动打款
- |
-
+
+
+
+
+
+
+