diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php
index f9a2a922c..a7d6214db 100644
--- a/Application/Admin/Controller/AjaxController.class.php
+++ b/Application/Admin/Controller/AjaxController.class.php
@@ -245,7 +245,7 @@ class AjaxController extends ThinkController{
$withdraw_number = $_REQUEST['withdraw_number'];
$data = M("withdraw","tab_")
- ->field("widthdraw_number,promote_account,tab_promote_company.id as company_id,company_name,settlement_type,mobile_phone,real_name,bank_card,account_openin,address,game_ratio,bank_account")
+ ->field("widthdraw_number,promote_account,tab_promote_company.id as company_id,company_name,tab_withdraw.settlement_type,mobile_phone,real_name,bank_card,account_openin,address,game_ratio,bank_account")
->join("left join tab_promote on tab_withdraw.promote_id=tab_promote.id")
->join("left join tab_promote_company on tab_promote.company_id=tab_promote_company.id")
->where(['widthdraw_number'=>$withdraw_number])
@@ -312,9 +312,22 @@ class AjaxController extends ThinkController{
// dump($statementData);die();
} else {
+
+ $data['address'] = json_decode($data['address'],1);
+// dd($data['address']);
+ $address = '';
+ if (is_array($data['address'])) {
+ foreach($data['address'] as $key => $value) {
+ $address = $address.' '.$value;
+ }
+ }
+ $data['address'] = $address;
+
if (is_array($data['game_ratio'])) {
foreach ($data['game_ratio'] as $key => &$value) {
+
+
foreach ($value as $k => &$v) {
$v['game_name'] = get_gamename($key);
}
diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php
index 2c93d45de..4cc759222 100644
--- a/Application/Admin/Controller/PlatformController.class.php
+++ b/Application/Admin/Controller/PlatformController.class.php
@@ -697,7 +697,7 @@ class PlatformController extends ThinkController
// dd($data);
unset($map['tp1.id']);
unset($map['tp1.chain']);
- unset($tmap['tp1.chain']);
+ unset($tmap['tp1.id']);
unset($tmap['tp1.chain']);
$map['s.promote_id'] = 0;
$tmap['s.promote_id'] = 0;
diff --git a/Application/Admin/View/StatementMangement/createDownstreamOrder.html b/Application/Admin/View/StatementMangement/createDownstreamOrder.html
index a47d9ca0b..2c3a66a2f 100644
--- a/Application/Admin/View/StatementMangement/createDownstreamOrder.html
+++ b/Application/Admin/View/StatementMangement/createDownstreamOrder.html
@@ -285,9 +285,9 @@
function eventnew(){
$(".tax").off("blur");
$(".tax").on("blur", function() {
- var lastNum = $(this).parent().next().text();
+ var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2);
$(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2));
- var nowNum = $(this).parent().next().text();
+ var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2);
console.log((nowNum-lastNum))
$(".sumAll").text((parseFloat($(".sumAll").text())+(nowNum-lastNum)).toFixed(2));
});
@@ -296,7 +296,7 @@
$(".forfeit").on("blur", function() {
var lastNumber = $(this).parent().next().next().next().text();
- $(this).parent().next().next().next().text($(this).val());
+ $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2));
$(".sumAmount").text($(".sumAmount").attr("data-value")-$(this).val());
$(".sumAll").text((parseFloat($(".sumAll").text())+parseFloat(lastNumber)-parseFloat($(this).val())).toFixed(2));
diff --git a/Application/Admin/View/StatementMangement/edit.html b/Application/Admin/View/StatementMangement/edit.html
index 8c0dd5723..02ceb35c8 100644
--- a/Application/Admin/View/StatementMangement/edit.html
+++ b/Application/Admin/View/StatementMangement/edit.html
@@ -286,9 +286,9 @@
function eventnew(){
$(".tax").off("blur");
$(".tax").on("blur", function() {
- var lastNum = $(this).parent().next().text();
+ var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2);
$(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2));
- var nowNum = $(this).parent().next().text();
+ var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2);
console.log((nowNum-lastNum))
$(".sumAll").text((parseFloat($(".sumAll").text())+(nowNum-lastNum)).toFixed(2));
});
@@ -297,8 +297,8 @@
$(".forfeit").on("blur", function() {
var lastNumber = $(this).parent().next().next().next().text();
- $(this).parent().next().next().next().text($(this).val());
- $(".sumAmount").text($(".sumAmount").attr("data-value")-$(this).val());
+ $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2));
+ $(".sumAmount").text(($(".sumAmount").attr("data-value")-$(this).val()).toFixed(2));
$(".sumAll").text((parseFloat($(".sumAll").text())+parseFloat(lastNumber)-parseFloat($(this).val())).toFixed(2));
diff --git a/Application/Admin/View/StatementMangement/lists.html b/Application/Admin/View/StatementMangement/lists.html
index 48c40df33..6def393a1 100644
--- a/Application/Admin/View/StatementMangement/lists.html
+++ b/Application/Admin/View/StatementMangement/lists.html
@@ -322,11 +322,11 @@
var str = '';
console.log($("#company_id option:selected").attr('company-type'))
if ($("#company_id option:selected").attr('company-type') == '1') {
- str += ' \n' +
- ' ';
+ str += ' \n' +
+ ' ';
} else if ($("#company_id option:selected").attr('company-type') == '0') {
- str += ' \n' +
- ' ';
+ str += ' \n' +
+ ' ';
}
diff --git a/Data/update.sql b/Data/update.sql
index 10327d842..3286d9abe 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -947,7 +947,7 @@ ALTER TABLE tab_partner ADD `opening_bank` varchar(128) DEFAULT NULL COMMENT '
-- 推广公会归属管理 2020-1-1 刘伟文
CREATE TABLE `tab_promote_belong` (
- `id` int(11) NOT NULL,
+ `id` int(11) NOT NULL AUTO_INCREMENT,
`promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id',
`verify_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '审核状态:0-待审核;1-审核通过;2-审核拒绝',
`company_belong` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会归属:0-内团;1-外团',