Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jamesyang1999
ShopXO
提交
2e54aa4c
ShopXO
项目概览
jamesyang1999
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2e54aa4c
编写于
5月 11, 2019
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
搜索条件细节优化
上级
20a68bfb
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
151 addition
and
58 deletion
+151
-58
application/admin/controller/Apphomenav.php
application/admin/controller/Apphomenav.php
+3
-0
application/admin/controller/Message.php
application/admin/controller/Message.php
+3
-0
application/admin/view/default/admin/index.html
application/admin/view/default/admin/index.html
+17
-1
application/admin/view/default/apphomenav/index.html
application/admin/view/default/apphomenav/index.html
+15
-7
application/admin/view/default/article/index.html
application/admin/view/default/article/index.html
+9
-6
application/admin/view/default/customview/index.html
application/admin/view/default/customview/index.html
+14
-6
application/admin/view/default/message/index.html
application/admin/view/default/message/index.html
+16
-4
application/admin/view/default/paylog/index.html
application/admin/view/default/paylog/index.html
+13
-4
application/admin/view/default/payment/index.html
application/admin/view/default/payment/index.html
+2
-2
application/service/AdminService.php
application/service/AdminService.php
+23
-8
application/service/AppNavService.php
application/service/AppNavService.php
+5
-0
application/service/ArticleService.php
application/service/ArticleService.php
+4
-0
application/service/CustomViewService.php
application/service/CustomViewService.php
+4
-0
application/service/MessageService.php
application/service/MessageService.php
+12
-0
application/service/PayLogService.php
application/service/PayLogService.php
+9
-0
public/static/common/css/common.css
public/static/common/css/common.css
+2
-2
public/static/plugins/css/wallet/admin/common.css
public/static/plugins/css/wallet/admin/common.css
+0
-18
未找到文件。
application/admin/controller/Apphomenav.php
浏览文件 @
2e54aa4c
...
@@ -85,6 +85,9 @@ class AppHomeNav extends Common
...
@@ -85,6 +85,9 @@ class AppHomeNav extends Common
// 是否启用
// 是否启用
$this
->
assign
(
'common_is_enable_list'
,
lang
(
'common_is_enable_list'
));
$this
->
assign
(
'common_is_enable_list'
,
lang
(
'common_is_enable_list'
));
// 是否
$this
->
assign
(
'common_is_text_list'
,
lang
(
'common_is_text_list'
));
// 所属平台
// 所属平台
$this
->
assign
(
'common_platform_type'
,
lang
(
'common_platform_type'
));
$this
->
assign
(
'common_platform_type'
,
lang
(
'common_platform_type'
));
...
...
application/admin/controller/Message.php
浏览文件 @
2e54aa4c
...
@@ -92,6 +92,9 @@ class Message extends Common
...
@@ -92,6 +92,9 @@ class Message extends Common
// 是否已读
// 是否已读
$this
->
assign
(
'common_is_read_list'
,
lang
(
'common_is_read_list'
));
$this
->
assign
(
'common_is_read_list'
,
lang
(
'common_is_read_list'
));
// 是否
$this
->
assign
(
'common_is_text_list'
,
lang
(
'common_is_text_list'
));
// 参数
// 参数
$this
->
assign
(
'params'
,
$params
);
$this
->
assign
(
'params'
,
$params
);
return
$this
->
fetch
();
return
$this
->
fetch
();
...
...
application/admin/view/default/admin/index.html
浏览文件 @
2e54aa4c
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<form
class=
"am-form form-validation form-search"
method=
"post"
action=
"{{:MyUrl('admin/admin/index')}}"
request-type=
"form"
>
<form
class=
"am-form form-validation form-search"
method=
"post"
action=
"{{:MyUrl('admin/admin/index')}}"
request-type=
"form"
>
<div
class=
"thin"
>
<div
class=
"thin"
>
<div
class=
"am-input-group am-input-group-sm am-fl so"
>
<div
class=
"am-input-group am-input-group-sm am-fl so"
>
<input
type=
"text"
autocomplete=
"off"
name=
"keywords"
class=
"am-radius"
placeholder=
"用户名"
value=
"{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}"
/>
<input
type=
"text"
autocomplete=
"off"
name=
"keywords"
class=
"am-radius"
placeholder=
"用户名
/手机
"
value=
"{{if !empty($params.keywords)}}{{$params.keywords}}{{/if}}"
/>
<span
class=
"am-input-group-btn"
>
<span
class=
"am-input-group-btn"
>
<button
class=
"am-btn am-btn-default am-radius"
type=
"submit"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<button
class=
"am-btn am-btn-default am-radius"
type=
"submit"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
</span>
</span>
...
@@ -44,6 +44,22 @@
...
@@ -44,6 +44,22 @@
{{/foreach}}
{{/foreach}}
</select>
</select>
</td>
</td>
<tr>
<td
class=
"time"
>
<span>
时间:
</span>
<span>
<input
type=
"text"
autocomplete=
"off"
name=
"time_start"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"起始时间"
value=
"{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
</span>
<em
class=
"text-grey"
>
~
</em>
<span>
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
</span>
</td>
<td>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<a
href=
"{{:MyUrl('admin/admin/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
</td>
</tr>
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
...
...
application/admin/view/default/apphomenav/index.html
浏览文件 @
2e54aa4c
...
@@ -35,6 +35,17 @@
...
@@ -35,6 +35,17 @@
{{/foreach}}
{{/foreach}}
</select>
</select>
</td>
</td>
<td>
<span>
登录:
</span>
<select
name=
"is_need_login"
class=
"chosen-select"
data-placeholder=
"是否需要登录..."
>
<option
value=
"-1"
>
是否需要登录...
</option>
{{foreach $common_is_text_list as $v}}
<option
value=
"{{$v.id}}"
{{
if
isset
($
params
['
is_need_login
'])
and
$
params
['
is_need_login
']
eq
$
v
['
id
']}}
selected
{{/
if
}}
>
{{$v.name}}
</option>
{{/foreach}}
</select>
</td>
</tr>
<tr>
<td>
<td>
<span>
平台:
</span>
<span>
平台:
</span>
<select
name=
"platform"
class=
"chosen-select"
data-placeholder=
"所属平台..."
>
<select
name=
"platform"
class=
"chosen-select"
data-placeholder=
"所属平台..."
>
...
@@ -46,8 +57,6 @@
...
@@ -46,8 +57,6 @@
{{/foreach}}
{{/foreach}}
</select>
</select>
</td>
</td>
</tr>
<tr>
<td>
<td>
<span>
类型:
</span>
<span>
类型:
</span>
<select
name=
"event_type"
class=
"chosen-select"
data-placeholder=
"事件类型..."
>
<select
name=
"event_type"
class=
"chosen-select"
data-placeholder=
"事件类型..."
>
...
@@ -57,6 +66,8 @@
...
@@ -57,6 +66,8 @@
{{/foreach}}
{{/foreach}}
</select>
</select>
</td>
</td>
</tr>
<tr>
<td
class=
"time"
>
<td
class=
"time"
>
<span>
时间:
</span>
<span>
时间:
</span>
<span>
<span>
...
@@ -67,9 +78,6 @@
...
@@ -67,9 +78,6 @@
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
</span>
</span>
</td>
</td>
</tr>
<tr>
<td></td>
<td>
<td>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<a
href=
"{{:MyUrl('admin/apphomenav/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
<a
href=
"{{:MyUrl('admin/apphomenav/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
...
@@ -94,8 +102,8 @@
...
@@ -94,8 +102,8 @@
<th>
所属平台
</th>
<th>
所属平台
</th>
<th>
导航图标
</th>
<th>
导航图标
</th>
<th>
事件值
</th>
<th>
事件值
</th>
<th>
是否需要
登录
</th>
<th>
登录
</th>
<th>
是否
启用
</th>
<th>
启用
</th>
<th>
创建时间
</th>
<th>
创建时间
</th>
<th>
操作
</th>
<th>
操作
</th>
</tr>
</tr>
...
...
application/admin/view/default/article/index.html
浏览文件 @
2e54aa4c
...
@@ -55,7 +55,13 @@
...
@@ -55,7 +55,13 @@
{{/foreach}}
{{/foreach}}
</select>
</select>
</td>
</td>
<td
class=
"time"
>
<td
class=
"input"
>
<span>
热度:
</span>
<input
type=
"number"
name=
"access_count"
class=
"am-form-field am-input-sm am-radius"
placeholder=
"浏览热度"
value=
"{{if !empty($params.access_count)}}{{$params.access_count}}{{/if}}"
data-validation-message=
"热度有误"
/>
</td>
</tr>
<tr>
<td
class=
"time"
>
<span>
时间:
</span>
<span>
时间:
</span>
<span>
<span>
<input
type=
"text"
autocomplete=
"off"
name=
"time_start"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"起始时间"
value=
"{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
<input
type=
"text"
autocomplete=
"off"
name=
"time_start"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"起始时间"
value=
"{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
...
@@ -65,9 +71,6 @@
...
@@ -65,9 +71,6 @@
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
</span>
</span>
</td>
</td>
</tr>
<tr>
<td></td>
<td>
<td>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<a
href=
"{{:MyUrl('admin/article/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
<a
href=
"{{:MyUrl('admin/article/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
...
@@ -90,8 +93,8 @@
...
@@ -90,8 +93,8 @@
<tr>
<tr>
<th>
标题
</th>
<th>
标题
</th>
<th
class=
"am-hide-sm-only"
>
文章分类
</th>
<th
class=
"am-hide-sm-only"
>
文章分类
</th>
<th
class=
"am-hide-sm-only"
>
访问
次数
</th>
<th
class=
"am-hide-sm-only"
>
访问
热度
</th>
<th>
状态
</th>
<th>
启用
</th>
<th>
首页推荐
</th>
<th>
首页推荐
</th>
<th>
更多
</th>
<th>
更多
</th>
<th>
操作
</th>
<th>
操作
</th>
...
...
application/admin/view/default/customview/index.html
浏览文件 @
2e54aa4c
...
@@ -55,8 +55,19 @@
...
@@ -55,8 +55,19 @@
{{/foreach}}
{{/foreach}}
</select>
</select>
</td>
</td>
<td
class=
"time"
>
<td>
<span>
时间:
</span>
<span>
满屏:
</span>
<select
name=
"is_full_screen"
class=
"chosen-select"
data-placeholder=
"是否满屏..."
>
<option
value=
"-1"
>
是否满屏...
</option>
{{foreach $common_is_full_screen_list as $v}}
<option
value=
"{{$v.id}}"
{{
if
isset
($
params
['
is_full_screen
'])
and
$
params
['
is_full_screen
']
eq
$
v
['
id
']}}
selected
{{/
if
}}
>
{{$v.name}}
</option>
{{/foreach}}
</select>
</td>
</tr>
<tr>
<td
class=
"time"
>
<span>
时间:
</span>
<span>
<span>
<input
type=
"text"
autocomplete=
"off"
name=
"time_start"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"起始时间"
value=
"{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
<input
type=
"text"
autocomplete=
"off"
name=
"time_start"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"起始时间"
value=
"{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
</span>
</span>
...
@@ -65,9 +76,6 @@
...
@@ -65,9 +76,6 @@
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
</span>
</span>
</td>
</td>
</tr>
<tr>
<td></td>
<td>
<td>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<a
href=
"{{:MyUrl('admin/customview/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
<a
href=
"{{:MyUrl('admin/customview/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
...
@@ -89,7 +97,7 @@
...
@@ -89,7 +97,7 @@
<thead>
<thead>
<tr>
<tr>
<th>
标题
</th>
<th>
标题
</th>
<th>
状态
</th>
<th>
启用
</th>
<th
class=
"am-hide-sm-only"
>
是否含头部
</th>
<th
class=
"am-hide-sm-only"
>
是否含头部
</th>
<th
class=
"am-hide-sm-only"
>
是否含尾部
</th>
<th
class=
"am-hide-sm-only"
>
是否含尾部
</th>
<th
class=
"am-hide-sm-only"
>
是否满屏
</th>
<th
class=
"am-hide-sm-only"
>
是否满屏
</th>
...
...
application/admin/view/default/message/index.html
浏览文件 @
2e54aa4c
...
@@ -55,7 +55,18 @@
...
@@ -55,7 +55,18 @@
{{/foreach}}
{{/foreach}}
</select>
</select>
</td>
</td>
<td
class=
"time"
>
<td>
<span>
删除:
</span>
<select
name=
"user_is_delete_time"
class=
"chosen-select"
data-placeholder=
"用户是否删除..."
>
<option
value=
"-1"
>
用户是否删除...
</option>
{{foreach $common_is_text_list as $v}}
<option
value=
"{{$v.id}}"
{{
if
isset
($
params
['
user_is_delete_time
'])
and
$
params
['
user_is_delete_time
']
eq
$
v
['
id
']}}
selected
{{/
if
}}
>
{{$v.name}}
</option>
{{/foreach}}
</select>
</td>
</tr>
<tr>
<td
class=
"time"
>
<span>
时间:
</span>
<span>
时间:
</span>
<span>
<span>
<input
type=
"text"
autocomplete=
"off"
name=
"time_start"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"起始时间"
value=
"{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
<input
type=
"text"
autocomplete=
"off"
name=
"time_start"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"起始时间"
value=
"{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
...
@@ -65,9 +76,6 @@
...
@@ -65,9 +76,6 @@
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
</span>
</span>
</td>
</td>
</tr>
<tr>
<td></td>
<td>
<td>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<a
href=
"{{:MyUrl('admin/message/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
<a
href=
"{{:MyUrl('admin/message/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
...
@@ -87,6 +95,7 @@
...
@@ -87,6 +95,7 @@
<th>
标题
</th>
<th>
标题
</th>
<th
class=
"am-hide-sm-only"
>
内容
</th>
<th
class=
"am-hide-sm-only"
>
内容
</th>
<th
class=
"am-hide-sm-only"
>
是否已读
</th>
<th
class=
"am-hide-sm-only"
>
是否已读
</th>
<th
class=
"am-hide-sm-only"
>
用户删除
</th>
<th
class=
"am-hide-sm-only"
>
发送时间
</th>
<th
class=
"am-hide-sm-only"
>
发送时间
</th>
<th>
操作
</th>
<th>
操作
</th>
</tr>
</tr>
...
@@ -120,6 +129,9 @@
...
@@ -120,6 +129,9 @@
<td
class=
"am-hide-sm-only"
>
<td
class=
"am-hide-sm-only"
>
{{if empty($v['is_read_name'])}}
<span
class=
"cr-ddd"
>
未设置
</span>
{{else /}}{{$v.is_read_name}}{{/if}}
{{if empty($v['is_read_name'])}}
<span
class=
"cr-ddd"
>
未设置
</span>
{{else /}}{{$v.is_read_name}}{{/if}}
</td>
</td>
<td
class=
"am-hide-sm-only"
>
{{if empty($v['user_is_delete_time_name'])}}
<span
class=
"cr-ddd"
>
未设置
</span>
{{else /}}{{$v.user_is_delete_time_name}}{{/if}}
</td>
<td
class=
"am-hide-sm-only"
>
<td
class=
"am-hide-sm-only"
>
{{if empty($v['add_time_time'])}}
<span
class=
"cr-ddd"
>
未设置
</span>
{{else /}}{{$v.add_time_time}}{{/if}}
{{if empty($v['add_time_time'])}}
<span
class=
"cr-ddd"
>
未设置
</span>
{{else /}}{{$v.add_time_time}}{{/if}}
</td>
</td>
...
...
application/admin/view/default/paylog/index.html
浏览文件 @
2e54aa4c
...
@@ -57,7 +57,19 @@
...
@@ -57,7 +57,19 @@
{{/foreach}}
{{/foreach}}
</select>
</select>
</td>
</td>
<td
class=
"time"
>
<td
class=
"price"
>
<span>
金额:
</span>
<span>
<input
type=
"text"
autocomplete=
"off"
name=
"price_start"
class=
"am-form-field am-input-sm am-radius"
placeholder=
"最低支付金额"
value=
"{{if !empty($params.price_start)}}{{$params.price_start}}{{/if}}"
data-validation-message=
"支付金额格式有误"
autocomplete=
"off"
/>
</span>
<em
class=
"text-grey"
>
~
</em>
<span>
<input
type=
"text"
autocomplete=
"off"
name=
"price_end"
class=
"am-form-field am-input-sm am-radius"
placeholder=
"最高支付金额"
value=
"{{if !empty($params.price_end)}}{{$params.price_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"支付金额格式有误"
autocomplete=
"off"
/>
</span>
</td>
</tr>
<tr>
<td
class=
"time"
>
<span>
时间:
</span>
<span>
时间:
</span>
<span>
<span>
<input
type=
"text"
autocomplete=
"off"
name=
"time_start"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"起始时间"
value=
"{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
<input
type=
"text"
autocomplete=
"off"
name=
"time_start"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"起始时间"
value=
"{{if !empty($params.time_start)}}{{$params.time_start}}{{/if}}"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
...
@@ -67,9 +79,6 @@
...
@@ -67,9 +79,6 @@
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
<input
type=
"text"
autocomplete=
"off"
name=
"time_end"
class=
"am-form-field am-input-sm am-radius Wdate"
placeholder=
"结束时间"
value=
"{{if !empty($params.time_end)}}{{$params.time_end}}{{/if}}"
pattern=
"^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
data-validation-message=
"日期格式有误"
onclick=
"WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})"
autocomplete=
"off"
/><i
class=
"am-icon-calendar"
></i>
</span>
</span>
</td>
</td>
</tr>
<tr>
<td></td>
<td>
<td>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius am-btn-xs btn-loading-example"
data-am-loading=
"{spinner:'circle-o-notch', loadingText:'搜索中...'}"
>
搜索
</button>
<a
href=
"{{:MyUrl('admin/paylog/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
<a
href=
"{{:MyUrl('admin/paylog/index')}}"
class=
"am-btn am-btn-warning am-radius am-btn-sm reset-submit"
>
清除条件
</a>
...
...
application/admin/view/default/payment/index.html
浏览文件 @
2e54aa4c
...
@@ -19,8 +19,8 @@
...
@@ -19,8 +19,8 @@
<th>
适用终端
</th>
<th>
适用终端
</th>
<th
class=
"am-hide-sm-only"
>
作者
</th>
<th
class=
"am-hide-sm-only"
>
作者
</th>
<th
class=
"am-hide-sm-only th-desc"
>
描述
</th>
<th
class=
"am-hide-sm-only th-desc"
>
描述
</th>
<th>
是否
启用
</th>
<th>
启用
</th>
<th>
对
用户放开
</th>
<th>
用户放开
</th>
<th>
操作
</th>
<th>
操作
</th>
</tr>
</tr>
</thead>
</thead>
...
...
application/service/AdminService.php
浏览文件 @
2e54aa4c
...
@@ -63,18 +63,33 @@ class AdminService
...
@@ -63,18 +63,33 @@ class AdminService
$where
=
[];
$where
=
[];
if
(
!
empty
(
$params
[
'keywords'
]))
if
(
!
empty
(
$params
[
'keywords'
]))
{
{
$where
[]
=
[
'username'
,
'like'
,
'%'
.
$params
[
'keywords'
]
.
'%'
];
$where
[]
=
[
'username|mobile'
,
'like'
,
'%'
.
$params
[
'keywords'
]
.
'%'
];
}
if
(
isset
(
$params
[
'role_id'
])
&&
$params
[
'role_id'
]
>
-
1
)
{
$where
[]
=
[
'role_id'
,
'='
,
intval
(
$params
[
'role_id'
])];
}
}
//
等值
//
是否更多条件
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
;
return
$where
;
}
}
...
...
application/service/AppNavService.php
浏览文件 @
2e54aa4c
...
@@ -133,8 +133,13 @@ class AppNavService
...
@@ -133,8 +133,13 @@ class AppNavService
// 等值
// 等值
if
(
isset
(
$params
[
'is_enable'
])
&&
$params
[
'is_enable'
]
>
-
1
)
if
(
isset
(
$params
[
'is_enable'
])
&&
$params
[
'is_enable'
]
>
-
1
)
{
{
$where
[]
=
[
'is_enable'
,
'='
,
intval
(
$params
[
'is_enable'
])];
$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
)
if
(
isset
(
$params
[
'event_type'
])
&&
$params
[
'event_type'
]
>
-
1
)
{
{
$where
[]
=
[
'event_type'
,
'='
,
intval
(
$params
[
'event_type'
])];
$where
[]
=
[
'event_type'
,
'='
,
intval
(
$params
[
'event_type'
])];
...
...
application/service/ArticleService.php
浏览文件 @
2e54aa4c
...
@@ -126,6 +126,10 @@ class ArticleService
...
@@ -126,6 +126,10 @@ class ArticleService
{
{
$where
[]
=
[
'a.is_home_recommended'
,
'='
,
intval
(
$params
[
'is_home_recommended'
])];
$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'
]))
if
(
!
empty
(
$params
[
'time_start'
]))
{
{
...
...
application/service/CustomViewService.php
浏览文件 @
2e54aa4c
...
@@ -118,6 +118,10 @@ class CustomViewService
...
@@ -118,6 +118,10 @@ class CustomViewService
{
{
$where
[]
=
[
'is_enable'
,
'='
,
intval
(
$params
[
'is_enable'
])];
$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
)
if
(
isset
(
$params
[
'is_header'
])
&&
$params
[
'is_header'
]
>
-
1
)
{
{
$where
[]
=
[
'is_header'
,
'='
,
intval
(
$params
[
'is_header'
])];
$where
[]
=
[
'is_header'
,
'='
,
intval
(
$params
[
'is_header'
])];
...
...
application/service/MessageService.php
浏览文件 @
2e54aa4c
...
@@ -265,6 +265,9 @@ class MessageService
...
@@ -265,6 +265,9 @@ class MessageService
// 业务类型
// 业务类型
$v
[
'business_type_name'
]
=
$common_business_type_list
[
$v
[
'business_type'
]][
'name'
];
$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'
];
$v
[
'gender_text'
]
=
$common_gender_list
[
$v
[
'gender'
]][
'name'
];
...
@@ -331,6 +334,15 @@ class MessageService
...
@@ -331,6 +334,15 @@ class MessageService
{
{
$where
[]
=
[
'u.gender'
,
'='
,
intval
(
$params
[
'gender'
])];
$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'
]))
if
(
!
empty
(
$params
[
'time_start'
]))
{
{
...
...
application/service/PayLogService.php
浏览文件 @
2e54aa4c
...
@@ -161,6 +161,15 @@ class PayLogService
...
@@ -161,6 +161,15 @@ class PayLogService
$where
[]
=
[
'u.gender'
,
'='
,
intval
(
$params
[
'gender'
])];
$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'
]))
if
(
!
empty
(
$params
[
'time_start'
]))
{
{
$where
[]
=
[
'p.add_time'
,
'>'
,
strtotime
(
$params
[
'time_start'
])];
$where
[]
=
[
'p.add_time'
,
'>'
,
strtotime
(
$params
[
'time_start'
])];
...
...
public/static/common/css/common.css
浏览文件 @
2e54aa4c
...
@@ -317,7 +317,7 @@ button.colorpicker-submit img {
...
@@ -317,7 +317,7 @@ button.colorpicker-submit img {
.form-search
.so-list
select
{
padding
:
0
0
0
8px
;
}
.form-search
.so-list
select
{
padding
:
0
0
0
8px
;
}
.form-search
.more-submit
input
{
display
:
none
;
}
.form-search
.more-submit
input
{
display
:
none
;
}
@media
only
screen
and
(
min-width
:
641px
)
{
@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
;
}
.form-search
.thin_sub
:hover
{
color
:
#F60
;
}
}
}
@media
only
screen
and
(
max-width
:
641px
)
{
@media
only
screen
and
(
max-width
:
641px
)
{
...
@@ -326,5 +326,5 @@ button.colorpicker-submit img {
...
@@ -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
{
margin-top
:
10px
;
}
.form-search
.so-list
tr
td
:last-child
{
padding-top
:
0px
!important
;
}
.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
.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
public/static/plugins/css/wallet/admin/common.css
浏览文件 @
2e54aa4c
/**
* 搜索表单
*/
.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
;
}
}
/**
/**
* 用户信息
* 用户信息
*/
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录