Browse Source

后台调整

lizhen 1 ngày trước cách đây
mục cha
commit
6dca24cced

+ 1 - 1
application/admin/lang/zh-cn/home.php

@@ -4,7 +4,7 @@ return [
     'Id'           => 'ID',
     'Category'     => '分类',
     'Category 1'   => '2行4个',
-    'Category 2'   => '1行2个',
+    'Category 2'   => '1行5个',
     'Name'         => '标题',
     'Image'        => '封面图',
     'Type'         => '跳转方式',

+ 34 - 41
application/admin/lang/zh-cn/user/user.php

@@ -1,45 +1,38 @@
 <?php
 
 return [
-    'Id'               => 'ID',
-    'Group_id'         => '组别ID',
-    'Product_ids'      => '可核销商品',
-    'Intro_uid'        => '邀请人ID',
-    'Username'         => '用户名',
-    'Nickname'         => '昵称',
-    'Password'         => '密码',
-    'Salt'             => '密码盐',
-    'Email'            => '电子邮箱',
-    'Mobile'           => '手机号',
-    'Avatar'           => '头像',
-    'Level'            => '等级',
-    'Gender'           => '性别',
-    'Birthday'         => '生日',
-    'Bio'              => '格言',
-    'Successions'      => '连续登录天数',
-    'Maxsuccessions'   => '最大连续登录天数',
-    'Prevtime'         => '上次登录时间',
-    'Logintime'        => '登录时间',
-    'Loginip'          => '登录IP',
-    'Loginfailure'     => '失败次数',
-    'Joinip'           => '加入IP',
-    'Jointime'         => '加入时间',
-    'Createtime'       => '创建时间',
-    'Updatetime'       => '更新时间',
-    'Token'            => 'Token',
-    'Status'           => '状态',
-    'Status 1'         => '正常',
-    'Set status to 1'  => '设为正常',
-    'Status 0'         => '禁用',
-    'Set status to 0'  => '设为禁用',
-    'Status -1'        => '注销',
-    'Set status to -1' => '设为注销',
-    'Verification'     => '验证',
-    'Idcard_status'    => '实名认证',
-    'Idcard_status -1' => '未申请',
-    'Idcard_status 0'  => '待审核',
-    'Idcard_status 1'  => '审核通过',
-    'Idcard_status 2'  => '审核驳回',
-    'Group.name'       => '组名',
-    'Wallet.money'     => '余额',
+    'Id'            => 'ID',
+    'Group_id'      => '用户组ID',
+    'Username'      => '用户名',
+    'Nickname'      => '昵称',
+    'Password'      => '密码',
+    'Salt'          => '密码盐',
+    'Email'         => '电子邮箱',
+    'Mobile'        => '手机号',
+    'Avatar'        => '头像',
+    'Gender'        => '性别',
+    'Gender 1'      => '男',
+    'Gender 0'      => '女',
+    'Birthday'      => '生日',
+    'Height'        => '身高(cm)',
+    'Weight'        => '体重(kg)',
+    'Bio'           => '格言',
+    'Prevtime'      => '上次登录时间',
+    'Logintime'     => '登录时间',
+    'Loginip'       => '登录IP',
+    'Loginfailure'  => '失败次数',
+    'Joinip'        => '加入IP',
+    'Jointime'      => '加入时间',
+    'Createtime'    => '创建时间',
+    'Updatetime'    => '更新时间',
+    'Token'         => 'Token',
+    'Status'        => '状态',
+    'Status 1'      => '正常',
+    'Set status to 1'=> '设为正常',
+    'Status 0'      => '禁用',
+    'Set status to 0'=> '设为禁用',
+    'Status -1'     => '注销',
+    'Set status to -1'=> '设为注销',
+    'Wxmini_openid' => '微信小程序openid',
+    'Group.name'    => '组名'
 ];

+ 2 - 2
application/admin/view/messagesys/index.html

@@ -18,7 +18,7 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('messagesys/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('messagesys/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('messagesys/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('messagesys/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
@@ -29,7 +29,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

+ 2 - 2
application/admin/view/store/index.html

@@ -18,7 +18,7 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('store/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('store/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('store/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('store/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
@@ -29,7 +29,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

+ 2 - 2
application/admin/view/storecategory/index.html

@@ -18,7 +18,7 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('storecategory/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('storecategory/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('storecategory/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('storecategory/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
@@ -29,7 +29,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

+ 2 - 2
application/admin/view/zhengcejiedu/index.html

@@ -22,14 +22,14 @@
 <!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('zhengcejiedu/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
-                        <div class="dropdown btn-group {:$auth->check('zhengcejiedu/multi')?'':'hide'}">
+                        <!--<div class="dropdown btn-group {:$auth->check('zhengcejiedu/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 {foreach name="statusList" item="vo"}
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

+ 1 - 1
application/extra/site.php

@@ -56,5 +56,5 @@ return array (
   'ysszd_title' => '粤省事直达',
   'ysszd_title_info' => '广东移动政务服务平台:一站式,更省事!',
   'ysszd_icon' => '/uploads/20250610/ffba11454e8511367fd8164b97152120.png',
-  'ysszd_url' => '/page/index',
+  'ysszd_url' => 'wx82d43fee89cdc7df',
 );

+ 3 - 1
public/assets/js/backend/messagesys.js

@@ -12,6 +12,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     multi_url: 'messagesys/multi',
                     import_url: 'messagesys/import',
                     table: 'message_sys',
+                    dragsort_url: false,
                 }
             });
 
@@ -22,13 +23,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'weigh',
+                search: false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'info', title: __('Info'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'content', title: __('Content')},
+                        // {field: 'content', title: __('Content')},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},

+ 5 - 2
public/assets/js/backend/store.js

@@ -12,6 +12,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     multi_url: 'store/multi',
                     import_url: 'store/import',
                     table: 'store',
+                    dragsort_url: false,
                 }
             });
 
@@ -24,11 +25,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'weigh',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                search: false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'category_id', title: __('Category_id')},
+                        // {field: 'category_id', title: __('Category_id')},
+                        {field: 'category.name', title: __('Category.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
                         {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
@@ -40,7 +44,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'shijian', title: __('Shijian'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'category.name', title: __('Category.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

+ 2 - 0
public/assets/js/backend/storecategory.js

@@ -12,6 +12,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     multi_url: 'storecategory/multi',
                     import_url: 'storecategory/import',
                     table: 'store_category',
+                    dragsort_url: false,
                 }
             });
 
@@ -22,6 +23,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'weigh',
+                search: false,
                 columns: [
                     [
                         {checkbox: true},

+ 3 - 2
public/assets/js/backend/user/group.js

@@ -36,13 +36,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                search: false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'name', title: __('Name')},
-                        {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
-                        {field: 'updatetime', title: __('Updatetime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
+                        // {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
+                        // {field: 'updatetime', title: __('Updatetime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
 //                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]

+ 24 - 44
public/assets/js/backend/user/user.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'user/user/index' + location.search,
                     add_url: 'user/user/add',
                     edit_url: 'user/user/edit',
-//                    del_url: 'user/user/del',
+                    // del_url: 'user/user/del',
                     multi_url: 'user/user/multi',
                     import_url: 'user/user/import',
                     table: 'user',
@@ -24,55 +24,38 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                search: false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-//                        {field: 'group_id', title: __('Group_id')},
+                        // {field: 'group_id', title: __('Group_id')},
                         {field: 'group.name', title: __('Group.name'), operate: 'LIKE'},
-                        {field: 'intro_uid', title: __('Intro_uid')},
-                        {field: 'username', title: __('Username'), operate: 'LIKE'},
+
+                        // {field: 'username', title: __('Username'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
-//                        {field: 'password', title: __('Password'), operate: 'LIKE'},
-//                        {field: 'salt', title: __('Salt'), operate: 'LIKE'},
-//                        {field: 'email', title: __('Email'), operate: 'LIKE'},
+                        // {field: 'password', title: __('Password'), operate: 'LIKE'},
+                        // {field: 'salt', title: __('Salt'), operate: 'LIKE'},
+                        // {field: 'email', title: __('Email'), operate: 'LIKE'},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
-                        {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-//                        {field: 'level', title: __('Level')},
-//                        {field: 'gender', title: __('Gender')},
-//                        {field: 'birthday', title: __('Birthday'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
-//                        {field: 'bio', title: __('Bio'), operate: 'LIKE'},
-//                        {field: 'successions', title: __('Successions')},
-//                        {field: 'maxsuccessions', title: __('Maxsuccessions')},
-//                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
-//                        {field: 'loginfailure', title: __('Loginfailure')},
-//                        {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
+                        {field: 'avatar', title: __('Avatar'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'gender', title: __('Gender'), searchList: {"1":__('Gender 1'),"0":__('Gender 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'birthday', title: __('Birthday'), operate:false, addclass:'datetimerange', datetimeFormat: 'YYYY-MM-DD', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'height', title: __('Height'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'weight', title: __('Weight'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        // {field: 'bio', title: __('Bio'), operate: 'LIKE'},
+                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        // {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
+                        // {field: 'loginfailure', title: __('Loginfailure')},
+                        // {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
                         {field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'token', title: __('Token'), operate: 'LIKE'},
+                        // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        // {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        // {field: 'token', title: __('Token'), operate: 'LIKE'},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0'),"-1":__('Status -1')}, formatter: Table.api.formatter.status},
-//                        {field: 'verification', title: __('Verification'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-//                        {field: 'idcard_status', title: __('Idcard_status'), searchList: {"-1":__('Idcard_status -1'),"0":__('Idcard_status 0'),"1":__('Idcard_status 1'),"2":__('Idcard_status 2')}, formatter: Table.api.formatter.status},
-                        {field: 'wallet.money', title: __('Wallet.money'), operate: false},
-                        {field: 'operate', title: __('Operate'), table: table,
-                            buttons:[
-                                {
-                                    name:'editproduct',
-                                    text:'选择核销商品',
-                                    title:'选择核销商品',
-                                    icon:'fa fa-exclamation-circle',
-                                    classname:'btn btn-xs btn-info btn-dialog',
-                                    url:'user/user/editproduct/id/{ids}?dialog=1',
-                                    target:'_self',
-                                    hidden:function(row){
-                                        return row.group_id==3 ? false : true;
-                                    }
-                                }
-                            ],
-                            events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        // {field: 'wxmini_openid', title: __('Wxmini_openid'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
@@ -80,9 +63,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
-        editproduct: function () {
-            Controller.api.bindevent();
-        },
         add: function () {
             Controller.api.bindevent();
         },

+ 1 - 0
public/assets/js/backend/zhengcejiedu.js

@@ -12,6 +12,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     multi_url: 'zhengcejiedu/multi',
                     import_url: 'zhengcejiedu/import',
                     table: 'zhengcejiedu',
+                    dragsort_url: false,
                 }
             });