From af79f9be809828401125d56dcab8e1c695a018ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 21 Mar 2023 11:06:07 +0800 Subject: [PATCH 001/117] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8E=E5=8F=B0admin=E4=B9=8B=E5=90=8E=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9B=BE=E7=89=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/activity/live/LiveAnchorServices.php | 4 ++-- crmeb/app/services/agent/AgentLevelServices.php | 4 ++-- crmeb/app/services/article/ArticleCategoryServices.php | 2 +- crmeb/app/services/kefu/service/StoreServiceServices.php | 2 +- crmeb/app/services/order/DeliveryServiceServices.php | 2 +- crmeb/app/services/product/product/StoreCategoryServices.php | 4 ++-- .../services/product/product/StoreProductReplyServices.php | 4 ++-- crmeb/app/services/system/config/SystemConfigServices.php | 4 ++-- crmeb/app/services/system/config/SystemGroupDataServices.php | 4 ++-- crmeb/app/services/system/store/SystemStoreStaffServices.php | 2 +- crmeb/app/services/user/UserLevelServices.php | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/crmeb/app/services/activity/live/LiveAnchorServices.php b/crmeb/app/services/activity/live/LiveAnchorServices.php index 3f067c335..b360ab7cd 100644 --- a/crmeb/app/services/activity/live/LiveAnchorServices.php +++ b/crmeb/app/services/activity/live/LiveAnchorServices.php @@ -75,14 +75,14 @@ class LiveAnchorServices extends BaseServices $field[] = Form::input('name', '主播名称', '')->maxlength(20)->required('请填写名称'); $field[] = Form::input('wechat', '主播微信号', '')->maxlength(32)->required('请填写微信号'); $field[] = Form::input('phone', '主播手机号', '')->maxlength(20)->required('请填写手机号'); - $field[] = Form::frameImage('cover_img', '主播图像', Url::buildUrl('admin/widget.images/index', array('fodder' => 'cover_img')), '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true])->appendValidate(Validate::str()->required('请选择图像')); + $field[] = Form::frameImage('cover_img', '主播图像', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'cover_img')), '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true])->appendValidate(Validate::str()->required('请选择图像')); } else { $title = '修改主播'; $field[] = Form::hidden('id', $anchor->getData('id')); $field[] = Form::input('name', '主播名称', $anchor->getData('name'))->maxlength(20)->required('请填写名称'); $field[] = Form::input('wechat', '主播微信号', $anchor->getData('wechat'))->maxlength(32)->required('请填写微信号'); $field[] = Form::input('phone', '主播手机号', $anchor->getData('phone'))->maxlength(20)->required('请填写手机号'); - $field[] = Form::frameImage('cover_img', '主播图像', Url::buildUrl('admin/widget.images/index', array('fodder' => 'cover_img')), $anchor->getData('cover_img'))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true])->appendValidate(Validate::str()->required('请选择图像')); + $field[] = Form::frameImage('cover_img', '主播图像', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'cover_img')), $anchor->getData('cover_img'))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true])->appendValidate(Validate::str()->required('请选择图像')); } return create_form($title, $field, $this->url('/live/anchor/save'), 'POST'); } diff --git a/crmeb/app/services/agent/AgentLevelServices.php b/crmeb/app/services/agent/AgentLevelServices.php index fe63abc80..7588f7638 100644 --- a/crmeb/app/services/agent/AgentLevelServices.php +++ b/crmeb/app/services/agent/AgentLevelServices.php @@ -262,7 +262,7 @@ class AgentLevelServices extends BaseServices { $field[] = Form::input('name', '等级名称')->maxlength(8)->col(24); $field[] = Form::number('grade', '等级', 0)->min(0)->precision(0); - $field[] = Form::frameImage('image', '背景图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $field[] = Form::frameImage('image', '背景图', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'image')))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); $field[] = Form::number('one_brokerage', '一级上浮', 0)->appendRule('suffix', [ 'type' => 'div', 'class' => 'tips-info', @@ -292,7 +292,7 @@ class AgentLevelServices extends BaseServices $field[] = Form::hidden('id', $id); $field[] = Form::input('name', '等级名称', $levelInfo['name'])->maxlength(8)->col(24); $field[] = Form::number('grade', '等级', $levelInfo['grade'])->min(0)->precision(0); - $field[] = Form::frameImage('image', '背景图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), $levelInfo['image'])->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $field[] = Form::frameImage('image', '背景图', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'image')), $levelInfo['image'])->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); $field[] = Form::number('one_brokerage', '一级上浮', $levelInfo['one_brokerage'])->appendRule('suffix', [ 'type' => 'div', 'class' => 'tips-info', diff --git a/crmeb/app/services/article/ArticleCategoryServices.php b/crmeb/app/services/article/ArticleCategoryServices.php index c275d4598..6b11513f4 100644 --- a/crmeb/app/services/article/ArticleCategoryServices.php +++ b/crmeb/app/services/article/ArticleCategoryServices.php @@ -84,7 +84,7 @@ class ArticleCategoryServices extends BaseServices $f[] = Form::select('pid', '上级分类', (int)($info['pid'] ?? ''))->setOptions($this->menus($pid))->filterable(1); $f[] = Form::input('title', '分类名称', $info['title'] ?? '')->maxlength(20)->required(); $f[] = Form::input('intr', '分类简介', $info['intr'] ?? '')->type('textarea')->required(); - $f[] = Form::frameImage('image', '分类图片', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), $info['image'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $f[] = Form::frameImage('image', '分类图片', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'image')), $info['image'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); $f[] = Form::number('sort', '排序', (int)($info['sort'] ?? 0))->precision(0); $f[] = Form::radio('status', '状态', $info['status'] ?? 1)->options([['value' => 1, 'label' => '显示'], ['value' => 0, 'label' => '隐藏']]); return create_form('添加分类', $f, Url::buildUrl($url), $method); diff --git a/crmeb/app/services/kefu/service/StoreServiceServices.php b/crmeb/app/services/kefu/service/StoreServiceServices.php index b09035215..1fff5a725 100644 --- a/crmeb/app/services/kefu/service/StoreServiceServices.php +++ b/crmeb/app/services/kefu/service/StoreServiceServices.php @@ -91,7 +91,7 @@ class StoreServiceServices extends BaseServices public function createServiceForm(array $formData = []) { if ($formData) { - $field[] = $this->builder->frameImage('avatar', '客服头像', $this->url('admin/widget.images/index', ['fodder' => 'avatar'], true), $formData['avatar'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $field[] = $this->builder->frameImage('avatar', '客服头像', $this->url(config('app.admin_prefix', 'admin') . '/widget.images/index', ['fodder' => 'avatar'], true), $formData['avatar'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); } else { $field[] = $this->builder->frameImage('image', '选择用户', $this->url('admin/system.user/list', ['fodder' => 'image'], true))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true])->Props(['srcKey' => 'image']); $field[] = $this->builder->hidden('uid', 0); diff --git a/crmeb/app/services/order/DeliveryServiceServices.php b/crmeb/app/services/order/DeliveryServiceServices.php index 1ad12c8aa..a04fe051e 100644 --- a/crmeb/app/services/order/DeliveryServiceServices.php +++ b/crmeb/app/services/order/DeliveryServiceServices.php @@ -80,7 +80,7 @@ class DeliveryServiceServices extends BaseServices public function createServiceForm(array $formData = []) { if ($formData) { - $field[] = $this->builder->frameImage('avatar', '配送员头像', $this->url('admin/widget.images/index', ['fodder' => 'avatar'], true), $formData['avatar'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $field[] = $this->builder->frameImage('avatar', '配送员头像', $this->url(config('app.admin_prefix', 'admin') . '/widget.images/index', ['fodder' => 'avatar'], true), $formData['avatar'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); } else { $field[] = $this->builder->frameImage('image', '商城用户', $this->url('admin/system.user/list', ['fodder' => 'image'], true))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true])->Props(['srcKey' => 'image']); $field[] = $this->builder->hidden('uid', 0); diff --git a/crmeb/app/services/product/product/StoreCategoryServices.php b/crmeb/app/services/product/product/StoreCategoryServices.php index a63a57e77..97ab79f0a 100644 --- a/crmeb/app/services/product/product/StoreCategoryServices.php +++ b/crmeb/app/services/product/product/StoreCategoryServices.php @@ -157,8 +157,8 @@ class StoreCategoryServices extends BaseServices $f[] = Form::select('pid', '上级分类', (int)($info['pid'] ?? ''))->setOptions($this->menus())->filterable(1); } $f[] = Form::input('cate_name', '分类名称', $info['cate_name'] ?? '')->maxlength(8)->required(); - $f[] = Form::frameImage('pic', '分类图标(180*180)', Url::buildUrl('admin/widget.images/index', array('fodder' => 'pic')), $info['pic'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); - $f[] = Form::frameImage('big_pic', '分类大图(468*340)', Url::buildUrl('admin/widget.images/index', array('fodder' => 'big_pic')), $info['big_pic'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $f[] = Form::frameImage('pic', '分类图标(180*180)', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'pic')), $info['pic'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $f[] = Form::frameImage('big_pic', '分类大图(468*340)', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'big_pic')), $info['big_pic'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); $f[] = Form::number('sort', '排序', (int)($info['sort'] ?? 0))->min(0)->precision(0); $f[] = Form::radio('is_show', '状态', $info['is_show'] ?? 1)->options([['label' => '显示', 'value' => 1], ['label' => '隐藏', 'value' => 0]]); return $f; diff --git a/crmeb/app/services/product/product/StoreProductReplyServices.php b/crmeb/app/services/product/product/StoreProductReplyServices.php index 4eec92489..73fc4725d 100644 --- a/crmeb/app/services/product/product/StoreProductReplyServices.php +++ b/crmeb/app/services/product/product/StoreProductReplyServices.php @@ -67,12 +67,12 @@ class StoreProductReplyServices extends BaseServices } else { $field[] = Form::hidden('product_id', $product_id); } - $field[] = Form::frameImage('avatar', '用户头像', Url::buildUrl('admin/widget.images/index', array('fodder' => 'avatar')))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $field[] = Form::frameImage('avatar', '用户头像', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'avatar')))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); $field[] = Form::input('nickname', '用户名称')->col(24); $field[] = Form::input('comment', '评价文字')->type('textarea'); $field[] = Form::rate('product_score', '商品分数', 0)->allowHalf(false); $field[] = Form::rate('service_score', '服务分数', 0)->allowHalf(false); - $field[] = Form::frameImages('pics', '评价图片', Url::buildUrl('admin/widget.images/index', array('fodder' => 'pics', 'type' => 'many', 'maxLength' => 8)))->maxLength(8)->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true])->props(['closeBtn' => false, 'okBtn' => false]); + $field[] = Form::frameImages('pics', '评价图片', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'pics', 'type' => 'many', 'maxLength' => 8)))->maxLength(8)->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true])->props(['closeBtn' => false, 'okBtn' => false]); $field[] = Form::dateTime('add_time', '评论时间', '')->placeholder('请选择评论时间(不选择默认当前添加时间)')->style(['width' => '300px']); return create_form('添加虚拟评论', $field, Url::buildUrl('/product/reply/save_fictitious_reply'), 'POST'); } diff --git a/crmeb/app/services/system/config/SystemConfigServices.php b/crmeb/app/services/system/config/SystemConfigServices.php index a476fbbbf..ddffe6169 100644 --- a/crmeb/app/services/system/config/SystemConfigServices.php +++ b/crmeb/app/services/system/config/SystemConfigServices.php @@ -442,7 +442,7 @@ class SystemConfigServices extends BaseServices case 1: $data['value'] = json_decode($data['value'], true) ?: ''; if ($data['value'] != '') $data['value'] = set_file_url($data['value']); - $formbuider[] = $this->builder->frameImage($data['menu_name'], $data['info'], $this->url('admin/widget.images/index', ['fodder' => $data['menu_name']], true), $data['value']) + $formbuider[] = $this->builder->frameImage($data['menu_name'], $data['info'], $this->url(config('app.admin_prefix', 'admin') . '/widget.images/index', ['fodder' => $data['menu_name']], true), $data['value']) ->icon('ios-image')->width('950px')->height('505px')->modal(['footer-hide' => true])->appendRule('suffix', [ 'type' => 'div', 'class' => 'tips-info', @@ -453,7 +453,7 @@ class SystemConfigServices extends BaseServices $data['value'] = json_decode($data['value'], true) ?: []; if ($data['value']) $data['value'] = set_file_url($data['value']); - $formbuider[] = $this->builder->frameImages($data['menu_name'], $data['info'], $this->url('admin/widget.images/index', ['fodder' => $data['menu_name'], 'type' => 'many', 'maxLength' => 5], true), $data['value']) + $formbuider[] = $this->builder->frameImages($data['menu_name'], $data['info'], $this->url(config('app.admin_prefix', 'admin') . '/widget.images/index', ['fodder' => $data['menu_name'], 'type' => 'many', 'maxLength' => 5], true), $data['value']) ->maxLength(5)->icon('ios-images')->width('950px')->height('505px')->modal(['footer-hide' => true]) ->appendRule('suffix', [ 'type' => 'div', diff --git a/crmeb/app/services/system/config/SystemGroupDataServices.php b/crmeb/app/services/system/config/SystemGroupDataServices.php index 17a0d42d3..567adb971 100644 --- a/crmeb/app/services/system/config/SystemGroupDataServices.php +++ b/crmeb/app/services/system/config/SystemGroupDataServices.php @@ -204,7 +204,7 @@ class SystemGroupDataServices extends BaseServices } else { $image = ''; } - $f[] = Form::frameImage($value["title"], $value["name"], $this->url('admin/widget.images/index', ['fodder' => $value["title"], 'big' => 1], true), $image)->icon('ios-image')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $f[] = Form::frameImage($value["title"], $value["name"], $this->url(config('app.admin_prefix', 'admin') . '/widget.images/index', ['fodder' => $value["title"], 'big' => 1], true), $image)->icon('ios-image')->width('950px')->height('505px')->modal(['footer-hide' => true]); break; case 'uploads': if ($fvalue) { @@ -213,7 +213,7 @@ class SystemGroupDataServices extends BaseServices } else { $images = []; } - $f[] = Form::frameImages($value["title"], $value["name"], $this->url('admin/widget.images/index', ['fodder' => $value["title"], 'big' => 1, 'type' => 'many', 'maxLength' => 5], true), $images)->maxLength(5)->icon('ios-images')->width('950px')->height('505px')->modal(['footer-hide' => true])->spin(0); + $f[] = Form::frameImages($value["title"], $value["name"], $this->url(config('app.admin_prefix', 'admin') . '/widget.images/index', ['fodder' => $value["title"], 'big' => 1, 'type' => 'many', 'maxLength' => 5], true), $images)->maxLength(5)->icon('ios-images')->width('950px')->height('505px')->modal(['footer-hide' => true])->spin(0); break; default: $f[] = Form::input($value["title"], $value["name"], $fvalue); diff --git a/crmeb/app/services/system/store/SystemStoreStaffServices.php b/crmeb/app/services/system/store/SystemStoreStaffServices.php index 00b3da23e..12df25b4c 100644 --- a/crmeb/app/services/system/store/SystemStoreStaffServices.php +++ b/crmeb/app/services/system/store/SystemStoreStaffServices.php @@ -101,7 +101,7 @@ class SystemStoreStaffServices extends BaseServices public function createStoreStaffForm(array $formData = []) { if ($formData) { - $field[] = $this->builder->frameImage('image', '更换头像', $this->url('admin/widget.images/index', array('fodder' => 'image'),true), $formData['avatar'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $field[] = $this->builder->frameImage('image', '更换头像', $this->url(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'image'),true), $formData['avatar'] ?? '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); } else { $field[] = $this->builder->frameImage('image', '商城用户', $this->url('admin/system.User/list', ['fodder' => 'image'], true))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true])->Props(['srcKey' => 'image']); } diff --git a/crmeb/app/services/user/UserLevelServices.php b/crmeb/app/services/user/UserLevelServices.php index b022eed59..8a7816972 100644 --- a/crmeb/app/services/user/UserLevelServices.php +++ b/crmeb/app/services/user/UserLevelServices.php @@ -221,8 +221,8 @@ class UserLevelServices extends BaseServices $field[] = Form::number('grade', '等级', isset($vipInfo) ? $vipInfo->grade : 0)->min(0)->precision(0)->col(8)->required(); $field[] = Form::number('discount', '享受折扣', isset($vipInfo) ? $vipInfo->discount : 100)->min(0)->max(100)->col(8)->placeholder('输入折扣数100,代表原价,90代表9折')->required(); $field[] = Form::number('exp_num', '解锁需经验值达到', isset($vipInfo) ? $vipInfo->exp_num : 0)->min(0)->precision(0)->col(8)->required(); - $field[] = Form::frameImage('icon', '图标', Url::buildUrl('admin/widget.images/index', array('fodder' => 'icon')), isset($vipInfo) ? $vipInfo->icon : '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); - $field[] = Form::frameImage('image', '用户等级背景', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), isset($vipInfo) ? $vipInfo->image : '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $field[] = Form::frameImage('icon', '图标', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'icon')), isset($vipInfo) ? $vipInfo->icon : '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); + $field[] = Form::frameImage('image', '用户等级背景', Url::buildUrl(config('app.admin_prefix', 'admin') . '/widget.images/index', array('fodder' => 'image')), isset($vipInfo) ? $vipInfo->image : '')->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); $field[] = Form::radio('is_show', '是否显示', isset($vipInfo) ? $vipInfo->is_show : 0)->options([['label' => '显示', 'value' => 1], ['label' => '隐藏', 'value' => 0]])->col(24); return create_form($msg, $field, Url::buildUrl('/user/user_level'), 'POST'); } From 7feb20435fc3993c29317ac9d40afd39bfd223c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 21 Mar 2023 11:06:58 +0800 Subject: [PATCH 002/117] =?UTF-8?q?=E6=8A=9B=E9=94=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/AdminApiExceptionHandle.php | 2 +- crmeb/app/api/ApiExceptionHandle.php | 2 +- crmeb/app/kefuapi/KefuApiExceptionHandle.php | 2 +- crmeb/app/outapi/OutApiExceptionHandle.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crmeb/app/adminapi/AdminApiExceptionHandle.php b/crmeb/app/adminapi/AdminApiExceptionHandle.php index 91d75b43a..075813bf1 100644 --- a/crmeb/app/adminapi/AdminApiExceptionHandle.php +++ b/crmeb/app/adminapi/AdminApiExceptionHandle.php @@ -84,7 +84,7 @@ class AdminApiExceptionHandle extends Handle 'trace' => $e->getTrace(), 'previous' => $e->getPrevious(), ] : []; - $message = Env::get('app_debug', false) ? $e->getMessage() : '很抱歉,系统开小差了'; + $message = $e->getMessage(); // 添加自定义异常处理机制 if ($e instanceof AuthException || $e instanceof AdminException || $e instanceof ApiException || $e instanceof ValidateException) { return app('json')->make($e->getCode() ?: 400, $message, $massageData); diff --git a/crmeb/app/api/ApiExceptionHandle.php b/crmeb/app/api/ApiExceptionHandle.php index 2326d29ac..094ea1766 100644 --- a/crmeb/app/api/ApiExceptionHandle.php +++ b/crmeb/app/api/ApiExceptionHandle.php @@ -85,7 +85,7 @@ class ApiExceptionHandle extends Handle 'trace' => $e->getTrace(), 'previous' => $e->getPrevious(), ] : []; - $message = Env::get('app_debug', false) ? $e->getMessage() : '很抱歉,系统开小差了'; + $message = $e->getMessage(); // 添加自定义异常处理机制 if ($e instanceof ApiStatusException) { return app('json')->status($e->getApiStatus(), $message, $e->getApiData()); diff --git a/crmeb/app/kefuapi/KefuApiExceptionHandle.php b/crmeb/app/kefuapi/KefuApiExceptionHandle.php index 0d130193f..e2957c43a 100644 --- a/crmeb/app/kefuapi/KefuApiExceptionHandle.php +++ b/crmeb/app/kefuapi/KefuApiExceptionHandle.php @@ -84,7 +84,7 @@ class KefuApiExceptionHandle extends Handle 'trace' => $e->getTrace(), 'previous' => $e->getPrevious(), ] : []; - $message = Env::get('app_debug', false) ? $e->getMessage() : '很抱歉,系统开小差了'; + $message = $e->getMessage(); // 添加自定义异常处理机制 if ($e instanceof AuthException || $e instanceof AdminException || $e instanceof ApiException || $e instanceof ValidateException) { return app('json')->make($e->getCode() ?: 400, $message, $massageData); diff --git a/crmeb/app/outapi/OutApiExceptionHandle.php b/crmeb/app/outapi/OutApiExceptionHandle.php index 6549daf9a..34a78ebb3 100644 --- a/crmeb/app/outapi/OutApiExceptionHandle.php +++ b/crmeb/app/outapi/OutApiExceptionHandle.php @@ -84,7 +84,7 @@ class OutApiExceptionHandle extends Handle 'trace' => $e->getTrace(), 'previous' => $e->getPrevious(), ] : []; - $message = Env::get('app_debug', false) ? $e->getMessage() : '很抱歉,系统开小差了'; + $message = $e->getMessage(); // 添加自定义异常处理机制 if ($e instanceof AuthException || $e instanceof AdminException || $e instanceof ApiException || $e instanceof ValidateException) { return app('json')->make($e->getCode() ?: 400, $message, $massageData); From 5ae976edc634b374af04f156ebfd9bcf30e66380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 21 Mar 2023 15:14:32 +0800 Subject: [PATCH 003/117] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=8B=86=E5=88=86=E7=9A=84=E8=AE=A2=E5=8D=95=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=A0=B8=E9=94=80=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/setting/SystemRole.php | 8 ++++---- crmeb/app/services/order/StoreOrderWriteOffServices.php | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemRole.php b/crmeb/app/adminapi/controller/v1/setting/SystemRole.php index 00af6a6a4..3869f730f 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemRole.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemRole.php @@ -80,12 +80,12 @@ class SystemRole extends AuthController $data['rules'] = implode(',', $data['rules']); if ($id) { if (!$this->services->update($id, $data)) return app('json')->fail(100007); - CacheService::clear(); + $this->services->cacheDriver()->clear(); return app('json')->success(100001); } else { $data['level'] = $this->adminInfo['level'] + 1; if (!$this->services->save($data)) return app('json')->fail(400223); - CacheService::clear(); + $this->services->cacheDriver()->clear(); return app('json')->success(400222); } } @@ -123,7 +123,7 @@ class SystemRole extends AuthController if (!$this->services->delete($id)) return app('json')->fail(100008); else { - CacheService::clear(); + $this->services->cacheDriver()->clear(); return app('json')->success(100002); } } @@ -145,7 +145,7 @@ class SystemRole extends AuthController } $role->status = $status; if ($role->save()) { - CacheService::clear(); + $this->services->cacheDriver()->clear(); return app('json')->success(100001); } else { return app('json')->fail(100007); diff --git a/crmeb/app/services/order/StoreOrderWriteOffServices.php b/crmeb/app/services/order/StoreOrderWriteOffServices.php index 788bedcc2..aeb21b058 100644 --- a/crmeb/app/services/order/StoreOrderWriteOffServices.php +++ b/crmeb/app/services/order/StoreOrderWriteOffServices.php @@ -49,7 +49,13 @@ class StoreOrderWriteOffServices extends BaseServices */ public function writeOffOrder(string $code, int $confirm, int $uid = 0) { - $orderInfo = $this->dao->getOne(['verify_code' => $code, 'paid' => 1, 'refund_status' => 0, 'is_del' => 0]); + $orderInfo = $this->dao->getOne([ + ['verify_code', '=', $code], + ['paid', '=', 1], + ['refund_status', '=', 0], + ['is_del', '=', 0], + ['pid', '>=', 0] + ]); if (!$orderInfo) { throw new ApiException(410173); } From 676ce022c405093eb1a01bb618f3430d1e05d3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 21 Mar 2023 15:41:14 +0800 Subject: [PATCH 004/117] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/Common.php | 10 +++++----- .../controller/v1/setting/SystemNotification.php | 10 ++-------- crmeb/app/api/controller/pc/PublicController.php | 1 + .../api/controller/v1/order/StoreOrderController.php | 4 +--- .../api/controller/v1/user/UserRechargeController.php | 2 +- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/crmeb/app/adminapi/controller/Common.php b/crmeb/app/adminapi/controller/Common.php index 6c04e3142..eacdd4181 100644 --- a/crmeb/app/adminapi/controller/Common.php +++ b/crmeb/app/adminapi/controller/Common.php @@ -60,7 +60,7 @@ class Common extends AuthController $res = $res ? json_decode($res, true) : []; //兼容test. - if ($res['data']['status'] !== 1) { + if (!isset($res['data']['status']) || $res['data']['status'] !== 1) { $host = str_replace('test.', '', $host); $res = HttpService::request('http://authorize.crmeb.net/api/auth_cert_query', 'post', [ 'domain_name' => $host, @@ -71,7 +71,7 @@ class Common extends AuthController } //如果是主域名兼容www. - if ($res['data']['status'] !== 1) { + if (!isset($res['data']['status']) || $res['data']['status'] !== 1) { $host = str_replace('www.', '', $host); $res = HttpService::request('http://authorize.crmeb.net/api/auth_cert_query', 'post', [ 'domain_name' => $host, @@ -82,9 +82,9 @@ class Common extends AuthController } //升级状态 - /** @var UpgradeServices $upgradeServices */ - $upgradeServices = app()->make(UpgradeServices::class); - $upgradeStatus = $upgradeServices->getUpgradeStatus(); +// /** @var UpgradeServices $upgradeServices */ +// $upgradeServices = app()->make(UpgradeServices::class); +// $upgradeStatus = $upgradeServices->getUpgradeStatus(); $status = $res['data']['status'] ?? -9; switch ((int)$status) { diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemNotification.php b/crmeb/app/adminapi/controller/v1/setting/SystemNotification.php index 1f9dfa2d6..4b9d8571e 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemNotification.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemNotification.php @@ -91,10 +91,7 @@ class SystemNotification extends AuthController if ($data['mark'] == 'verify_code') $data['type'] = 'is_sms'; if (!$data['id']) return app('json')->fail(100100); if ($this->services->saveData($data)) { - CacheService::delete('NOTICE_SMS_' . $data['mark']); - CacheService::delete('wechat_' . $data['mark']); - CacheService::delete('routine_' . $data['mark']); - CacheService::delete('TEMP_IDS_LIST'); + CacheService::clear(); return app('json')->success(100001); } else { return app('json')->fail(100007); @@ -117,10 +114,7 @@ class SystemNotification extends AuthController if ($type == '' || $status == '' || $id == 0) return app('json')->fail(100100); $this->services->update($id, [$type => $status]); $res = $this->services->getOneNotce(['id' => $id]); - CacheService::delete('NOTICE_SMS_' . $res->mark); - CacheService::delete('wechat_' . $res->mark); - CacheService::delete('routine_' . $res->mark); - CacheService::delete('TEMP_IDS_LIST'); + CacheService::clear(); return app('json')->success(100014); } } diff --git a/crmeb/app/api/controller/pc/PublicController.php b/crmeb/app/api/controller/pc/PublicController.php index a7405a5eb..a27240474 100644 --- a/crmeb/app/api/controller/pc/PublicController.php +++ b/crmeb/app/api/controller/pc/PublicController.php @@ -50,6 +50,7 @@ class PublicController $data['site_name'] = sys_config('site_name'); $data['site_keywords'] = sys_config('site_keywords'); $data['site_description'] = sys_config('site_description'); + $data['network_security'] = sys_config('network_security'); $logoUrl = sys_config('pc_logo'); if (strstr($logoUrl, 'http') === false && $logoUrl) { $logoUrl = sys_config('site_url') . $logoUrl; diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index f632e69c5..3c1087e5d 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -168,7 +168,7 @@ class StoreOrderController $userInfo = $request->user()->toArray(); if ($checkOrder = $this->services->getOne(['order_id|unique' => $key, 'uid' => $userInfo['uid'], 'is_del' => 0])) return app('json')->status('extend_order', 410209, ['orderId' => $checkOrder['order_id'], 'key' => $key]); - [$addressId, $couponId, $payType, $useIntegral, $mark, $combinationId, $pinkId, $seckillId, $bargainId, $shipping_type, $real_name, $phone, $storeId, $news, $invoice_id, $quitUrl, $advanceId, $virtual_type, $customForm] = $request->postMore([ + [$addressId, $couponId, $payType, $useIntegral, $mark, $combinationId, $pinkId, $seckillId, $bargainId, $shipping_type, $real_name, $phone, $storeId, $news, $invoice_id, $advanceId, $customForm] = $request->postMore([ [['addressId', 'd'], 0], [['couponId', 'd'], 0], ['payType', ''], @@ -184,9 +184,7 @@ class StoreOrderController [['store_id', 'd'], 0], ['new', 0], [['invoice_id', 'd'], 0], - ['quitUrl', ''], [['advanceId', 'd'], 0], - ['virtual_type', 0], ['custom_form', []], ], true); $payType = strtolower($payType); diff --git a/crmeb/app/api/controller/v1/user/UserRechargeController.php b/crmeb/app/api/controller/v1/user/UserRechargeController.php index 57302764d..3c4be9601 100644 --- a/crmeb/app/api/controller/v1/user/UserRechargeController.php +++ b/crmeb/app/api/controller/v1/user/UserRechargeController.php @@ -53,7 +53,7 @@ class UserRechargeController $uid = (int)$request->uid(); $re = $this->services->recharge($uid, $price, $recharId, $type, $from, true); if ($re) { - $payType = $re['pay_type']; + $payType = $re['pay_type'] ?? ''; unset($re['pay_type']); return app('json')->status($payType, 410125, $re); } From de40de4f171ada01f1d276dbd524a0e9db7af858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 21 Mar 2023 16:27:29 +0800 Subject: [PATCH 005/117] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/common.php | 1 + 1 file changed, 1 insertion(+) diff --git a/crmeb/app/common.php b/crmeb/app/common.php index 3c3a4e6cb..ac7806836 100644 --- a/crmeb/app/common.php +++ b/crmeb/app/common.php @@ -564,6 +564,7 @@ if (!function_exists('put_image')) { //文件保存路径 ob_start(); + $url = str_replace('phar://', '', $url); readfile($url); $img = ob_get_contents(); ob_end_clean(); From 2bd4d77a6f1744517eab92f4fd88b2f6e15c3102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 21 Mar 2023 17:01:01 +0800 Subject: [PATCH 006/117] =?UTF-8?q?=E4=BF=AE=E6=94=B9base64=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit df6cf097b3e3844c416da763b05791454fe9a884) --- crmeb/app/api/controller/v1/PublicController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crmeb/app/api/controller/v1/PublicController.php b/crmeb/app/api/controller/v1/PublicController.php index cd5c8689a..7581def83 100644 --- a/crmeb/app/api/controller/v1/PublicController.php +++ b/crmeb/app/api/controller/v1/PublicController.php @@ -305,10 +305,10 @@ class PublicController ['image', ''], ['code', ''], ], true); - if ($imageUrl !== '' && !preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $imageUrl)) { + if ($imageUrl !== '' && !preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $imageUrl) && strpos($imageUrl, "phar://") !== false) { return app('json')->success(['code' => false, 'image' => false]); } - if ($codeUrl !== '' && !(preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $codeUrl) || strpos($codeUrl, 'https://mp.weixin.qq.com/cgi-bin/showqrcode') !== false)) { + if ($codeUrl !== '' && !(preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $codeUrl) || strpos($codeUrl, 'https://mp.weixin.qq.com/cgi-bin/showqrcode') !== false) && strpos($codeUrl, "phar://") !== false) { return app('json')->success(['code' => false, 'image' => false]); } try { From 09ecf94e5ece0274b29fa8d0d975a5d3bb98f76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Wed, 15 Mar 2023 17:37:22 +0800 Subject: [PATCH 007/117] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9D=E6=94=AF=E4=BB=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6f984c5f3a6f460ae9704b37dcd2914c5f8818bc) --- crmeb/app/api/controller/v1/order/StoreOrderController.php | 2 +- crmeb/app/services/order/StoreOrderCreateServices.php | 6 +++--- crmeb/app/services/order/StoreOrderServices.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index 3c1087e5d..00bc73fd4 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -260,7 +260,7 @@ class StoreOrderController } //重新生成订单号去支付 - $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id']; +// $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id']; //0元支付 if (bcsub((string)$orderInfo['pay_price'], '0', 2) <= 0) { diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php index 40d6edcf4..c9afb8baa 100644 --- a/crmeb/app/services/order/StoreOrderCreateServices.php +++ b/crmeb/app/services/order/StoreOrderCreateServices.php @@ -75,11 +75,11 @@ class StoreOrderCreateServices extends BaseServices $id = $snowflake->setStartTimeStamp(strtotime('2022-01-01') * 1000)->id(); } $replace = ''; - $chars = 'abcdefghijklmnopqrstuvwxyz0123456789'; - for ($i = 0; $i < 3; $i++) { + $chars = '0123456789'; + for ($i = 0; $i < 6; $i++) { $replace .= $chars[mt_rand(0, strlen($chars) - 1)]; } - $id = substr_replace($id, $replace, -3); + $id = substr_replace($id, $replace, -6); } else { $is_callable = function ($currentTime) { $redis = Cache::store('redis'); diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index cfb69597c..d3d3f0ba3 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -768,7 +768,7 @@ HTML; } /** @var StoreOrderCreateServices $createServices */ $createServices = app()->make(StoreOrderCreateServices::class); - $data['order_id'] = $createServices->getNewOrderId(); + $data['order_id'] = $createServices->getNewOrderId('cp'); /** @var StoreOrderStatusServices $services */ $services = app()->make(StoreOrderStatusServices::class); return $this->transaction(function () use ($id, $data, $services) { From d45876ea827fe4429771b17fc1574a04b4b3021b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Thu, 16 Mar 2023 12:28:27 +0800 Subject: [PATCH 008/117] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=AB=AF=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 739ff267bdedbe0233af8b68b9b37f834be3c5cd) --- crmeb/app/api/controller/v1/order/StoreOrderController.php | 1 + crmeb/app/services/order/StoreOrderCreateServices.php | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index 00bc73fd4..7f5b7eb90 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -247,6 +247,7 @@ class StoreOrderController if (!$uni) return app('json')->fail(100100); $orderInfo = $this->services->get(['order_id' => $uni]); $uid = $type == 1 ? (int)$request->uid() : $orderInfo->uid; + $orderInfo->is_channel = $this->getChennel[$request->getFromType()] ?? ($request->isApp() ? 0 : 1); $orderInfo->pay_uid = $uid; $orderInfo->save(); $orderInfo = $orderInfo->toArray(); diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php index c9afb8baa..f763de543 100644 --- a/crmeb/app/services/order/StoreOrderCreateServices.php +++ b/crmeb/app/services/order/StoreOrderCreateServices.php @@ -281,8 +281,6 @@ class StoreOrderCreateServices extends BaseServices } /** @var StoreOrderCartInfoServices $cartServices */ $cartServices = app()->make(StoreOrderCartInfoServices::class); - /** @var StoreSeckillServices $seckillServices */ - $seckillServices = app()->make(StoreSeckillServices::class); $priceData['coupon_id'] = $couponId; $order = $this->transaction(function () use ($cartIds, $orderInfo, $cartInfo, $key, $userInfo, $useIntegral, $priceData, $combinationId, $seckillId, $bargainId, $cartServices, $seckillServices, $uid, $addressId, $advanceId) { //创建订单 From e43a6060fd8a9b028a376a4e41d5d276272541bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Mon, 20 Mar 2023 15:54:51 +0800 Subject: [PATCH 009/117] =?UTF-8?q?=E6=9C=AA=E6=94=AF=E4=BB=98=E7=9A=84?= =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9F=A5=E7=9C=8B=E6=8B=BC=E5=9B=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 89587edd5513b31eda7438d06cf53f194d1fdfc1) --- template/uni-app/pages/goods/order_details/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue index faa47261b..7e2fe43ee 100644 --- a/template/uni-app/pages/goods/order_details/index.vue +++ b/template/uni-app/pages/goods/order_details/index.vue @@ -359,7 +359,7 @@ hover-class='none' :url="'/pages/goods/goods_logistics/index?orderId='+ orderInfo.order_id"> {{$t(`查看物流`)}} - {{$t(`查看拼团`)}} From 6cd584ffad582796d6d9469d885e5e6843c5c06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Wed, 22 Mar 2023 16:45:30 +0800 Subject: [PATCH 010/117] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=94=B6?= =?UTF-8?q?=E9=93=B6=E5=8F=B0=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/v1/order/StoreOrderController.php | 5 ++++- crmeb/app/services/order/StoreOrderServices.php | 11 ++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index 7f5b7eb90..f27603e93 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -211,9 +211,13 @@ class StoreOrderController } /** + * @param Request $request * @param $orderId * @param string $type * @return \think\Response + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException * @author 等风来 * @email 136327134@qq.com * @date 2023/2/13 @@ -223,7 +227,6 @@ class StoreOrderController if (!$orderId) { return app('json')->fail(100100); } - return app('json')->success($this->services->getCashierInfo((int)$request->uid(), $orderId, $type)); } diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index d3d3f0ba3..1d653a599 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -2599,6 +2599,7 @@ HTML; } /** + * @param int $uid * @param string $orderId * @param string $type * @return array @@ -2630,14 +2631,14 @@ HTML; if (!$info) { throw new PayException('您支付的订单不存在'); } - $orderCancelTime = (int)sys_config('order_cancel_time', 0); - $orderActivityTime = (int)sys_config('order_activity_time', 0); + $orderCancelTime = sys_config('order_cancel_time', 0); + $orderActivityTime = sys_config('order_activity_time', 0); if ($info->combination_id) { - $time = ((int)sys_config('order_pink_time', 0) ?: $orderActivityTime) * 60 * 60 + ((int)$info->add_time); + $time = (sys_config('order_pink_time', 0) ?: $orderActivityTime) * 60 * 60 + ((int)$info->add_time); } else if ($info->seckill_id) { - $time = ((int)sys_config('order_seckill_time', 0) ?: $orderActivityTime) * 60 * 60 + ((int)$info->add_time); + $time = (sys_config('order_seckill_time', 0) ?: $orderActivityTime) * 60 * 60 + ((int)$info->add_time); } else if ($info->bargain_id) { - $time = ((int)sys_config('order_bargain_time', 0) ?: $orderActivityTime) * 60 * 60 + ((int)$info->add_time); + $time = (sys_config('order_bargain_time', 0) ?: $orderActivityTime) * 60 * 60 + ((int)$info->add_time); } else { $time = $orderCancelTime * 60 * 60 + ((int)$info->add_time); } From d18c15bb5306ab7dd9e9381f93fa333df93ab790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Wed, 22 Mar 2023 16:45:54 +0800 Subject: [PATCH 011/117] =?UTF-8?q?diy=E9=80=89=E6=8B=A9=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/dao/article/ArticleCategoryDao.php | 1 - 1 file changed, 1 deletion(-) diff --git a/crmeb/app/dao/article/ArticleCategoryDao.php b/crmeb/app/dao/article/ArticleCategoryDao.php index 83e181126..9abee485c 100644 --- a/crmeb/app/dao/article/ArticleCategoryDao.php +++ b/crmeb/app/dao/article/ArticleCategoryDao.php @@ -73,7 +73,6 @@ class ArticleCategoryDao extends BaseDao ->where('hidden', 0) ->where('is_del', 0) ->where('status', 1) - ->where('pid', '>', 0) ->order('sort DESC') ->field('id,pid,title') ->select()->toArray(); From b0229be95314854d20584edea63cedbb978a17ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Wed, 22 Mar 2023 16:46:15 +0800 Subject: [PATCH 012/117] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/order/StoreOrderCreateServices.php | 2 +- crmeb/app/services/product/product/StoreProductServices.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php index f763de543..8686d5f38 100644 --- a/crmeb/app/services/order/StoreOrderCreateServices.php +++ b/crmeb/app/services/order/StoreOrderCreateServices.php @@ -282,7 +282,7 @@ class StoreOrderCreateServices extends BaseServices /** @var StoreOrderCartInfoServices $cartServices */ $cartServices = app()->make(StoreOrderCartInfoServices::class); $priceData['coupon_id'] = $couponId; - $order = $this->transaction(function () use ($cartIds, $orderInfo, $cartInfo, $key, $userInfo, $useIntegral, $priceData, $combinationId, $seckillId, $bargainId, $cartServices, $seckillServices, $uid, $addressId, $advanceId) { + $order = $this->transaction(function () use ($cartIds, $orderInfo, $cartInfo, $key, $userInfo, $useIntegral, $priceData, $combinationId, $seckillId, $bargainId, $cartServices, $uid, $addressId, $advanceId) { //创建订单 $order = $this->dao->save($orderInfo); if (!$order) { diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php index 3ac57dfb6..1de8d206b 100644 --- a/crmeb/app/services/product/product/StoreProductServices.php +++ b/crmeb/app/services/product/product/StoreProductServices.php @@ -654,7 +654,7 @@ class StoreProductServices extends BaseServices //采集商品下载图片 if ($type == -1) { - $s_image_down = $d_image_down = []; + $s_image_down = []; //下载商品轮播图 foreach ($slider_image as $s_image) { if (sys_config('queue_open', 0) == 1) { @@ -671,8 +671,7 @@ class StoreProductServices extends BaseServices if (sys_config('queue_open', 0) == 1) { ProductCopyJob::dispatch('copyDescriptionImage', [$res->id, $description, $d_image, count($match[1])]); } else { - if (!is_int(strpos($d_image, 'http'))) $d_image = 'http://' . ltrim($d_image, '\//'); - $d_image_down[] = $d_img = app()->make(CopyTaobaoServices::class)->downloadCopyImage($d_image); + $d_img = app()->make(CopyTaobaoServices::class)->downloadCopyImage(!is_int(strpos($d_image, 'http')) ? 'http://' . ltrim($d_image, '\//') : $d_image); $description = str_replace($d_image, $d_img, $description); } } From c93b64d931c9b0188781672102193e5a711711b6 Mon Sep 17 00:00:00 2001 From: From-wh Date: Wed, 22 Mar 2023 17:42:06 +0800 Subject: [PATCH 013/117] =?UTF-8?q?style:=20=E5=AE=A2=E6=9C=8D=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/kefu/mobile/chat_list.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/admin/src/pages/kefu/mobile/chat_list.vue b/template/admin/src/pages/kefu/mobile/chat_list.vue index 682aa1727..fa691c710 100644 --- a/template/admin/src/pages/kefu/mobile/chat_list.vue +++ b/template/admin/src/pages/kefu/mobile/chat_list.vue @@ -2,7 +2,7 @@
-
+
{{ kefuInfo.nickname }}
@@ -45,7 +45,7 @@
-
+
@@ -351,7 +351,7 @@ export default { padding: 0 .3rem; background: linear-gradient(90deg, #3875EA 0%, #1890FC 100%); - .left-wrapper { + .left-wrappers { position: relative; display: flex; align-items: center; @@ -488,7 +488,7 @@ export default { padding: .23rem .3rem; height: 1.5rem; - .left-wrapper { + .left-wrappers { display: flex; align-items: center; .img-box{ From 9dfa98d710ea43962b82994348c6af2c402a8195 Mon Sep 17 00:00:00 2001 From: From-wh Date: Wed, 22 Mar 2023 17:42:23 +0800 Subject: [PATCH 014/117] =?UTF-8?q?style:=20=E6=B8=A0=E9=81=93=E7=A0=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../channelCode/channelCodeIndex.vue | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue index 82084aaaa..b039591d2 100644 --- a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue +++ b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue @@ -86,7 +86,11 @@