diff --git a/app/admin/controller/BirdController.php b/app/admin/controller/BirdController.php index 727e1ef..0d5c4eb 100644 --- a/app/admin/controller/BirdController.php +++ b/app/admin/controller/BirdController.php @@ -110,9 +110,9 @@ class BirdController extends AdminBaseController if(!empty($result['Order']['LogisticCode'])){ $indentModel->updateData(['id'=>$indent_id],['logistic_code'=>$result['Order']['LogisticCode']]); } - return dump(['code'=>20000,'msg'=>'SUCCESS','data'=>$result]);//返回快递单号 + return json_encode(['code'=>20000,'msg'=>'SUCCESS','data'=>$result]);//返回快递单号 } else { - return dump(['code'=>40000,'msg'=>$result['Reason']]); + return json_encode(['code'=>40000,'msg'=>$result['Reason']]); } } diff --git a/public/themes/admin_simpleboot3/admin/orderscourier/order_list.html b/public/themes/admin_simpleboot3/admin/orderscourier/order_list.html index 3c56c22..dcb204b 100644 --- a/public/themes/admin_simpleboot3/admin/orderscourier/order_list.html +++ b/public/themes/admin_simpleboot3/admin/orderscourier/order_list.html @@ -60,7 +60,7 @@ <td>已完成</td> </if> <td>{$vo.create_time|date="Y-m-d H:i:s",###}</td> - <td style="width: 171px;"> + <td style="width: 171px;" class="fahuo{$vo.id}"> <if condition="$vo.state eq 2"> <button type="button" class="btn btn-default">物流信息</button> <else/> @@ -68,7 +68,7 @@ </if> <if condition="$vo.state eq 2"> - <button type="button" class="btn btn-default" onclick="deliver_goods({$vo.id})">待发货</button> + <button type="button" class="btn btn-default daifa{$vo.id}" onclick="deliver_goods({$vo.id})" >待发货</button> <else/> <button type="button" class="btn btn-default">已发货</button> </if> @@ -100,6 +100,8 @@ }else{ data = JSON.parse(data); if(data.code == '20000'){ + $('.daifa'+id).remove(); + $('.fahuo'+id).append("<button type='button' class='btn btn-default'>已发货</button>"); alert('发货成功'); }else if(data.code == '40000'){ alert('发货失败'); diff --git a/public/themes/simpleboot3/public/assets/css/base.css b/public/themes/simpleboot3/public/assets/css/base.css index cdf6cf5..8110141 100755 --- a/public/themes/simpleboot3/public/assets/css/base.css +++ b/public/themes/simpleboot3/public/assets/css/base.css @@ -618,6 +618,10 @@ body { display: flex; display: -webkit-flex; flex-wrap: wrap-reverse; + -webkit-flex-wrap: wrap-reverse; + -moz-flex-wrap: wrap-reverse; + -ms-flex-wrap: wrap-reverse; + -o-flex-wrap: wrap-reverse; } .de_main2_2 ul li {