diff --git a/crmeb/app/api/controller/v1/store/CategoryController.php b/crmeb/app/api/controller/v1/store/CategoryController.php index 5dae06de1..110c89b30 100644 --- a/crmeb/app/api/controller/v1/store/CategoryController.php +++ b/crmeb/app/api/controller/v1/store/CategoryController.php @@ -40,13 +40,14 @@ class CategoryController } /** + * @return mixed * @author 等风来 * @email 136327134@qq.com * @date 2022/11/11 - * @return mixed */ public function getCategoryVersion() { - return app('json')->success(['version' => $this->services->getCategoryVersion()]); + $data = $this->services->getCategoryVersion(); + return app('json')->success(['version' => $data['version'], 'is_diy' => $data['is_diy']]); } } diff --git a/crmeb/app/api/controller/v2/PublicController.php b/crmeb/app/api/controller/v2/PublicController.php index 57d80e5b6..241aa063e 100644 --- a/crmeb/app/api/controller/v2/PublicController.php +++ b/crmeb/app/api/controller/v2/PublicController.php @@ -85,8 +85,8 @@ class PublicController { /** @var DiyServices $diyService */ $diyService = app()->make(DiyServices::class); - $version = $diyService->getDiyVersion((int)$id); - return app('json')->success(['version' => $version ?: '']); + $data = $diyService->getDiyVersion((int)$id); + return app('json')->success(['version' => $data['version'] ?: '', 'is_diy' => $data['is_diy']]); } /** diff --git a/crmeb/app/services/diy/DiyServices.php b/crmeb/app/services/diy/DiyServices.php index fc4c9dccd..c48dda153 100644 --- a/crmeb/app/services/diy/DiyServices.php +++ b/crmeb/app/services/diy/DiyServices.php @@ -147,11 +147,11 @@ class DiyServices extends BaseServices { if ($id) { return $this->cacheDriver()->remember('index_diy_' . $id, function () use ($id) { - return $this->dao->value(['id' => $id], 'version'); + return $this->dao->getOne(['id' => $id], 'version,is_diy'); }); } else { return $this->cacheDriver()->remember('index_diy_default', function () { - return $this->dao->value(['status' => 1, 'is_del' => 0], 'version'); + return $this->dao->getOne(['status' => 1, 'is_del' => 0], 'version,is_diy'); }); } } diff --git a/crmeb/app/services/pay/OrderPayServices.php b/crmeb/app/services/pay/OrderPayServices.php index 7a02c93fe..4e36f12f9 100644 --- a/crmeb/app/services/pay/OrderPayServices.php +++ b/crmeb/app/services/pay/OrderPayServices.php @@ -198,7 +198,7 @@ class OrderPayServices break; case PayServices::ALLIN_PAY: if (request()->isWechat()) { - $jsConfig['pay_url'] = AllinPay::UNITODER_H5UNIONPAY; + $payUrl = AllinPay::UNITODER_H5UNIONPAY; } break; case PayServices::WEIXIN_PAY: @@ -207,6 +207,6 @@ class OrderPayServices } } - return ['jsConfig' => $jsConfig, 'order_id' => $order['order_id'], 'pay_key' => $payKey]; + return ['jsConfig' => $jsConfig, 'order_id' => $order['order_id'], 'pay_key' => $payKey, 'pay_url' => $payUrl ?? '']; } } diff --git a/crmeb/app/services/product/product/StoreCategoryServices.php b/crmeb/app/services/product/product/StoreCategoryServices.php index 3c6374fc3..d7bde1e0c 100644 --- a/crmeb/app/services/product/product/StoreCategoryServices.php +++ b/crmeb/app/services/product/product/StoreCategoryServices.php @@ -14,6 +14,7 @@ namespace app\services\product\product; use app\dao\product\product\StoreCategoryDao; use app\services\BaseServices; +use app\services\diy\DiyServices; use crmeb\exceptions\AdminException; use crmeb\services\CacheService; use crmeb\services\FormBuilder as Form; @@ -214,6 +215,12 @@ class StoreCategoryServices extends BaseServices * 保存修改数据 * @param $id * @param $data + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 吴汐 + * @email 442384644@qq.com + * @date 2023/02/23 */ public function editData($id, $data) { @@ -267,7 +274,10 @@ class StoreCategoryServices extends BaseServices public function getCategoryVersion() { return $this->cacheDriver()->remember('category_version', function () { - return uniqid(); + return [ + 'is_diy' => app()->make(DiyServices::class)->value(['status' => 1], 'is_diy'), + 'version' => uniqid() + ]; }); } @@ -275,6 +285,12 @@ class StoreCategoryServices extends BaseServices * 获取指定id下的分类,一=以数组形式返回 * @param string $cateIds * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 吴汐 + * @email 442384644@qq.com + * @date 2023/02/23 */ public function getCateArray(string $cateIds) { @@ -283,7 +299,14 @@ class StoreCategoryServices extends BaseServices /** * 前台分类列表 - * @return bool|mixed|null + * @param array $where + * @return array|mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 吴汐 + * @email 442384644@qq.com + * @date 2023/02/23 */ public function getCategory(array $where) { diff --git a/template/admin/src/components/main/components/side-menu/collapsed-menu.vue b/template/admin/src/components/main/components/side-menu/collapsed-menu.vue index bf3834eda..34a3575cc 100644 --- a/template/admin/src/components/main/components/side-menu/collapsed-menu.vue +++ b/template/admin/src/components/main/components/side-menu/collapsed-menu.vue @@ -66,6 +66,7 @@ export default { }, methods: { handleClick(name) { + console.log(name) this.$emit('on-click', name); }, handleMousemove(event, children) { diff --git a/template/admin/src/components/main/components/side-menu/side-menu.vue b/template/admin/src/components/main/components/side-menu/side-menu.vue index 5427cf1ff..ccc00545f 100644 --- a/template/admin/src/components/main/components/side-menu/side-menu.vue +++ b/template/admin/src/components/main/components/side-menu/side-menu.vue @@ -69,7 +69,7 @@