diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index c25609290..df90c804e 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 (mb_strlen($inserts[$k-2]['company_name'], "utf-8") > 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 (mb_strlen($inserts[$k-2]['address'], 'utf-8') > 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 @@
| *公司： |
-
+
|
| 注册资本： |
-
+
|
| 负责人： |
-
+
|
| 电话： |
-
+
|
| 微信： |
-
+
|
| QQ： |
-
+
|
| 游戏类型： |
-
-
+ |
+
+ {$vo['type_name']}:
+
|
-
| 所做游戏： |
-
+
|
| 合作平台： |
-
+
|
| 推广规模： |
-
+
|
| 流水： |
-
+
|
| 地址： |
-
+
|
| 联盟信息： |
-
+
|
@@ -140,10 +135,10 @@
@@ -153,7 +148,7 @@
|
| 备注信息： |
-
+
|
@@ -166,7 +161,7 @@
| 对接人： |
-
+
|
@@ -176,7 +171,7 @@
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 @@
| 公司： |
-
+
|
| 注册资本： |
-
+
|
| 负责人： |
-
+
|
| 电话： |
-
+
|
| 微信： |
-
+
|
| QQ： |
-
+
|
@@ -105,37 +105,37 @@
| 所做游戏： |
-
+
|
| 合作平台： |
-
+
|
| 推广规模： |
-
+
|
| 流水： |
-
+
|
| 地址： |
-
+
|
| 联盟信息： |
-
+
|
@@ -157,7 +157,7 @@
| 备注信息： |
-
+
|
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();