najixian / xt_dc_admin · Commits

Go to a project

Commit 36db33c51c4a167e89b1d85717eff262bcd1cc09

Authored by teemitop
1 parent 52436bf6
build: skipped

m样式调整

Inline Side-by-side
Showing 2 changed files with 3 additions and 6 deletions
@@ -69,7 +69,7 @@ class Seller extends Common @@ -69,7 +69,7 @@ class Seller extends Common
69 $parame = '&page='.$data["page"].'&size='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&channel='.@$data['channel'].'&sid='.$sid.'&time_type='.@$data['time_type']; 69 $parame = '&page='.$data["page"].'&size='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&channel='.@$data['channel'].'&sid='.$sid.'&time_type='.@$data['time_type'];
70 //获取运营人员列表 70 //获取运营人员列表
71 $list= file_get_contents(ON_LINE.'App.Report.GetReserveData'.$parame); 71 $list= file_get_contents(ON_LINE.'App.Report.GetReserveData'.$parame);
72 - 72 +
73 $array = json_decode($list,TRUE); 73 $array = json_decode($list,TRUE);
74 $new_array = array(); 74 $new_array = array();
75 foreach ($array['data'] as $key => $value) { 75 foreach ($array['data'] as $key => $value) {
@@ -62,14 +62,13 @@ @@ -62,14 +62,13 @@
62 title: '预定订单统计', 62 title: '预定订单统计',
63 page:true, 63 page:true,
64 sort:true, 64 sort:true,
65 - cellMinWidth: 30,  
66 toolbar: '#toolbarDemo', 65 toolbar: '#toolbarDemo',
67 cols: [[ 66 cols: [[
68 {checkbox:true,fixed: true}, 67 {checkbox:true,fixed: true},
69 {field: 'id', title: '{:lang("id")}',width:60, fixed: true}, 68 {field: 'id', title: '{:lang("id")}',width:60, fixed: true},
70 {field: 'sellername', title: '商家名称'}, 69 {field: 'sellername', title: '商家名称'},
71 - {field: 'reserve_count_sort', align: 'right', title: '产生预定订单总量', sort: true},  
72 - {field: 'reserve_count', align: 'left', title: '预定订单构成（小程序/座机）'}, 70 + {field: 'reserve_count_sort', align: 'right', title: '预定总量', sort: true},
  71 + {field: 'reserve_count', align: 'left', title: '订单构成（小程序/座机）'},
73 {field: 'sms_send_count_sort', align: 'right',title: '短信发送总量',colspan:1, sort: true}, 72 {field: 'sms_send_count_sort', align: 'right',title: '短信发送总量',colspan:1, sort: true},
74 {field: 'sms_send_count', align: 'left',title: '短信发送构成（小程序/座机）'}, 73 {field: 'sms_send_count', align: 'left',title: '短信发送构成（小程序/座机）'},
75 {field: 'inviting', align: 'center',title: '当前商户通过邀请函拉到的顾客', sort: true}, 74 {field: 'inviting', align: 'center',title: '当前商户通过邀请函拉到的顾客', sort: true},
@@ -85,8 +84,6 @@ @@ -85,8 +84,6 @@
85 } 84 }
86 ,id: 'testReload' 85 ,id: 'testReload'
87 ,page: true 86 ,page: true
88 - ,height: 'full-200'  
89 - ,width:1590  
90 ,limit:20 87 ,limit:20
91 }); 88 });
92 89