coupon.xp.yn.cn / coupon_backend · 提交

转到一个项目

作者 chencheng
提交 1fb36ee345c5682942126db9b0d56c94adc10d64 2 个父辈 6a32af5b ffe4f899

1

内嵌 并排对比
正在显示 3 个修改的文件 包含 3 行增加 和 3 行删除
@@ -59,7 +59,7 @@ class Holdactivity extends Backend @@ -59,7 +59,7 @@ class Holdactivity extends Backend
59 foreach ($list as $row) { 59 foreach ($list as $row) {
60 $row->visible(['id','name','phone','industry','address']); 60 $row->visible(['id','name','phone','industry','address']);
61 $row->visible(['user']); 61 $row->visible(['user']);
62 - $row->getRelation('user')->visible(['username']); 62 + $row->getRelation('user')->visible(['nickname']);
63 $row->visible(['store']); 63 $row->visible(['store']);
64 $row->getRelation('store')->visible(['name']); 64 $row->getRelation('store')->visible(['name']);
65 $row->visible(['activity']); 65 $row->visible(['activity']);
@@ -9,7 +9,7 @@ return [ @@ -9,7 +9,7 @@ return [
9 'Address' => '地区', 9 'Address' => '地区',
10 'Verification_activity_id' => '活动编号', 10 'Verification_activity_id' => '活动编号',
11 'User_id' => '提交人', 11 'User_id' => '提交人',
12 - 'User.username' => '用户名', 12 + 'User.nickname' => '用户名',
13 'Store.name' => '门店名称', 13 'Store.name' => '门店名称',
14 'Activity.title' => '活动标题' 14 'Activity.title' => '活动标题'
15 ]; 15 ];
@@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
30 {field: 'phone', title: __('Phone'), operate: 'LIKE'}, 30 {field: 'phone', title: __('Phone'), operate: 'LIKE'},
31 {field: 'industry', title: __('Industry'), operate: 'LIKE'}, 31 {field: 'industry', title: __('Industry'), operate: 'LIKE'},
32 {field: 'address', title: __('Address'), operate: 'LIKE'}, 32 {field: 'address', title: __('Address'), operate: 'LIKE'},
33 - {field: 'user.username', title: __('User.username'), operate: 'LIKE'}, 33 + {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
34 {field: 'store.name', title: __('Store.name'), operate: 'LIKE'}, 34 {field: 'store.name', title: __('Store.name'), operate: 'LIKE'},
35 {field: 'activity.title', title: __('Activity.title'), operate: 'LIKE'}, 35 {field: 'activity.title', title: __('Activity.title'), operate: 'LIKE'},
36 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 36 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}