lizhen_gitee vor 1 Jahr
Ursprung
Commit
5d0e8d23e9

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

@@ -34,7 +34,7 @@ return [
     'Deletetime'       => '删除时间',
     'Visitor'          => '游客',
     'User name'          => '用户名',
-    'Delivere'          => '物流',
+    'Delivery'          => '物流',
     'Comment'          => '评论',
     'Data had been update before saved, close windows and do it again' => '数据在保存之前有变动,请关闭窗口再试一次',
     'Product'           => '商品',

+ 1 - 1
application/admin/view/unishop/order/index.html

@@ -33,7 +33,7 @@
                         <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('unishop/order/recyclebin')?'':'hide'}" href="unishop/order/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-delivere="{:$auth->check('unishop/order/delivere')}"
+                           data-operate-delivery="{:$auth->check('unishop/order/delivery')}"
                            data-operate-product="{:$auth->check('unishop/order/product')}"
                            data-operate-edit="{:$auth->check('unishop/order/edit')}"
                            data-operate-del="{:$auth->check('unishop/order/del')}"

+ 5 - 5
public/assets/js/backend/unishop/order.js

@@ -38,7 +38,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 合并操作方法
             Table.api.events.operate = $.extend(Table.api.events.operate,
                 {
-                    'click .btn-delivere': function (e, value, row, index) {
+                    'click .btn-delivery': function (e, value, row, index) {
                         e.stopPropagation();
                         e.preventDefault();
                         var table = $(this).closest('table');
@@ -46,7 +46,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         var ids = row[options.pk];
                         row = $.extend({}, row ? row : {}, {ids: ids});
                         var url = options.extend.delivere_url;
-                        Fast.api.open(Table.api.replaceurl(url, row, table), __('Delivere'), $(this).data() || {});
+                        Fast.api.open(Table.api.replaceurl(url, row, table), __('Delivery'), $(this).data() || {});
                     }
                 },
                 {
@@ -125,9 +125,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     icon: 'fa fa-handshake-o'
                                 },*/
                                 {
-                                    name: 'delivere',
-                                    text: __('Delivere'),
-                                    classname: 'btn btn-xs btn-info btn-delivere',
+                                    name: 'delivery',
+                                    text: __('Delivery'),
+                                    classname: 'btn btn-xs btn-info btn-delivery',
                                     extend: 'data-toggle="tooltip"',
                                     icon: 'fa fa-plane'
                                 },