diff --git a/application/admin/lang/zh-cn/zy/circle/circle.php b/application/admin/lang/zh-cn/zy/circle/circle.php index 6e89086..284b628 100644 --- a/application/admin/lang/zh-cn/zy/circle/circle.php +++ b/application/admin/lang/zh-cn/zy/circle/circle.php @@ -3,7 +3,7 @@ return [ 'Club_id' => '俱乐部', 'User_id' => '用户', - 'Username' => '用户名称', + 'Nickname' => '昵称', 'Avatar' => '头像', 'Gender' => '性别', 'Club_name' => '俱乐部名称', @@ -12,5 +12,9 @@ return [ 'Create_time' => '创建时间', 'Update_time' => '修改时间', 'Club.name' => '俱乐部名称', - 'User.nickname' => '昵称' + 'User.nickname' => '昵称', + + + 'Male' => '男', + 'Female' => '女', ]; diff --git a/application/admin/lang/zh-cn/zy/circle/comment.php b/application/admin/lang/zh-cn/zy/circle/comment.php index c2403f4..ee3cade 100644 --- a/application/admin/lang/zh-cn/zy/circle/comment.php +++ b/application/admin/lang/zh-cn/zy/circle/comment.php @@ -1,14 +1,17 @@ '影圈', - 'Pid' => '回复评论', + 'Circle_id' => '影圈id', + 'Pid' => '评论id', 'User_id' => '用户', - 'Username' => '用户名称', + 'Nickname' => '昵称', 'Avatar' => '用户头像', 'Gender' => '性别', 'Content' => '评论或回复内容', 'Status' => '状态', 'Create_time' => '创建时间', - 'Update_time' => '修改时间' + 'Update_time' => '修改时间', + + 'Male' => '男', + 'Female' => '女', ]; diff --git a/application/admin/lang/zh-cn/zy/circle/likes.php b/application/admin/lang/zh-cn/zy/circle/likes.php index fcf2cce..6d4f34f 100644 --- a/application/admin/lang/zh-cn/zy/circle/likes.php +++ b/application/admin/lang/zh-cn/zy/circle/likes.php @@ -1,12 +1,15 @@ '影圈', + 'Circle_id' => '影圈id', 'User_id' => '用户', - 'Username' => '用户名称', + 'Nickname' => '昵称', 'Avatar' => '用户头像', 'Gender' => '性别', 'Create_time' => '创建时间', 'Update_time' => '修改时间', - 'User.nickname' => '昵称' + 'User.nickname' => '昵称', + + 'Male' => '男', + 'Female' => '女', ]; diff --git a/public/assets/js/backend/zy/circle/circle.js b/public/assets/js/backend/zy/circle/circle.js index 8ce1cb9..740f425 100644 --- a/public/assets/js/backend/zy/circle/circle.js +++ b/public/assets/js/backend/zy/circle/circle.js @@ -28,11 +28,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin [ {checkbox: true}, {field: 'id', title: __('Id')}, - {field: 'club.name', title: __('Club.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'}, - {field: 'username', title: __('Username'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + // {field: 'club.name', title: __('Club.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + // {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'}, + {field: 'club_name', title: __('Club_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'nickname', title: __('Nickname'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image}, - {field: 'gender', title: __('Gender'), searchList: {1: __('Male'), 0: __('Female')}}, + {field: 'gender', title: __('Gender'),formatter: Table.api.formatter.label, searchList: {1: __('Male'), 0: __('Female')}}, {field: 'club_name', title: __('Club_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, diff --git a/public/assets/js/backend/zy/circle/comment.js b/public/assets/js/backend/zy/circle/comment.js index 52aa9b0..ac22609 100644 --- a/public/assets/js/backend/zy/circle/comment.js +++ b/public/assets/js/backend/zy/circle/comment.js @@ -30,10 +30,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'id', title: __('Id')}, {field: 'circle_id', title: __('Circle_id')}, {field: 'pid', title: __('Pid')}, - {field: 'user_id', title: __('User_id')}, - {field: 'username', title: __('Username'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + // {field: 'user_id', title: __('User_id')}, + {field: 'nickname', title: __('Nickname'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image}, - {field: 'gender', title: __('Gender')}, + {field: 'gender', title: __('Gender'),formatter: Table.api.formatter.label, searchList: {1: __('Male'), 0: __('Female')}}, {field: 'status', title: __('Status')}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, diff --git a/public/assets/js/backend/zy/circle/likes.js b/public/assets/js/backend/zy/circle/likes.js index 2958b30..092d99a 100644 --- a/public/assets/js/backend/zy/circle/likes.js +++ b/public/assets/js/backend/zy/circle/likes.js @@ -27,9 +27,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {checkbox: true}, {field: 'id', title: __('Id')}, {field: 'circle_id', title: __('Circle_id')}, - {field: 'username', title: __('Username'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'nickname', title: __('Nickname'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image}, - {field: 'gender', title: __('Gender')}, + {field: 'gender', title: __('Gender'),formatter: Table.api.formatter.label, searchList: {1: __('Male'), 0: __('Female')}}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} diff --git a/public/assets/js/backend/zy/link/complaint.js b/public/assets/js/backend/zy/link/complaint.js index ede94ed..cfb7348 100644 --- a/public/assets/js/backend/zy/link/complaint.js +++ b/public/assets/js/backend/zy/link/complaint.js @@ -28,14 +28,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin [ {checkbox: true}, {field: 'id', title: __('Id')}, - {field: 'type', title: __('Type')}, - {field: 'target_id', title: __('Target_id')}, + {field: 'type', title: __('Type'),formatter: Table.api.formatter.label, searchList: { 1: __('Type1'),2: __('Type2'),3: __('Type3')}}, + // {field: 'target_id', title: __('Target_id')}, {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, // {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'}, - {field: 'user_id', title: __('User_id')}, + // {field: 'user_id', title: __('User_id')}, {field: 'username', title: __('Username'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'phone', title: __('Phone')}, - {field: 'status', title: __('Status')}, + {field: 'status', title: __('Status'),formatter: Table.api.formatter.label, searchList: { 1: __('Status1'),0: __('Status0')}}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}