Merge branch 'feature/group_type' into dev

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);
                     }

Application/Admin/View/StatementMangement/lists.html

@@ -322,11 +322,11 @@
                 var str = '<option value="">对账类型</option>';
                   console.log($("#company_id option:selected").attr('company-type'))
                   if ($("#company_id option:selected").attr('company-type') == '1') {
-                      str += '                    <option value="1" selected=selected>公会对账单</option>\n' +
-                        '                    <option value="0">CP对账单</option>';
+                      str += '                    <option value="1" selected=selected>下游游对账单</option>\n' +
+                        '                    <option value="0">上游对账单</option>';
                   } else if ($("#company_id option:selected").attr('company-type') == '0') {
-                      str += '                    <option value="1">公会对账单</option>\n' +
-                        '                    <option value="0" selected=selected>CP对账单</option>';
+                      str += '                    <option value="1">下游对账单</option>\n' +
+                        '                    <option value="0" selected=selected>上游对账单</option>';
                   }
 
 

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-外团',