najixian / xt_dc_admin · Commits

Go to a project

Commit e4478bfe86ebac5041b479d0b07e26edbb276621

Authored by teemitop
1 parent ca26bebb
build: skipped

增加地区

Inline Side-by-side
Showing 2 changed files with 2 additions and 0 deletions
@@ -105,6 +105,7 @@ class Seller extends Common @@ -105,6 +105,7 @@ class Seller extends Common
105 $new_array[$key]['sms_send_count'] = $value['appSmsCount'] .'/'. $value['AndroidSmsCount']; 105 $new_array[$key]['sms_send_count'] = $value['appSmsCount'] .'/'. $value['AndroidSmsCount'];
106 $new_array[$key]['sms_send_count_sort'] = $value['appSmsCount'] + $value['AndroidSmsCount']; 106 $new_array[$key]['sms_send_count_sort'] = $value['appSmsCount'] + $value['AndroidSmsCount'];
107 $new_array[$key]['table_room_total'] = $value['table_total'] .'/'. $value['room_total']; 107 $new_array[$key]['table_room_total'] = $value['table_total'] .'/'. $value['room_total'];
  108 + $new_array[$key]['address_component'] = $value['address_component']['province'] && $value['address_component']['city'] ? $value['address_component']['province'] .'-'. $value['address_component']['city'] : '无法获取地区,请检查经纬度是否正确！';
108 } 109 }
109 } 110 }
110 return $result = [ 111 return $result = [
@@ -61,6 +61,7 @@ @@ -61,6 +61,7 @@
61 cols: [[ 61 cols: [[
62 {checkbox:true,fixed: true}, 62 {checkbox:true,fixed: true},
63 {field: 'id', title: '{:lang("id")}',width:60, fixed: true}, 63 {field: 'id', title: '{:lang("id")}',width:60, fixed: true},
  64 + {field: 'address_component', title: '省-市'},
64 {field: 'sellername', title: '商家名称'}, 65 {field: 'sellername', title: '商家名称'},
65 {field: 'table_room_total', title: '桌位/包间(总数)'}, 66 {field: 'table_room_total', title: '桌位/包间(总数)'},
66 {field: 'reserve_count_sort', align: 'right', title: '预定总量', sort: true}, 67 {field: 'reserve_count_sort', align: 'right', title: '预定总量', sort: true},