后台调整

application/admin/lang/zh-cn/unishop/order.php

@@ -23,11 +23,11 @@ return [
     'No'      => '否',
     'Have_delivered'   => '已发货',
     'Have_commented'   => '已评论',
-    'Have_received'    => '已收货',
+    'Have_received'    => '已核销',
     'Pay time'          => '支付时间',
     'Time: %s'          => '时间: %s',
     'Delivered time'          => '发货时间',
-    'Received time'          => '收货时间',
+    'Received time'          => '核销时间',
     'Commented time'          => '评论时间',
     'Createtime'       => '创建时间',
     'Updatetime'       => '更新时间',

application/admin/view/unishop/market/coupon/recyclebin.html

@@ -8,9 +8,9 @@
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
                         <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('unishop/market/coupon/restore')?'':'hide'}" href="javascript:;" data-url="unishop/market/coupon/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
-                        <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/market/coupon/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/market/coupon/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
+                        <!--<a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/market/coupon/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/market/coupon/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>-->
                         <a class="btn btn-success btn-restoreall {:$auth->check('unishop/market/coupon/restore')?'':'hide'}" href="javascript:;" data-url="unishop/market/coupon/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
-                        <a class="btn btn-danger btn-destroyall {:$auth->check('unishop/market/coupon/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/market/coupon/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
+                        <!--<a class="btn btn-danger btn-destroyall {:$auth->check('unishop/market/coupon/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/market/coupon/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-restore="{:$auth->check('unishop/market/coupon/restore')}"

application/admin/view/unishop/order/recyclebin.html

@@ -8,9 +8,9 @@
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
                         <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('unishop/order/restore')?'':'hide'}" href="javascript:;" data-url="unishop/order/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
-                        <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/order/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/order/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
+                        <!--<a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/order/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/order/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>-->
                         <a class="btn btn-success btn-restoreall {:$auth->check('unishop/order/restore')?'':'hide'}" href="javascript:;" data-url="unishop/order/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
-                        <a class="btn btn-danger btn-destroyall {:$auth->check('unishop/order/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/order/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
+                        <!--<a class="btn btn-danger btn-destroyall {:$auth->check('unishop/order/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/order/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-restore="{:$auth->check('unishop/order/restore')}"

application/admin/view/unishop/product/recyclebin.html

@@ -8,9 +8,9 @@
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
                         <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('unishop/product/restore')?'':'hide'}" href="javascript:;" data-url="unishop/product/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
-                        <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/product/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/product/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
+                        <!--<a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('unishop/product/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/product/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>-->
                         <a class="btn btn-success btn-restoreall {:$auth->check('unishop/product/restore')?'':'hide'}" href="javascript:;" data-url="unishop/product/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
-                        <a class="btn btn-danger btn-destroyall {:$auth->check('unishop/product/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/product/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
+                        <!--<a class="btn btn-danger btn-destroyall {:$auth->check('unishop/product/destroy')?'':'hide'}" href="javascript:;" data-url="unishop/product/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-restore="{:$auth->check('unishop/product/restore')}"

public/assets/js/backend/unishop/market/coupon.js

@@ -86,14 +86,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url: 'unishop/market/coupon/restore',
                                     refresh: true
                                 },
-                                {
+                               /* {
                                     name: 'Destroy',
                                     text: __('Destroy'),
                                     classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
                                     icon: 'fa fa-times',
                                     url: 'unishop/market/coupon/destroy',
                                     refresh: true
-                                }
+                                }*/
                             ],
                             formatter: Table.api.formatter.operate
                         }

public/assets/js/backend/unishop/order.js

@@ -87,29 +87,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id'),visible:false},
+//                        {field: 'id', title: __('Id'),visible:false},
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User name')},
                         {field: 'out_trade_no', title: __('Out_trade_no')},
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
                         {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},
