|
@@ -2287,7 +2287,7 @@ class Fullordertt extends Start_Controller {
|
|
$start = ($page - 1)*$perpage;
|
|
$start = ($page - 1)*$perpage;
|
|
}
|
|
}
|
|
//取得信息列表
|
|
//取得信息列表
|
|
- $info_list = $this->fullordertt->find_all($where,'id,shop,type,orderinfo,number,sname,state,dtime,review,libraryconfirm,express,waybill,exstate,orderremarks,library,clientremarks',$order_str,$start,$perpage);
|
|
|
|
|
|
+ $info_list = $this->fullordertt->find_all($where,'id,shop,type,orderinfo,number,sname,state,dtime,review,libraryconfirm,express,waybill,exstate,orderremarks,library,clientremarks,waybillid',$order_str,$start,$perpage);
|
|
//格式化数据
|
|
//格式化数据
|
|
$dt = 0;
|
|
$dt = 0;
|
|
foreach ($info_list as $key=>$value)
|
|
foreach ($info_list as $key=>$value)
|
|
@@ -2423,6 +2423,10 @@ class Fullordertt extends Start_Controller {
|
|
if($value['waybill'] != "")
|
|
if($value['waybill'] != "")
|
|
{
|
|
{
|
|
$info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz;
|
|
$info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz;
|
|
|
|
+ if($value['express'] == 71 && !empty($value['waybillid'])){
|
|
|
|
+ $info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz."<p>".$value['waybillid']."</p>";
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
if($value['express'] != 0)
|
|
if($value['express'] != 0)
|
|
{
|
|
{
|
|
@@ -2460,6 +2464,7 @@ class Fullordertt extends Start_Controller {
|
|
{
|
|
{
|
|
$info_list[$key]['orderremarks'] = '<p>'.$value['orderremarks'].'</p><p style="border-top: 1px dashed #C2C2C2;">author_id:</p><p>'.$ud['authorid'].'</p><p>source_content_id:</p><p>'.$ud['sourcecontentid'].'</p>';
|
|
$info_list[$key]['orderremarks'] = '<p>'.$value['orderremarks'].'</p><p style="border-top: 1px dashed #C2C2C2;">author_id:</p><p>'.$ud['authorid'].'</p><p>source_content_id:</p><p>'.$ud['sourcecontentid'].'</p>';
|
|
}
|
|
}
|
|
|
|
+ unset($info_list[$key]['waybillid']);
|
|
}
|
|
}
|
|
$total = $this->fullordertt->find_count($where);
|
|
$total = $this->fullordertt->find_count($where);
|
|
$pagenum = ceil($total/$perpage);
|
|
$pagenum = ceil($total/$perpage);
|