diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php index b6a212bbb..a7d6214db 100644 --- a/Application/Admin/Controller/AjaxController.class.php +++ b/Application/Admin/Controller/AjaxController.class.php @@ -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/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-外团',