|
|
@@ -551,10 +551,11 @@ class Returns extends Start_Controller {
|
|
|
{
|
|
|
$where .= " and torderinfo = '$torderinfo'";
|
|
|
}
|
|
|
- $info_list = $this->returns->find_all($where.$wid,'orderinfo,number,name,express,torderinfo,ftime,stime,ret_regist_no,goods,received,degreetext','time desc');
|
|
|
+ $info_list = $this->returns->find_all($where.$wid,'region,orderinfo,number,name,express,torderinfo,ftime,stime,ret_regist_no,goods,received,degreetext','time desc');
|
|
|
//格式化数据
|
|
|
foreach ($info_list as $key=>$value)
|
|
|
{
|
|
|
+ $info_list[$key]['region'] = ($value['region'] == 1)?"国内":"美国店";
|
|
|
$info_list[$key]['ftime'] = ($value['ftime'] > 0)?date('Y-m-d H:i:s',$value['ftime']):'';
|
|
|
$info_list[$key]['stime'] = ($value['stime'] > 0)?date('Y-m-d H:i:s',$value['stime']):'';
|
|
|
if($value['degreetext'] == '' || $value['degreetext'] == 'undefined-|')
|
|
|
@@ -598,6 +599,7 @@ class Returns extends Start_Controller {
|
|
|
$title = '退货登记'.date('Y-m-d',$timetk).'-'.date('Y-m-d',$timetj);
|
|
|
$titlename = "<table border=1>
|
|
|
<tr>
|
|
|
+ <td>收货地址</td>
|
|
|
<td>订单号</td>
|
|
|
<td>编号</td>
|
|
|
<td>姓名</td>
|
