Merge branch 'master' of http://git.ichunt.net/semour/semour_admin

app/Admin/Controllers/OrderController.php

@@ -68,15 +68,15 @@ class OrderController extends AdminController
             $grid->column('company_name')->display(function ($company_name) {
             $grid->column('company_name')->display(function ($company_name) {
                 return $company_name ? $company_name : "-";
                 return $company_name ? $company_name : "-";
             });
             });
-            $grid->column('scmUser.user_sn',admin_trans('scm-user.options.user_sn'))->link(function () {
+            $grid->column('scmUser.user_sn',admin_trans('scm-user.fields.user_sn'))->link(function () {
                 return admin_url('smc_user/'.$this->user_id);
                 return admin_url('smc_user/'.$this->user_id);
 
 
             });
             });
-            $grid->column('scmUser.name',admin_trans('scm-user.options.name'));
+            $grid->column('scmUser.name',admin_trans('scm-user.fields.name'));
             $grid->column('order_amount')->help('订单详情里-结算信息的“运费”“支付手续费”“其他费用”为空时；应付金额一栏为“待确认”');
             $grid->column('order_amount')->help('订单详情里-结算信息的“运费”“支付手续费”“其他费用”为空时；应付金额一栏为“待确认”');
             $grid->column('order_pay_type')->using(admin_trans('order.options.order_pay_type'))->sortable();
             $grid->column('order_pay_type')->using(admin_trans('order.options.order_pay_type'))->sortable();
-            $grid->column('order_user_pay_type',admin_trans("order.field.order_user_pay_type"))->display(function () {
-                return Arr::get(admin_trans("order.options_user_pay_type"),$this->order_user_pay_type,"");
+            $grid->column('order_user_pay_type',admin_trans("order.fields.order_user_pay_type"))->display(function () {
+                return Arr::get(admin_trans("order.options.order_user_pay_type"),$this->order_user_pay_type,"");
             });
             });
             $grid->column('sale_name');
             $grid->column('sale_name');
             $grid->column('order_remark')->limit(10);
             $grid->column('order_remark')->limit(10);

resources/lang/zh_CN/scm-user.php

@@ -5,7 +5,7 @@ return [
         'scm-user' => 'ScmUser',
         'scm-user' => 'ScmUser',
     ],
     ],
     'fields' => [
     'fields' => [
-        'name' => '用户名',
+        'name' => '联系人',
         'user_sn' => '客户编码',
         'user_sn' => '客户编码',
         'email' => '邮箱',
         'email' => '邮箱',
         'email_verified_at' => '邮箱校验时间',
         'email_verified_at' => '邮箱校验时间',