正在显示
6 个修改的文件
包含
19 行增加
和
13 行删除
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | value="{$end_time|default=''}" | 20 | value="{$end_time|default=''}" |
| 21 | style="width: 140px;" autocomplete="off"> | 21 | style="width: 140px;" autocomplete="off"> |
| 22 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> | 22 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> |
| 23 | - <a class="btn btn-danger" href="{:url('Statistics/cash')}">清空</a> | 23 | + <span class="btn btn-danger" onclick="all()" >清空</span> |
| 24 | </div> | 24 | </div> |
| 25 | </div> | 25 | </div> |
| 26 | <div id="container" style="min-width:400px;height:400px"> | 26 | <div id="container" style="min-width:400px;height:400px"> |
| @@ -36,6 +36,7 @@ | @@ -36,6 +36,7 @@ | ||
| 36 | var chart ; | 36 | var chart ; |
| 37 | var pie_user ; | 37 | var pie_user ; |
| 38 | var pie_member ; | 38 | var pie_member ; |
| 39 | + var pie_all ; | ||
| 39 | var start_time = $('.start_time').val(); | 40 | var start_time = $('.start_time').val(); |
| 40 | var end_time = $('.end_time').val(); | 41 | var end_time = $('.end_time').val(); |
| 41 | function GetDateStr(AddDayCount) { | 42 | function GetDateStr(AddDayCount) { |
| @@ -65,10 +66,11 @@ | @@ -65,10 +66,11 @@ | ||
| 65 | _member = Object.assign([],data.data.member); | 66 | _member = Object.assign([],data.data.member); |
| 66 | pie_user = data.data.pie_user; | 67 | pie_user = data.data.pie_user; |
| 67 | pie_member = data.data.pie_member; | 68 | pie_member = data.data.pie_member; |
| 69 | + pie_all = data.data.pie_member + data.data.pie_user; | ||
| 68 | // 图表 | 70 | // 图表 |
| 69 | chart = Highcharts.chart('container', { | 71 | chart = Highcharts.chart('container', { |
| 70 | title: { | 72 | title: { |
| 71 | - text: '注册统计图表' | 73 | + text: '提现统计图表' |
| 72 | }, | 74 | }, |
| 73 | xAxis: { | 75 | xAxis: { |
| 74 | categories: timeList, | 76 | categories: timeList, |
| @@ -82,7 +84,7 @@ | @@ -82,7 +84,7 @@ | ||
| 82 | }, | 84 | }, |
| 83 | labels: { | 85 | labels: { |
| 84 | items: [{ | 86 | items: [{ |
| 85 | - html: '即时数据/筛选结果', | 87 | + html: "即时数据/筛选结果(共"+pie_all+"元)", |
| 86 | style: { | 88 | style: { |
| 87 | left: '100px', | 89 | left: '100px', |
| 88 | top: '18px', | 90 | top: '18px', |
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | value="{$end_time|default=''}" | 20 | value="{$end_time|default=''}" |
| 21 | style="width: 140px;" autocomplete="off"> | 21 | style="width: 140px;" autocomplete="off"> |
| 22 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> | 22 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> |
| 23 | - <a class="btn btn-danger" href="{:url('Statistics/elseMoney')}">清空</a> | 23 | + <span class="btn btn-danger" onclick="all()">清空</span> |
| 24 | </div> | 24 | </div> |
| 25 | </div> | 25 | </div> |
| 26 | <div id="container" style="min-width:400px;height:400px"> | 26 | <div id="container" style="min-width:400px;height:400px"> |
| @@ -35,6 +35,7 @@ | @@ -35,6 +35,7 @@ | ||
| 35 | var _member=[] ; | 35 | var _member=[] ; |
| 36 | var chart ; | 36 | var chart ; |
| 37 | var pie_user ; | 37 | var pie_user ; |
| 38 | + var pie_all; | ||
| 38 | var pie_member ; | 39 | var pie_member ; |
| 39 | var start_time = $('.start_time').val(); | 40 | var start_time = $('.start_time').val(); |
| 40 | var end_time = $('.end_time').val(); | 41 | var end_time = $('.end_time').val(); |
| @@ -65,10 +66,11 @@ | @@ -65,10 +66,11 @@ | ||
| 65 | _member = Object.assign([],data.data.member); | 66 | _member = Object.assign([],data.data.member); |
| 66 | pie_user = data.data.pie_user; | 67 | pie_user = data.data.pie_user; |
| 67 | pie_member = data.data.pie_member; | 68 | pie_member = data.data.pie_member; |
| 69 | + pie_all = data.data.pie_member + data.data.pie_user; | ||
| 68 | // 图表 | 70 | // 图表 |
| 69 | chart = Highcharts.chart('container', { | 71 | chart = Highcharts.chart('container', { |
| 70 | title: { | 72 | title: { |
| 71 | - text: '注册统计图表' | 73 | + text: '透视卡统计图表' |
| 72 | }, | 74 | }, |
| 73 | xAxis: { | 75 | xAxis: { |
| 74 | categories: timeList, | 76 | categories: timeList, |
| @@ -82,7 +84,7 @@ | @@ -82,7 +84,7 @@ | ||
| 82 | }, | 84 | }, |
| 83 | labels: { | 85 | labels: { |
| 84 | items: [{ | 86 | items: [{ |
| 85 | - html: '即时数据/筛选结果', | 87 | + html: "即时数据/筛选结果(共"+pie_all+"元)", |
| 86 | style: { | 88 | style: { |
| 87 | left: '100px', | 89 | left: '100px', |
| 88 | top: '18px', | 90 | top: '18px', |
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | value="{$end_time|default=''}" | 20 | value="{$end_time|default=''}" |
| 21 | style="width: 140px;" autocomplete="off"> | 21 | style="width: 140px;" autocomplete="off"> |
| 22 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> | 22 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> |
| 23 | - <a class="btn btn-danger" href="{:url('Statistics/getmoney')}">清空</a> | 23 | + <span class="btn btn-danger" onclick="all()" >清空</span> |
| 24 | </div> | 24 | </div> |
| 25 | </div> | 25 | </div> |
| 26 | <div id="container" style="min-width:400px;height:400px"> | 26 | <div id="container" style="min-width:400px;height:400px"> |
| @@ -36,6 +36,7 @@ | @@ -36,6 +36,7 @@ | ||
| 36 | var chart ; | 36 | var chart ; |
| 37 | var pie_user ; | 37 | var pie_user ; |
| 38 | var pie_member ; | 38 | var pie_member ; |
| 39 | + var pie_all ; | ||
| 39 | var start_time = $('.start_time').val(); | 40 | var start_time = $('.start_time').val(); |
| 40 | var end_time = $('.end_time').val(); | 41 | var end_time = $('.end_time').val(); |
| 41 | function GetDateStr(AddDayCount) { | 42 | function GetDateStr(AddDayCount) { |
| @@ -65,10 +66,11 @@ | @@ -65,10 +66,11 @@ | ||
| 65 | _member = Object.assign([],data.data.member); | 66 | _member = Object.assign([],data.data.member); |
| 66 | pie_user = data.data.pie_user; | 67 | pie_user = data.data.pie_user; |
| 67 | pie_member = data.data.pie_member; | 68 | pie_member = data.data.pie_member; |
| 69 | + pie_all = data.data.pie_member + data.data.pie_user; | ||
| 68 | // 图表 | 70 | // 图表 |
| 69 | chart = Highcharts.chart('container', { | 71 | chart = Highcharts.chart('container', { |
| 70 | title: { | 72 | title: { |
| 71 | - text: '注册统计图表' | 73 | + text: '奖励金额统计图表' |
| 72 | }, | 74 | }, |
| 73 | xAxis: { | 75 | xAxis: { |
| 74 | categories: timeList, | 76 | categories: timeList, |
| @@ -82,7 +84,7 @@ | @@ -82,7 +84,7 @@ | ||
| 82 | }, | 84 | }, |
| 83 | labels: { | 85 | labels: { |
| 84 | items: [{ | 86 | items: [{ |
| 85 | - html: '即时数据/筛选结果', | 87 | + html: "即时数据/筛选结果(共"+pie_all+"元)", |
| 86 | style: { | 88 | style: { |
| 87 | left: '100px', | 89 | left: '100px', |
| 88 | top: '18px', | 90 | top: '18px', |
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | value="{$end_time|default=''}" | 20 | value="{$end_time|default=''}" |
| 21 | style="width: 140px;" autocomplete="off"> | 21 | style="width: 140px;" autocomplete="off"> |
| 22 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> | 22 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> |
| 23 | - <a class="btn btn-danger" href="{:url('Statistics/index')}">清空</a> | 23 | + <span class="btn btn-danger" onclick="all()" >清空</span> |
| 24 | </div> | 24 | </div> |
| 25 | </div> | 25 | </div> |
| 26 | <div id="container" style="min-width:400px;height:400px"> | 26 | <div id="container" style="min-width:400px;height:400px"> |
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | </select> | 29 | </select> |
| 30 | | 30 | |
| 31 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> | 31 | <input type="submit" class="btn btn-primary" value="搜索" onclick="getData()"/> |
| 32 | - <a class="btn btn-danger" href="{:url('Statistics/money')}">清空</a> | 32 | + <span class="btn btn-danger" onclick="all()" >清空</span> |
| 33 | </div> | 33 | </div> |
| 34 | </div> | 34 | </div> |
| 35 | <div id="container" style="min-width:400px;height:400px"> | 35 | <div id="container" style="min-width:400px;height:400px"> |
| @@ -81,7 +81,7 @@ | @@ -81,7 +81,7 @@ | ||
| 81 | // 图表 | 81 | // 图表 |
| 82 | chart = Highcharts.chart('container', { | 82 | chart = Highcharts.chart('container', { |
| 83 | title: { | 83 | title: { |
| 84 | - text: '注册统计图表' | 84 | + text: '缴纳金额统计图表' |
| 85 | }, | 85 | }, |
| 86 | xAxis: { | 86 | xAxis: { |
| 87 | categories: timeList, | 87 | categories: timeList, |
| @@ -24,7 +24,7 @@ class WxPayConfig | @@ -24,7 +24,7 @@ class WxPayConfig | ||
| 24 | */ | 24 | */ |
| 25 | const APPID = 'wxf69d1d87d173c899'; | 25 | const APPID = 'wxf69d1d87d173c899'; |
| 26 | const MCHID = '1507884301'; | 26 | const MCHID = '1507884301'; |
| 27 | - const KEY = 'YkeE7j21vdwqnBYW8FM2Z11O9T4v1kH0'; | 27 | + const KEY = 'VaY3CqbFLbq2Dw3FRENrixu24E9Qq1ZI'; |
| 28 | const APPSECRET = '93c020c51020d87bda1c0bd98b527ff5'; | 28 | const APPSECRET = '93c020c51020d87bda1c0bd98b527ff5'; |
| 29 | 29 | ||
| 30 | //=======【证书路径设置】===================================== | 30 | //=======【证书路径设置】===================================== |
-
请 注册 或 登录 后发表评论