@@ -44,6 +44,22 @@
{{/foreach}}
+
diff --git a/application/admin/view/default/apphomenav/index.html b/application/admin/view/default/apphomenav/index.html
index 0f335db06..058d2e7c5 100755
--- a/application/admin/view/default/apphomenav/index.html
+++ b/application/admin/view/default/apphomenav/index.html
@@ -35,6 +35,17 @@
{{/foreach}}
+
diff --git a/application/admin/view/default/article/index.html b/application/admin/view/default/article/index.html
index 1e0252049..9c3dfe9a0 100755
--- a/application/admin/view/default/article/index.html
+++ b/application/admin/view/default/article/index.html
@@ -55,7 +55,13 @@
{{/foreach}}
-
- |
清除条件
@@ -89,7 +97,7 @@
标题 |
- 状态 |
+ 启用 |
是否含头部 |
是否含尾部 |
是否满屏 |
diff --git a/application/admin/view/default/message/index.html b/application/admin/view/default/message/index.html
index 28fc6c88f..75af7b658 100755
--- a/application/admin/view/default/message/index.html
+++ b/application/admin/view/default/message/index.html
@@ -55,7 +55,18 @@
{{/foreach}}
-
+ |
+ 删除:
+
+ |
+
+
+
时间:
@@ -65,9 +76,6 @@
|
-
-
- |
清除条件
@@ -87,6 +95,7 @@
| 标题 |
内容 |
是否已读 |
+ 用户删除 |
发送时间 |
操作 |
@@ -120,6 +129,9 @@
{{if empty($v['is_read_name'])}}未设置{{else /}}{{$v.is_read_name}}{{/if}}
|
+
+ {{if empty($v['user_is_delete_time_name'])}}未设置{{else /}}{{$v.user_is_delete_time_name}}{{/if}}
+ |
{{if empty($v['add_time_time'])}}未设置{{else /}}{{$v.add_time_time}}{{/if}}
|
diff --git a/application/admin/view/default/paylog/index.html b/application/admin/view/default/paylog/index.html
index 7896a44be..8b8956690 100755
--- a/application/admin/view/default/paylog/index.html
+++ b/application/admin/view/default/paylog/index.html
@@ -57,7 +57,19 @@
{{/foreach}}
-
+ |
+ 金额:
+
+
+
+ ~
+
+
+
+ |
+
+
+
时间:
@@ -67,9 +79,6 @@
|
-
-
- |
清除条件
diff --git a/application/admin/view/default/payment/index.html b/application/admin/view/default/payment/index.html
index 9e674ddd3..e3b99e41b 100755
--- a/application/admin/view/default/payment/index.html
+++ b/application/admin/view/default/payment/index.html
@@ -19,8 +19,8 @@
| 适用终端 |
作者 |
描述 |
- 是否启用 |
- 对用户放开 |
+ 启用 |
+ 用户放开 |
操作 |
diff --git a/application/service/AdminService.php b/application/service/AdminService.php
index 7de5fc901..c2f4fbdbb 100755
--- a/application/service/AdminService.php
+++ b/application/service/AdminService.php
@@ -63,18 +63,33 @@ class AdminService
$where = [];
if(!empty($params['keywords']))
{
- $where[] = ['username', 'like', '%'.$params['keywords'].'%'];
- }
- if(isset($params['role_id']) && $params['role_id'] > -1)
- {
- $where[] = ['role_id', '=', intval($params['role_id'])];
+ $where[] = ['username|mobile', 'like', '%'.$params['keywords'].'%'];
}
- // 等值
- if(isset($params['gender']) && $params['gender'] > -1)
+ // 是否更多条件
+ if(isset($params['is_more']) && $params['is_more'] == 1)
{
- $where[] = ['gender', '=', intval($params['gender'])];
+ if(isset($params['role_id']) && $params['role_id'] > -1)
+ {
+ $where[] = ['role_id', '=', intval($params['role_id'])];
+ }
+
+ // 等值
+ if(isset($params['gender']) && $params['gender'] > -1)
+ {
+ $where[] = ['gender', '=', intval($params['gender'])];
+ }
+
+ if(!empty($params['time_start']))
+ {
+ $where[] = ['add_time', '>', strtotime($params['time_start'])];
+ }
+ if(!empty($params['time_end']))
+ {
+ $where[] = ['add_time', '<', strtotime($params['time_end'])];
+ }
}
+
return $where;
}
diff --git a/application/service/AppNavService.php b/application/service/AppNavService.php
index 1f8d49aaa..401d0a2ed 100755
--- a/application/service/AppNavService.php
+++ b/application/service/AppNavService.php
@@ -133,8 +133,13 @@ class AppNavService
// 等值
if(isset($params['is_enable']) && $params['is_enable'] > -1)
{
+
$where[] = ['is_enable', '=', intval($params['is_enable'])];
}
+ if(isset($params['is_need_login']) && $params['is_need_login'] > -1)
+ {
+ $where[] = ['is_need_login', '=', intval($params['is_need_login'])];
+ }
if(isset($params['event_type']) && $params['event_type'] > -1)
{
$where[] = ['event_type', '=', intval($params['event_type'])];
diff --git a/application/service/ArticleService.php b/application/service/ArticleService.php
index da93102c5..15b138c72 100755
--- a/application/service/ArticleService.php
+++ b/application/service/ArticleService.php
@@ -126,6 +126,10 @@ class ArticleService
{
$where[] = ['a.is_home_recommended', '=', intval($params['is_home_recommended'])];
}
+ if(isset($params['access_count']) && $params['access_count'] > -1)
+ {
+ $where[] = ['a.access_count', '>', intval($params['access_count'])];
+ }
if(!empty($params['time_start']))
{
diff --git a/application/service/CustomViewService.php b/application/service/CustomViewService.php
index df8f33598..dcb8ef8ba 100755
--- a/application/service/CustomViewService.php
+++ b/application/service/CustomViewService.php
@@ -118,6 +118,10 @@ class CustomViewService
{
$where[] = ['is_enable', '=', intval($params['is_enable'])];
}
+ if(isset($params['is_full_screen']) && $params['is_full_screen'] > -1)
+ {
+ $where[] = ['is_full_screen', '=', intval($params['is_full_screen'])];
+ }
if(isset($params['is_header']) && $params['is_header'] > -1)
{
$where[] = ['is_header', '=', intval($params['is_header'])];
diff --git a/application/service/MessageService.php b/application/service/MessageService.php
index e87a13585..5fc9c9a29 100755
--- a/application/service/MessageService.php
+++ b/application/service/MessageService.php
@@ -265,6 +265,9 @@ class MessageService
// 业务类型
$v['business_type_name'] = $common_business_type_list[$v['business_type']]['name'];
+ // 用户是否已删除
+ $v['user_is_delete_time_name'] = ($v['user_is_delete_time'] == 0) ? '否' : '是';
+
// 性别
$v['gender_text'] = $common_gender_list[$v['gender']]['name'];
@@ -331,6 +334,15 @@ class MessageService
{
$where[] = ['u.gender', '=', intval($params['gender'])];
}
+ if(isset($params['user_is_delete_time']) && $params['user_is_delete_time'] > -1)
+ {
+ if(intval($params['user_is_delete_time']) == 0)
+ {
+ $where[] = ['m.user_is_delete_time', '=', 0];
+ } else {
+ $where[] = ['m.user_is_delete_time', '>', 0];
+ }
+ }
if(!empty($params['time_start']))
{
diff --git a/application/service/PayLogService.php b/application/service/PayLogService.php
index 8a0cc9fad..534d58c5d 100755
--- a/application/service/PayLogService.php
+++ b/application/service/PayLogService.php
@@ -161,6 +161,15 @@ class PayLogService
$where[] = ['u.gender', '=', intval($params['gender'])];
}
+ if(!empty($params['price_start']))
+ {
+ $where[] = ['p.pay_price', '>', PriceNumberFormat($params['price_start'])];
+ }
+ if(!empty($params['price_end']))
+ {
+ $where[] = ['p.pay_price', '<', PriceNumberFormat($params['price_end'])];
+ }
+
if(!empty($params['time_start']))
{
$where[] = ['p.add_time', '>', strtotime($params['time_start'])];
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index f63efbd97..f3d3215f4 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -317,7 +317,7 @@ button.colorpicker-submit img {
.form-search .so-list select { padding: 0 0 0 8px; }
.form-search .more-submit input { display: none; }
@media only screen and (min-width: 641px) {
- .form-search .so-list .chosen-container, .form-search .so-list select { width:217px !important; display: -webkit-inline-box; }
+ .form-search .so-list .chosen-container, .form-search .so-list select, .form-search .input input { width:217px !important; display: -webkit-inline-box; }
.form-search .thin_sub:hover { color:#F60; }
}
@media only screen and (max-width: 641px) {
@@ -326,5 +326,5 @@ button.colorpicker-submit img {
.form-search .so-list tr td:last-child { margin-top:10px; }
.form-search .so-list tr td:last-child { padding-top:0px !important; }
.form-search .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
- .form-search .so-list select, .form-search .so-list .chosen-container { width: calc(100% - 44px) !important; display: -webkit-inline-box; }
+ .form-search .so-list select, .form-search .so-list .chosen-container, .form-search .input input { width: calc(100% - 44px) !important; display: -webkit-inline-box; }
}
\ No newline at end of file
diff --git a/public/static/plugins/css/wallet/admin/common.css b/public/static/plugins/css/wallet/admin/common.css
index 9d1650c31..68f8a191d 100644
--- a/public/static/plugins/css/wallet/admin/common.css
+++ b/public/static/plugins/css/wallet/admin/common.css
@@ -1,21 +1,3 @@
-/**
- * 搜索表单
- */
-.form-search .form-keyword { display: initial !important; }
-.form-search .more-submit input { display: none; }
-.form-search .param-date input { display: initial !important; }
-@media only screen and (max-width: 641px) {
- .form-search .form-keyword { width: calc(100% - 140px) !important; }
- .form-search .param-where { width: 100% !important; margin-left: 0px !important; }
- .form-search .param-date input { width: 47% !important; }
-}
-@media only screen and (min-width: 641px) {
- .form-search .form-keyword { width: 35% !important; }
- .form-search .param-where { width: 32% !important; float: left; }
- .form-search .param-date input { width: 45% !important; }
- .form-search .param-where:nth-child(1), .param-where:nth-child(4) { margin-left: 0px !important; }
-}
-
/**
* 用户信息
*/
--
GitLab
|