已收货改名已核销，屏蔽字段

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

@@ -24,11 +24,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'       => '更新时间',

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

@@ -100,29 +100,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":__('Wallet'),"3":__('wxPay'),"4":__('aliPay')}, formatter: Table.api.formatter.normal},
-                        {field: 'ip', title: __('Ip'), visible:false},
+//                        {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":__('Pass and left User delivery'),"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'),searchList: {"0":__('None'),"1":__('Apply'),"2":__('Pass and left User delivery'),"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'),
@@ -218,24 +218,24 @@ 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":__('Wallet'),"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: '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_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: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},

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

@@ -662,14 +662,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload', 'vue'], fun
                             events: Table.api.events.operate,
                             formatter: Table.api.formatter.operate,
                             buttons:[
-                                /*{
+                                {
                                     name: 'evaluate',
                                     text: __('Evaluate'),
                                     classname: 'btn btn-xs btn-info btn-evaluate',
                                     extend: 'data-toggle="tooltip"',
                                     icon: 'fa fa-commenting'
                                 },
-                                {
+                                /*{
                                     name: 'copy',
                                     text: __('Copy'),
                                     classname: 'btn btn-xs btn-info btn-copy',