From f855835501ddec1da27b33978c18fed6136e9a45 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 30 Dec 2020 11:04:07 +0800
Subject: [PATCH 01/12] =?UTF-8?q?12.28=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PlatformController.class.php  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php
index 0260a2429..cf41d1e5b 100644
--- a/Application/Admin/Controller/PlatformController.class.php
+++ b/Application/Admin/Controller/PlatformController.class.php
@@ -1186,9 +1186,9 @@ class PlatformController extends ThinkController
         }   
         $tdata = M('promote', 'tab_')->alias('tp1')
             ->field('tp1.account as promote_account,tp1.id,g.relation_game_id,g.relation_game_name,
-                    floor(sum(IF(s.pay_time ' . $today . ',pay_amount,0))*100)  as today,
-                    floor(sum(IF(s.pay_time ' . $week . ',pay_amount,0))*100)  as week,
-                    floor(sum(IF(s.pay_time ' . $mounth . ',pay_amount,0))*100)  as mounth')
+                    floor(sum(IF(s.pay_time ' . $today . ' and is_check=1,pay_amount,0))*100)  as today,
+                    floor(sum(IF(s.pay_time ' . $week . ' and is_check=1,pay_amount,0))*100)  as week,
+                    floor(sum(IF(s.pay_time ' . $mounth . ' and is_check=1,pay_amount,0))*100)  as mounth')
             ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left')
             ->join("tab_spend as s on tp2.id = s.promote_id", 'left')
             ->join("tab_game as g on g.id = s.game_id", 'left')
@@ -1243,14 +1243,14 @@ class PlatformController extends ThinkController
             if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) {
                 //官方渠道数据添加
                 $authorityData = M('spend', 'tab_')->alias('s')
-                ->field('floor(sum(pay_amount)*100) as count,IFNULL(sum(IF(is_check=2,pay_amount,0)),0) unpay_count')
+                ->field('floor(sum(IF(is_check=1,pay_amount,0))*100) as count,IFNULL(sum(IF(is_check=2,pay_amount,0)),0) unpay_count')
                 ->where($map)
                 ->find();
                 $tauthorityData = M('spend', 'tab_')->alias('s')
                 ->field('
-                floor(sum(IF(s.pay_time ' . $today . ',pay_amount,0))*100)  as today,
-                floor(sum(IF(s.pay_time ' . $week . ',pay_amount,0))*100)  as week,
-                floor(sum(IF(s.pay_time ' . $mounth . ',pay_amount,0))*100)  as mounth')
+                floor(sum(IF(s.pay_time ' . $today . ' and is_check=1,pay_amount,0))*100)  as today,
+                floor(sum(IF(s.pay_time ' . $week . ' and is_check=1,pay_amount,0))*100)  as week,
+                floor(sum(IF(s.pay_time ' . $mounth . ' and is_check=1,pay_amount,0))*100)  as mounth')
                 ->where($tmap)
                 ->find();
                 $authorityData['today'] = $tauthorityData['today'];

From 9c0006ef4566f9dac815162ec167a30bccd0c52e Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 30 Dec 2020 14:02:54 +0800
Subject: [PATCH 02/12] =?UTF-8?q?12.28=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PlatformController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php
index cf41d1e5b..f8cc24362 100644
--- a/Application/Admin/Controller/PlatformController.class.php
+++ b/Application/Admin/Controller/PlatformController.class.php
@@ -1329,7 +1329,7 @@ class PlatformController extends ThinkController
                 'admin_username' => '当前市场专员',
                 'relation_game_name' => '游戏',
                 "count"=>"累计充值",
-                "unpay_count"=>"累计充值",
+                "unpay_count"=>"累计不结算充值",
                 "rand"=>"排行榜",
                 "today"=>"今日充值",
                 "week"=>"本周充值",

From f5e2adb8608fe6ce41d45fa467bad0f4aa6c4020 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 30 Dec 2020 14:30:53 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E4=B8=87=E8=83=BD=E9=AA=8C=E8=AF=81=E7=A0=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Payment/Controller/PublicController.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Payment/Controller/PublicController.class.php b/Application/Payment/Controller/PublicController.class.php
index 48a41f7bb..60c0664d5 100644
--- a/Application/Payment/Controller/PublicController.class.php
+++ b/Application/Payment/Controller/PublicController.class.php
@@ -130,9 +130,9 @@ class PublicController extends \Think\Controller
     public function checksafecode($phone, $code)
     {
         //测试验证码
-         if($code == "txsb0601"){
-             return true;
-         }
+//         if($code == "txsb0601"){
+//             return true;
+//         }
         $taskClient = new TaskClient();
         $result = $taskClient->checkSms($phone, $code);
         $data = [];

From ee34cc86f58210fbaf99f48e29a0d4be0386cffd Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Wed, 30 Dec 2020 14:47:50 +0800
Subject: [PATCH 04/12] 1

---
 Application/Admin/Controller/SocietyInfoController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index c92fb18ba..85027a5fe 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -408,7 +408,7 @@ class SocietyInfoController extends ThinkController
             $inserts[$k-2]['create_time'] = time();
             $inserts[$k-2]['update_time'] = time();
             $inserts[$k-2]['communication_time'] = time();
-            $save['create_account'] = $this->admininfo['username'];
+            $inserts[$k-2]['create_account'] = $this->admininfo['username'];
 
             $gameTypes = explode('/', $v['I']);
             foreach ($gameTypes as $gameType) {

From e57a5f8e50ebedc48ae12aa2c4def759fdfc89d1 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Wed, 30 Dec 2020 16:26:09 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/SocietyInfoController.class.php      | 3 +++
 Application/Admin/View/SocietyInfo/lists.html             | 8 ++++----
 Application/Admin/View/SocietyInfo/timeset.html           | 6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index 85027a5fe..1725709ad 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -143,6 +143,9 @@ class SocietyInfoController extends ThinkController
         $num = $config['value'];
         if (IS_POST) {
             $num = I('num');
+            if ($num < 0) {
+                $this->error("时间设置不能小于0");
+            }
             M('config', 'sys_')->where([
                 'name' => 'SOCIETY_INFO_COMMUNITION_GAP'
             ])->save([
diff --git a/Application/Admin/View/SocietyInfo/lists.html b/Application/Admin/View/SocietyInfo/lists.html
index 61bd2db6a..3880f3942 100644
--- a/Application/Admin/View/SocietyInfo/lists.html
+++ b/Application/Admin/View/SocietyInfo/lists.html
@@ -111,9 +111,9 @@
                 <button id="excel_back" class="submit_btn"  type="text" target-form="form-horizontal">返 回</button>
             </div>
             </form>
-        </div>
-        <div class="input-list">
-            <p style="margin: 0px;">文件格式参考：请严格按照此格式，文件的第一行必须是字段名，且字段名不允许修改，游戏类型目前仅支持：国战、宫斗、返利服、商战、传奇、仙侠、卡牌、策略如果游戏为多个类型，请用“/”隔开，如：策略/卡牌</p>
+            <div class="input-list">
+                <p style="margin: 5px;">文件格式参考：请严格按照此格式，文件的第一行必须是字段名，且字段名不允许修改，游戏类型目前仅支持：国战、宫斗、返利服、商战、传奇、仙侠、卡牌、策略如果游戏为多个类型，请用“/”隔开，如：策略/卡牌</p>
+            </div>
         </div>
     </div>
 
@@ -193,7 +193,7 @@
         </div>
     </div>
     <div class="data_list data_game_list model" style="display: none;">
-        <div class="">
+        <div class="" style="margin-top: 25px;">
             <table border="1">
                 <!-- 表头 -->
                 <thead>
diff --git a/Application/Admin/View/SocietyInfo/timeset.html b/Application/Admin/View/SocietyInfo/timeset.html
index 3c391c063..d4d3905df 100644
--- a/Application/Admin/View/SocietyInfo/timeset.html
+++ b/Application/Admin/View/SocietyInfo/timeset.html
@@ -27,7 +27,7 @@
         <tr style="padding: 10px;height: 50px;">
             <td class="l" style="width: 120px;">未沟通时间超过:</td>
             <td class="r" style="margin-left: 10px;">
-                <input style="width: 60px;" type="text" id="num" name="company_name" value="{$num}" placeholder="请输入天数">
+                <input style="width: 60px;" type="text" id="num" name="company_name" value="{$num}" placeholder="请输入天数" oninput="value=value.replace(/[^\d]/g,'')">
             </td>
             <td class="l" style="width: 100px;">天后自动提示</td>
         </tr>
@@ -49,6 +49,10 @@
                 layer.msg("天数不能为空");
                 return false;
             }
+            if(num < 0){
+                layer.msg("天数不能小于0");
+                return false;
+            }
             formData.append("num", num);
             var index = layer.load();
             $.ajax({

From b4c3b64fb009cdc51b1e41fded215f80199ef4c7 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Wed, 30 Dec 2020 16:34:41 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/SocietyInfo/lists.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Application/Admin/View/SocietyInfo/lists.html b/Application/Admin/View/SocietyInfo/lists.html
index 3880f3942..c17761be1 100644
--- a/Application/Admin/View/SocietyInfo/lists.html
+++ b/Application/Admin/View/SocietyInfo/lists.html
@@ -221,7 +221,6 @@
 
                 <!-- 列表 -->
                 <tbody>
-                        <tr <if condition="$data['is_gap_time'] eq 1"> style="background: yellow;" </if> >
                         <td rowspan="{$data.row}">--</td>
                         <td rowspan="{$data.row}">--</td>
                         <td rowspan="{$data.row}">--</td>

From e3f020965d712c1253242186c6ae2803a6f2e59f Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Wed, 30 Dec 2020 16:46:18 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/SocietyInfoController.class.php | 5 +++++
 Application/Admin/View/SocietyInfo/edit.html                 | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index 1725709ad..e4c1c22ec 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -292,6 +292,11 @@ class SocietyInfoController extends ThinkController
             foreach ($save['game_types'] as $v) {
                 $save['game_type'] .= $v . "/";
             }
+            if ($save['province'] == '请选择省份') {
+                $save['province'] = '';
+                $save['city'] = '';
+            }
+
             $save['game_type'] = trim($save['game_type'], '/');
             $save['communication_time'] = time();
             $save['update_time'] = time();
diff --git a/Application/Admin/View/SocietyInfo/edit.html b/Application/Admin/View/SocietyInfo/edit.html
index d2c8f19fe..7d7c7eb18 100644
--- a/Application/Admin/View/SocietyInfo/edit.html
+++ b/Application/Admin/View/SocietyInfo/edit.html
@@ -255,10 +255,10 @@
         $("#submit").on("click",function(){
             var cres = $('form').serializeArray();
             if ($("#province").val() == "请选择省份" || !$("#province").val()) {
-                layer.msg('请选择省份');return ;
+                // layer.msg('请选择省份');return ;
             }
             if (!$("#city").val()) {
-                layer.msg('请选择城市');return ;
+                // layer.msg('请选择城市');return ;
             }
             if (!$("#company_name").val()) {
                 layer.msg('请输入公司名');return ;

From 98ebb36aa3587a86a8ec8f086977b695772dcc88 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Wed, 30 Dec 2020 17:34:06 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/SocietyInfoController.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index e4c1c22ec..c25609290 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -64,6 +64,8 @@ class SocietyInfoController extends ThinkController
             foreach ($parseData as &$v) {
                 if ($v['is_potential'] == 1) $v['is_potential'] = "是";
                 else $v['is_potential'] = "否";
+                $v['communication_time'] = date('Y-m-d H:i:s', $v['communication_time']);
+                $v['create_time'] = date('Y-m-d H:i:s', $v['create_time']);
                 unset($v['id']);
                 unset($v['game_id']);
                 unset($v['update_time']);

From 9f329b7c3409f28398b3a523c42a0bf58368728b Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Wed, 30 Dec 2020 19:31:16 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SocietyInfoController.class.php           | 61 ++++++++++++++++---
 Application/Admin/View/SocietyInfo/add.html   | 47 +++++++-------
 Application/Admin/View/SocietyInfo/edit.html  | 26 ++++----
 Application/Admin/View/SocietyInfo/lists.html | 20 +++++-
 4 files changed, 107 insertions(+), 47 deletions(-)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index c25609290..d62f41bd5 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -60,7 +60,9 @@ class SocietyInfoController extends ThinkController
         $query = $model->where($map)->order("id desc");
         $count = $query->count();
         if($is_export){
-            $parseData = $query->field("province, city, company_name, register_capital, functionary, phone, wechat, qq, game_type, game_name, join_platform, promote_scale, turnover, address, league_info, is_potential, remark, interface_person, create_time, communication_time, create_account")->select();
+            $parseData = $query->field("province, city, company_name, register_capital, functionary, phone, wechat, qq, game_type, game_name, join_platform, promote_scale, turnover, address, league_info, is_potential, remark, interface_person, create_time, communication_time, create_account")
+                ->where($map)
+                ->select();
             foreach ($parseData as &$v) {
                 if ($v['is_potential'] == 1) $v['is_potential'] = "是";
                 else $v['is_potential'] = "否";
@@ -80,6 +82,7 @@ class SocietyInfoController extends ThinkController
         }
 
         //分页
+        $parameter = I("get.");
         $parameter['p'] = $page;
         $parameter['row'] = $row;
         $page = set_pagination($count, $row, $parameter);
@@ -387,34 +390,77 @@ class SocietyInfoController extends ThinkController
         $datas = $this->parseExcelIn($filename, $exts);
         $inserts = [];
         foreach ($datas as $k => $v) {
-            /*foreach ($v as $p) {
-                if (!$p) {
-                    $this->error("数据不能为空");
+            $flag = 0;
+            foreach ($v as $p) {
+                if (!empty($p)) {
+                    $flag = 1;
                 }
-            }*/
+            }
+            if ($flag == 0) continue;
             if ($k == 1) continue;
-
             $inserts[$k-2]['province'] = $v['A'] ?? '';
             $inserts[$k-2]['city'] = $v['B'] ?? '';
             $inserts[$k-2]['company_name'] = $v['C'] ?? '';
+            if (strlen($inserts[$k-2]['company_name']) > 100) {
+                $this->error("公司名太长".$k);
+            }
             if (!$inserts[$k-2]['company_name']) {
-                $this->error("公司不能为空");
+                $this->error("公司不能为空".$k);
             }
             $inserts[$k-2]['register_capital'] = $v['D'] ?? '';
+            if (strlen($inserts[$k-2]['register_capital']) > 50) {
+                $this->error("推荐人太长".$k);
+            }
             $inserts[$k-2]['functionary'] = $v['E'] ?? '';
+            if (strlen($inserts[$k-2]['functionary']) > 50) {
+                $this->error("负责人太长".$k);
+            }
             $inserts[$k-2]['phone'] = $v['F'] ?? '';
+            if (strlen($inserts[$k-2]['phone']) > 50) {
+                $this->error("手机号太长".$k);
+            }
             $inserts[$k-2]['wechat'] = $v['G'] ?? '';
+            if (strlen($inserts[$k-2]['wechat']) > 50) {
+                $this->error("微信号太长".$k);
+            }
             $inserts[$k-2]['qq'] = $v['H'] ?? '';
+            if (strlen($inserts[$k-2]['qq']) > 50) {
+                $this->error("qq号太长".$k);
+            }
             $inserts[$k-2]['game_type'] = $v['I'] ?? '';
             $inserts[$k-2]['game_name'] = $v['J'] ?? '';
+            if (strlen($inserts[$k-2]['game_name']) > 50) {
+                $this->error("游戏名太长".$k);
+            }
             $inserts[$k-2]['join_platform'] = $v['K'] ?? '';
+            if (strlen($inserts[$k-2]['join_platform']) > 50) {
+                $this->error("合作平台太长".$k);
+            }
             $inserts[$k-2]['promote_scale'] = $v['L'] ?? '';
+            if (strlen($inserts[$k-2]['promote_scale']) > 50) {
+                $this->error("推广规模太长".$k);
+            }
             $inserts[$k-2]['turnover'] = $v['M'] ?? '';
+            if (strlen($inserts[$k-2]['turnover']) > 50) {
+                $this->error("流水太长".$k);
+            }
             $inserts[$k-2]['address'] = $v['N'] ?? '';
+            if (strlen($inserts[$k-2]['address']) > 100) {
+                $this->error("地址太长".$k);
+            }
             $inserts[$k-2]['league_info'] = $v['O'] ?? '';
+            if (strlen($inserts[$k-2]['league_info']) > 100) {
+                $this->error("联盟信息太长".$k);
+            }
             $inserts[$k-2]['is_potential'] = $v['P']=="是" ? 1 : 0;
             $inserts[$k-2]['remark'] = $v['Q'] ?? '';
+            if (strlen($inserts[$k-2]['remark']) > 100) {
+                $this->error("备注太长".$k);
+            }
             $inserts[$k-2]['interface_person'] = $v['R'] ?? '';
+            if (strlen($inserts[$k-2]['interface_person']) > 50) {
+                $this->error("对接人太长".$k);
+            }
             $inserts[$k-2]['create_time'] = time();
             $inserts[$k-2]['update_time'] = time();
             $inserts[$k-2]['communication_time'] = time();
@@ -462,6 +508,7 @@ class SocietyInfoController extends ThinkController
                 $address=$currentColumn.$currentRow;
                 //读取到的数据，保存到数组$arr中
                 $data[$currentRow][$currentColumn]=$currentSheet->getCell($address)->getValue();
+                if(is_object($data[$currentRow][$currentColumn]))  $data[$currentRow][$currentColumn] = $data[$currentRow][$currentColumn]->__toString();
             }
 
         }
diff --git a/Application/Admin/View/SocietyInfo/add.html b/Application/Admin/View/SocietyInfo/add.html
index ed8c389bd..4148f91cd 100644
--- a/Application/Admin/View/SocietyInfo/add.html
+++ b/Application/Admin/View/SocietyInfo/add.html
@@ -50,88 +50,83 @@
                             <tr>
                                 <td class="l"><span style="color:red">*</span>公司：</td>
                                 <td class="r table_radio">
-                                  <input type="text" name="company_name" id="company_name" class="input" placeholder="请输入公司名称">
+                                  <input type="text" name="company_name" id="company_name" class="input" placeholder="请输入公司名称" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">注册资本：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="register_capital" id="register_capital" class="input" placeholder="请输入注册资本">
+                                    <input type="text" name="register_capital" id="register_capital" class="input" placeholder="请输入注册资本" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">负责人：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="functionary" id="functionary" class="input" placeholder="请输入负责人">
+                                    <input type="text" name="functionary" id="functionary" class="input" placeholder="请输入负责人" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">电话：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="phone" id="phone" class="input" placeholder="请输入电话">
+                                    <input type="text" name="phone" id="phone" class="input" placeholder="请输入电话" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">微信：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="wechat" id="wechat" class="input" placeholder="请输入微信">
+                                    <input type="text" name="wechat" id="wechat" class="input" placeholder="请输入微信" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">QQ：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="qq" id="qq" class="input" placeholder="请输入QQ">
+                                    <input type="text" name="qq" id="qq" class="input" placeholder="请输入QQ" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">游戏类型：</td>
                                 <input id="game_type" name="game_type" type="hidden" value="{$game_types[0]['type_name']}">
-                                <td class="r" style="width: 50px;">
-                                    <select name="game_type_id" id="game_type_id" class="select_gallery">
-                                        <volist name="game_types" id="vo">
-                                        <option value="<?=$vo['id']?>" >{$vo['type_name']}</option>
-                                        </volist>
-                                    </select>
+                                <td class="r" style="">
+                                    <volist name="game_types" id="vo">
+                                        <span style="margin-right:18px;">{$vo['type_name']}: <input type="checkbox" name="game_types[]" value="{$vo['type_name']}"></span>
+                                    </volist>
                                     <span class="notice-text"></span>
                                 </td>
-                                <script>$("#game_type_id").change(function() {
-                                    $("#game_type").val($("#game_type_id option:selected").text());
-                                });</script>
                             </tr>
                             <tr>
                                 <td class="l">所做游戏：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="game_name" id="game_name" class="input" placeholder="请输入所做游戏">
+                                    <input type="text" name="game_name" id="game_name" class="input" placeholder="请输入所做游戏" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">合作平台：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="join_platform" id="join_platform" class="input" placeholder="请输入合作平台">
+                                    <input type="text" name="join_platform" id="join_platform" class="input" placeholder="请输入合作平台" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">推广规模：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="promote_scale" id="promote_scale" class="input" placeholder="请输入推广规模">
+                                    <input type="text" name="promote_scale" id="promote_scale" class="input" placeholder="请输入推广规模" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">流水：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="turnover" id="turnover" class="input" placeholder="请输入流水">
+                                    <input type="text" name="turnover" id="turnover" class="input" placeholder="请输入流水" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">地址：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="address" id="address" class="input" placeholder="请输入地址">
+                                    <input type="text" name="address" id="address" class="input" placeholder="请输入地址" maxlength="100">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">联盟信息：</td>
                                 <td class="r table_radio">
-                                    <input type="text" name="league_info" id="league_info" class="input" placeholder="请输入联盟信息">
+                                    <input type="text" name="league_info" id="league_info" class="input" placeholder="请输入联盟信息" maxlength="50">
                                 </td>
                             </tr>
 
@@ -140,10 +135,10 @@
                                 <td class="r table_radio">
                                 <span class="form_radio table_btn">
                                     <label>
-                                        <input type="radio" class="inp_radio" value="0"  name="is_potential" checked> 否
+                                        <input type="radio" class="inp_radio" value="0"  name="is_potential"> 否
                                     </label>
                                     <label>
-                                        <input type="radio" class="inp_radio" value="1"  name="is_potential" > 是
+                                        <input type="radio" class="inp_radio" value="1"  name="is_potential" checked> 是
                                     </label>
                                 </span>
                                     <span class="notice-text"></span>
@@ -153,7 +148,7 @@
                             <tr>
                                 <td class="l">备注信息：</td>
                                 <td class="r">
-                                    <textarea name="remark" class="txt" placeholder="请输入备注信息"></textarea>
+                                    <textarea name="remark" class="txt" placeholder="请输入备注信息" maxlength="100"></textarea>
                                 </td>
                             </tr>
 
@@ -166,7 +161,7 @@
                             <tr>
                                 <td class="l">对接人：</td>
                                 <td class="r">
-                                    <input type="text" class="txt" name="interface_person" value="{$interface_person}" placeholder="对接人">
+                                    <input type="text" class="txt" name="interface_person" value="{$interface_person}" placeholder="对接人" maxlength="50">
                                 </td>
                             </tr>
 
@@ -176,7 +171,7 @@
                 </div>
                 <div class="form-item cf">
                     <input class="submit_btn" type="button" value="保存" id="submit"  target-form="form-horizontal" style="margin-left:210px;">
-                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('Partner/lists')}" >
+                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('SocietyInfo/lists')}" >
                         返回
                     </a>
                 </div>
diff --git a/Application/Admin/View/SocietyInfo/edit.html b/Application/Admin/View/SocietyInfo/edit.html
index 7d7c7eb18..48539f364 100644
--- a/Application/Admin/View/SocietyInfo/edit.html
+++ b/Application/Admin/View/SocietyInfo/edit.html
@@ -51,37 +51,37 @@
                             <tr>
                                 <td class="l">公司：</td>
                                 <td class="r table_radio">
-                                  <input type="text" value="{$data['company_name']}" name="company_name" id="company_name" class="input" placeholder="请输入公司名称">
+                                  <input type="text" value="{$data['company_name']}" name="company_name" id="company_name" class="input" placeholder="请输入公司名称" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">注册资本：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['register_capital']}" name="register_capital" id="register_capital" class="input" placeholder="请输入注册资本">
+                                    <input type="text" value="{$data['register_capital']}" name="register_capital" id="register_capital" class="input" placeholder="请输入注册资本" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">负责人：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['functionary']}" name="functionary" id="functionary" class="input" placeholder="请输入负责人">
+                                    <input type="text" value="{$data['functionary']}" name="functionary" id="functionary" class="input" placeholder="请输入负责人" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">电话：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['phone']}" name="phone" id="phone" class="input" placeholder="请输入电话">
+                                    <input type="text" value="{$data['phone']}" name="phone" id="phone" class="input" placeholder="请输入电话" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">微信：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['wechat']}" name="wechat" id="wechat" class="input" placeholder="请输入微信">
+                                    <input type="text" value="{$data['wechat']}" name="wechat" id="wechat" class="input" placeholder="请输入微信" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">QQ：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['qq']}" name="qq" id="qq" class="input" placeholder="请输入QQ">
+                                    <input type="text" value="{$data['qq']}" name="qq" id="qq" class="input" placeholder="请输入QQ" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
@@ -105,37 +105,37 @@
                             <tr>
                                 <td class="l">所做游戏：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['game_name']}" name="game_name" id="game_name" class="input" placeholder="请输入所做游戏">
+                                    <input type="text" value="{$data['game_name']}" name="game_name" id="game_name" class="input" placeholder="请输入所做游戏" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">合作平台：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['join_platform']}" name="join_platform" id="join_platform" class="input" placeholder="请输入合作平台">
+                                    <input type="text" value="{$data['join_platform']}" name="join_platform" id="join_platform" class="input" placeholder="请输入合作平台" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">推广规模：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['promote_scale']}" name="promote_scale" id="promote_scale" class="input" placeholder="请输入推广规模">
+                                    <input type="text" value="{$data['promote_scale']}" name="promote_scale" id="promote_scale" class="input" placeholder="请输入推广规模" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">流水：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['turnover']}" name="turnover" id="turnover" class="input" placeholder="请输入流水">
+                                    <input type="text" value="{$data['turnover']}" name="turnover" id="turnover" class="input" placeholder="请输入流水" maxlength="50">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">地址：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['address']}" name="address" id="address" class="input" placeholder="请输入地址">
+                                    <input type="text" value="{$data['address']}" name="address" id="address" class="input" placeholder="请输入地址" maxlength="100">
                                 </td>
                             </tr>
                             <tr>
                                 <td class="l">联盟信息：</td>
                                 <td class="r table_radio">
-                                    <input type="text" value="{$data['league_info']}" name="league_info" id="league_info" class="input" placeholder="请输入联盟信息">
+                                    <input type="text" value="{$data['league_info']}" name="league_info" id="league_info" class="input" placeholder="请输入联盟信息" maxlength="50">
                                 </td>
                             </tr>
 
@@ -157,7 +157,7 @@
                             <tr>
                                 <td class="l">备注信息：</td>
                                 <td class="r">
-                                    <textarea name="remark" class="txt" placeholder="请输入备注信息">{$data['remark']}</textarea>
+                                    <textarea name="remark" class="txt" placeholder="请输入备注信息" maxlength="100">{$data['remark']}</textarea>
                                 </td>
                             </tr>
 
diff --git a/Application/Admin/View/SocietyInfo/lists.html b/Application/Admin/View/SocietyInfo/lists.html
index c17761be1..86f56fdb8 100644
--- a/Application/Admin/View/SocietyInfo/lists.html
+++ b/Application/Admin/View/SocietyInfo/lists.html
@@ -286,9 +286,27 @@
     $(".select_gallery").select2();
 </script>
 <script type="text/javascript">
+    function mapInit() {
+        var province = "{:I('get.province')}";
+        var city = "{:I('get.city')}";
+
+        $("#province option").each(function() {
+            if ($(this).text() == province) {
+                $(this).attr("selected", "selected");
+            }
+        });
+        $("#city option").each(function() {
+            if ($(this).text() == city) {
+                $(this).attr("selected", "selected");
+            }
+        });
+    }
+
     $(function() {
         areaInit();
-        provinceChange()
+        mapInit();
+        provinceChange();
+        mapInit();
     });
     //导航高亮
     highlight_subnav("{:U('lists')}");

From 5775e7f02eb12164e3cc051ec20f2c7b6d5ce892 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Wed, 30 Dec 2020 19:54:11 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/SocietyInfoController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index d62f41bd5..df90c804e 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -401,7 +401,7 @@ class SocietyInfoController extends ThinkController
             $inserts[$k-2]['province'] = $v['A'] ?? '';
             $inserts[$k-2]['city'] = $v['B'] ?? '';
             $inserts[$k-2]['company_name'] = $v['C'] ?? '';
-            if (strlen($inserts[$k-2]['company_name']) > 100) {
+            if (mb_strlen($inserts[$k-2]['company_name'], "utf-8") > 100) {
                 $this->error("公司名太长".$k);
             }
             if (!$inserts[$k-2]['company_name']) {
@@ -445,7 +445,7 @@ class SocietyInfoController extends ThinkController
                 $this->error("流水太长".$k);
             }
             $inserts[$k-2]['address'] = $v['N'] ?? '';
-            if (strlen($inserts[$k-2]['address']) > 100) {
+            if (mb_strlen($inserts[$k-2]['address'], 'utf-8') > 100) {
                 $this->error("地址太长".$k);
             }
             $inserts[$k-2]['league_info'] = $v['O'] ?? '';

From 8897a87342eebf54230106da1a863188cd4d3153 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Mon, 4 Jan 2021 15:10:07 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E7=94=B2=E4=B9=99=E6=96=B9=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PartnerController.class.php     |  7 ++++++-
 .../Controller/PromoteCompanyController.class.php    | 11 ++++++++---
 Application/Admin/View/Partner/edit.html             | 12 ++++++------
 Application/Admin/View/Partner/show.html             | 12 ++++++------
 Application/Admin/View/PromoteCompany/edit.html      | 12 ++++++------
 Application/Admin/View/PromoteCompany/view.html      | 12 ++++++------
 6 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 6866af2b7..b09301e63 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -473,7 +473,12 @@ class PartnerController extends ThinkController
         if ($_POST) {
             $save = I("post.");
             $this->checkData($save);
-            $save['relation']['collaborate_way'] = $save['part_a_type'];
+            if ($save['part_a_type'] == 1) {  // 1己方公司的时候 合作类型是2
+                $save['relation']['collaborate_way'] = 2;
+            }
+            if ($save['part_a_type'] == 2) {  // 2下游推广公司的时候 合作类型是1
+                $save['relation']['collaborate_way'] = 1;
+            }
             if ($save['part_a_type'] == 1) {
                 $save['relation']['self_company_id'] = $save['part_a'];
             }
diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index 87bb0b6ae..0ab31c840 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -732,11 +732,16 @@ class PromoteCompanyController extends ThinkController
         if ($_POST) {
             $save = I('post.');//前端已经验证
 
-            $save['relation']['collaborate_way'] = $save['part_a_type'];
-            if ($save['part_a_type'] == 1) {
+            if ($save['part_a_type'] == 1) {  // 1己方公司的时候 合作类型是2
+                $save['relation']['collaborate_way'] = 2;
+            }
+            if ($save['part_a_type'] == 2) {  // 2下游推广公司的时候 合作类型是1
+                $save['relation']['collaborate_way'] = 1;
+            }
+            if ($save['part_a_type'] == 1) { // 1己方公司的时候
                 $save['relation']['self_company_id'] = $save['part_a'];
             }
-            if ($save['part_a_type'] == 2) {
+            if ($save['part_a_type'] == 2) { // 2下游推广公司的时候
                 $save['relation']['self_company_id'] = $save['part_b'];
             }
 
diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html
index aba96572e..cc36739df 100644
--- a/Application/Admin/View/Partner/edit.html
+++ b/Application/Admin/View/Partner/edit.html
@@ -152,16 +152,16 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
                                 <td class="l" style="width: 50px;">
                                     <select name="part_a_type" id="part_a_type" class="select_gallery">
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
-                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
                                 <td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
                                 <td class="r">
                                     <select name="part_b_type" id="part_b_type" class="select_gallery">
-                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -179,7 +179,7 @@
                                   <span class="notice-text"></span>
                                 </td>
                             </tr>-->
-                            <?php if($relation['collaborate_way'] == 1):?>
+                            <?php if($relation['collaborate_way'] == 2):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="l" style="width: 50px;">
@@ -200,7 +200,7 @@
                                 </td>
                             </tr>
                             <?php endif;?>
-                            <?php if($relation['collaborate_way'] == 2):?>
+                            <?php if($relation['collaborate_way'] == 1):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="l" style="width: 50px;">
diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html
index 5e6445583..df69e3536 100644
--- a/Application/Admin/View/Partner/show.html
+++ b/Application/Admin/View/Partner/show.html
@@ -149,16 +149,16 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
                                 <td class="l" style="width: 50px;">
                                     <select name="part_a_type" id="part_a_type" class="select_gallery" disabled>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
-                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
                                 <td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
                                 <td class="r">
                                     <select name="part_b_type" id="part_b_type" class="select_gallery" disabled>
-                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -176,7 +176,7 @@
                                   <span class="notice-text"></span>
                                 </td>
                             </tr>-->
-                            <?php if($relation['collaborate_way'] == 1):?>
+                            <?php if($relation['collaborate_way'] == 2):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="l" style="width: 50px;">
@@ -196,7 +196,7 @@
                                 </td>
                             </tr>
                             <?php endif;?>
-                            <?php if($relation['collaborate_way'] == 2):?>
+                            <?php if($relation['collaborate_way'] == 1):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="l" style="width: 50px;">
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index d98f280f8..b11946ec2 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -500,16 +500,16 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
                                 <td class="r" style="width: 50px;">
                                     <select name="part_a_type" id="part_a_type" class="select_gallery">
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
-                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
                                 <td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
                                 <td class="r">
                                     <select name="part_b_type" id="part_b_type" class="select_gallery" >
-                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -528,7 +528,7 @@
                                 </td>
                             </tr>-->
 
-                            <?php if($relation['collaborate_way'] == 1):?>
+                            <?php if($relation['collaborate_way'] == 2):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="r" style="width: 50px;">
@@ -549,7 +549,7 @@
                             </tr>
                             <?php endif;?>
 
-                            <?php if($relation['collaborate_way'] == 2):?>
+                            <?php if($relation['collaborate_way'] == 1):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="r" style="width: 50px;">
diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html
index 3dc1981c7..cb02e93d1 100644
--- a/Application/Admin/View/PromoteCompany/view.html
+++ b/Application/Admin/View/PromoteCompany/view.html
@@ -486,16 +486,16 @@
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
                                 <td class="r" style="width: 50px;">
                                     <select name="part_a_type" id="part_a_type" class="select_gallery" disabled>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
-                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
                                 <td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
                                 <td class="r">
                                     <select name="part_b_type" id="part_b_type" class="select_gallery" disabled>
-                                        <option  value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
-                                        <option  value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
+                                        <option  value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
+                                        <option  value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
                                     </select>
                                     <span class="notice-text"></span>
                                 </td>
@@ -513,7 +513,7 @@
                                   <span class="notice-text"></span>
                                 </td>
                             </tr>-->
-                            <?php if($relation['collaborate_way'] == 1):?>
+                            <?php if($relation['collaborate_way'] == 2):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="r" style="width: 50px;">
@@ -533,7 +533,7 @@
                                 </td>
                             </tr>
                             <?php endif;?>
-                            <?php if($relation['collaborate_way'] == 2):?>
+                            <?php if($relation['collaborate_way'] == 1):?>
                             <tr>
                                 <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
                                 <td class="r" style="width: 50px;">

From a641ff2526653289ff6d2e8dfc413ab048fa6b58 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 4 Jan 2021 15:17:53 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PartnerController.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 6866af2b7..bec2b786f 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -280,6 +280,8 @@ class PartnerController extends ThinkController
 //        $count = $model
 //            ->where($map)
 //            ->count();
+        $arraypage = $page;
+
         //分页
         $parameter['p'] = $page;
         $parameter['row'] = $row;
@@ -288,7 +290,7 @@ class PartnerController extends ThinkController
             $this->assign('_page', $page);
         }
 
-        $arraypage = $page;
+//        $arraypage = $page;
         $size = $row;//每页显示的记录数
         $parseData = array_slice($parseData, ($arraypage - 1) * $size, $size);
 //        $page = set_pagination($count, $row, $parameter);