github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 22:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

Browse Source
This commit is contained in:
From-wh 2023-03-29 15:59:12 +08:00
commit ab5d4b3eec
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crmeb/app/adminapi/controller/v1/product/StoreCategory.php
View File

@ -57,7 +57,11 @@ class StoreCategory extends AuthController
/**
* 商品分类搜索
* @param $type
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function tree_list($type)
{
@ -103,6 +107,9 @@ class StoreCategory extends AuthController
/**
* 保存新增分类
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function save()
{
@ -133,6 +140,9 @@ class StoreCategory extends AuthController
* 更新分类
* @param $id
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function update($id)
{

2
crmeb/app/services/order/StoreOrderServices.php
View File

@ -2638,7 +2638,7 @@ HTML;
$data['pay_price'] = $info['pay_price'];
$data['pay_postage'] = $info['pay_postage'];
$data['offline_postage'] = sys_config('offline_postage', 0);
$data['offline_postage'] = (int)sys_config('offline_postage', 0);
$data['invalid_time'] = $time;
break;

2
template/admin/src/pages/marketing/live/add_goods.vue
View File

@ -106,7 +106,7 @@ export default {
columns1: [
{ key: 'id', title: '商品ID' },
{ slot: 'img', title: '商品信息' },
{ slot: 'price', title: '直播售价' },
{ key: 'price', title: '直播售价' },
// {
// key: 'price',
// title: '直播售价',