bingyi/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2026-07-06 05:42:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

v6.0

Browse Source
This commit is contained in:
gongfuxiang
2024-04-15 10:25:01 +08:00
parent 774ca894ea
commit bbf5906e20
596 changed files with 25192 additions and 9384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/admin/controller/Order.php
View File

@ -37,8 +37,6 @@ class Order extends Base
{
// 模板数据
$assign = [
// 快递公司
'express_list' => ExpressService::ExpressList(),
// 默认不加载视频扫码组件
'is_load_video_scan' => 1,
];
@ -70,6 +68,21 @@ class Order extends Base
return MyView();
}
/**
* 发货页面
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2018-09-28
* @desc description
*/
public function DeliveryInfo()
{
// 快递公司
MyViewAssign('express_list', ExpressService::ExpressList());
return MyView();
}
/**
* 订单删除
* @author Devil
@ -176,6 +189,9 @@ class Order extends Base
{
$params = $this->data_request;
$params['admin'] = $this->admin;
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
$params['user_type'] = 'admin';
return ApiService::ApiDataReturn(OrderService::OrderPaymentUnderLinePay($params));
}
}