|
|
@@ -653,9 +653,9 @@ class Fullorder extends Start_Controller {
|
|
|
{
|
|
|
$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'] == 71 && !empty($value['waybillid'])){
|
|
|
+ $info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz."<p>".$value['waybillid']."</p>";
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if($value['express'] != 0)
|
|
|
@@ -2386,7 +2386,7 @@ class Fullorder extends Start_Controller {
|
|
|
$start = ($page - 1)*$perpage;
|
|
|
}
|
|
|
//取得信息列表
|
|
|
- $info_list = $this->fullorder->find_all($where,'id,shop,type,orderinfo,number,sname,state,buytime,review,libraryconfirm,express,waybill,exstate,orderremarks,library,clientremarks',$order_str,$start,$perpage);
|
|
|
+ $info_list = $this->fullorder->find_all($where,'id,shop,type,orderinfo,number,sname,state,buytime,review,libraryconfirm,express,waybill,exstate,orderremarks,library,clientremarks,waybillid',$order_str,$start,$perpage);
|
|
|
//格式化数据
|
|
|
$dt = 0;
|
|
|
foreach ($info_list as $key=>$value)
|
|
|
@@ -2522,6 +2522,9 @@ class Fullorder extends Start_Controller {
|
|
|
if($value['waybill'] != "")
|
|
|
{
|
|
|
$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)
|
|
|
{
|