-                        {field: 'delivery_price', title: __('Delivery_price'), operate:'BETWEEN'},
+//                        {field: 'delivery_price', title: __('Delivery_price'), operate:'BETWEEN'},
                         {field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
                         {field: 'status', title: __('Status'), searchList: {"-1":__('Refund'),"0":__('Cancel'),"1":__('Normal')}, formatter: Table.api.formatter.status},
-                        {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Online'),"2":__('Offline'),"3":__('wxPay'),"4":__('aliPay')}, formatter: Table.api.formatter.normal},
-                        {field: 'ip', title: __('Ip'), visible:false},
+//                        {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Online'),"2":__('Offline'),"3":__('wxPay'),"4":__('aliPay')}, formatter: Table.api.formatter.normal},
+//                        {field: 'ip', title: __('Ip'), visible:false},
                         {field: 'have_paid_status', title: __('Have_paid'), searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
-                        {field: 'have_delivered_status', title: __('Have_delivered'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
+//                        {field: 'have_delivered_status', title: __('Have_delivered'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
                         {field: 'have_received_status', title: __('Have_received'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
-                        {field: 'have_commented_status', title: __('Have_commented'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
-                        {field: 'refund_status', title: __('Refund status'),searchList: {"0":__('None'),"1":__('Apply'),"2":__('Waiting for shipment'),"3":__('Pass'),"4":__('Refuse')},  formatter: Table.api.formatter.status},
+//                        {field: 'have_commented_status', title: __('Have_commented'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
+                        {field: 'refund_status', title: __('Refund status'),operate:false,searchList: {"0":__('None'),"1":__('Apply'),"2":__('Waiting for shipment'),"3":__('Pass'),"4":__('Refuse')},  formatter: Table.api.formatter.status},
                         {field: 'have_paid', title: __('Pay time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
-                        {field: 'have_delivered', title: __('Delivered time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
+//                        {field: 'have_delivered', title: __('Delivered time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {field: 'have_received', title: __('Received time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
-                        {field: 'have_commented', title: __('Commented time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
+//                        {field: 'have_commented', title: __('Commented time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE %...%', placeholder: '模糊搜索，*表示任意字符'},
-                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
+//                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {
                             field: 'operate',
                             title: __('Operate'),
@@ -173,26 +173,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id'),visible:false},
+//                        {field: 'id', title: __('Id'),visible:false},
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User name')},
                         {field: 'out_trade_no', title: __('Out_trade_no')},
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
                         {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},
-                        {field: 'delivery_price', title: __('Delivery_price'), operate:'BETWEEN'},
+//                        {field: 'delivery_price', title: __('Delivery_price'), operate:'BETWEEN'},
                         {field: 'total_price', title: __('Total_price'), operate:'BETWEEN'},
-                        {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Online'),"2":__('Offline'),"3":__('wxPay'),"4":__('aliPay')}, formatter: Table.api.formatter.normal},
-                        {field: 'ip', title: __('Ip'), visible:false},
+//                        {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Online'),"2":__('Offline'),"3":__('wxPay'),"4":__('aliPay')}, formatter: Table.api.formatter.normal},
+//                        {field: 'ip', title: __('Ip'), visible:false},
                         {field: 'status', title: __('Status'), searchList: {"-1":__('Refund'),"0":__('Cancel'),"1":__('Normal')}, formatter: Table.api.formatter.status},
                         {field: 'have_paid_status', title: __('Have_paid'), searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
-                        {field: 'have_delivered_status', title: __('Have_delivered'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
+//                        {field: 'have_delivered_status', title: __('Have_delivered'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
                         {field: 'have_received_status', title: __('Have_received'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
-                        {field: 'have_commented_status', title: __('Have_commented'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
-                        {field: 'refund_status', title: __('Refund status'),searchList: {"0":__('None'),"1":__('Apply'),"2":__('Waiting for shipment'),"3":__('Pass'),"4":__('Refuse')},  formatter: Table.api.formatter.status},
+//                        {field: 'have_commented_status', title: __('Have_commented'),searchList: {"0":__('No'),"1":__('Yes')}, formatter: Table.api.formatter.statusCustom},
+                        {field: 'refund_status', title: __('Refund status'),operate:false,searchList: {"0":__('None'),"1":__('Apply'),"2":__('Waiting for shipment'),"3":__('Pass'),"4":__('Refuse')},  formatter: Table.api.formatter.status},
                         {field: 'have_paid', title: __('Pay time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
-                        {field: 'have_delivered', title: __('Delivered time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
+//                        {field: 'have_delivered', title: __('Delivered time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {field: 'have_received', title: __('Received time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
-                        {field: 'have_commented', title: __('Commented time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
+//                        {field: 'have_commented', title: __('Commented time'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime,visible:false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE %...%', placeholder: '模糊搜索，*表示任意字符'},
                         {
@@ -217,14 +217,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url: 'unishop/order/restore',
                                     refresh: true
                                 },
-                                {
+                                /*{
                                     name: 'Destroy',
                                     text: __('Destroy'),
                                     classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
                                     icon: 'fa fa-times',
                                     url: 'unishop/order/destroy',
                                     refresh: true
-                                }
+                                }*/
                             ],
                             formatter: Table.api.formatter.operate
                         }

public/assets/js/backend/unishop/product.js

@@ -727,14 +727,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload', 'vue'], fun
                                     url: 'unishop/product/restore',
                                     refresh: true
                                 },
-                                {
+                               /* {
                                     name: 'Destroy',
                                     text: __('Destroy'),
                                     classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
                                     icon: 'fa fa-times',
                                     url: 'unishop/product/destroy',
                                     refresh: true
-                                }
+                                }*/
                             ],
                             formatter: Table.api.formatter.operate
                         }

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',