From d1d57ff800479cdc6f00de29bff5ea0287088b12 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, 23 Feb 2023 09:26:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?diy=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/store/CategoryController.php | 5 ++-- .../api/controller/v2/PublicController.php | 4 +-- crmeb/app/services/diy/DiyServices.php | 4 +-- .../product/product/StoreCategoryServices.php | 27 +++++++++++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/crmeb/app/api/controller/v1/store/CategoryController.php b/crmeb/app/api/controller/v1/store/CategoryController.php index 5dae06de1..7554d08b5 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['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/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) { From 24c98db3103a0878a27dff8ea73ca07d32d643a7 Mon Sep 17 00:00:00 2001 From: From-wh Date: Thu, 23 Feb 2023 09:26:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?improve:=20=E8=A3=85=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=98=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/goods_cate/goods_cate.vue | 3 ++- template/uni-app/pages/index/index.vue | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/template/uni-app/pages/goods_cate/goods_cate.vue b/template/uni-app/pages/goods_cate/goods_cate.vue index 57a008a49..bb831d0a6 100644 --- a/template/uni-app/pages/goods_cate/goods_cate.vue +++ b/template/uni-app/pages/goods_cate/goods_cate.vue @@ -64,9 +64,10 @@ colorChange('category').then(res => { let status = res.data.status; this.category = status + uni.setStorageSync('is_diy', res.data.is_diy) this.status = res.data.status + this.$refs.classOne.is_diy = res.data.is_diy this.$nextTick(e => { - this.$refs.classOne.is_diy = this.is_diy if (this.status == 2 || this.status == 3) { uni.hideTabBar(); } else if (this.status == 1) { diff --git a/template/uni-app/pages/index/index.vue b/template/uni-app/pages/index/index.vue index 6cb7f9c2d..627bbc9fc 100644 --- a/template/uni-app/pages/index/index.vue +++ b/template/uni-app/pages/index/index.vue @@ -41,7 +41,9 @@ getVersion(name) { getVersion(name).then(res => { this.version = res.data.version + this.isDiy = res.data.is_diy this.loading = true + uni.setStorageSync('is_diy', res.data.is_diy) if (!uni.getStorageSync('DIY_VERSION') || res.data.version != uni.getStorageSync( 'DIY_VERSION')) { if (uni.getStorageSync('DIY_VERSION')) { From 196236908e55ce60eda53ea7d7e66f4ffb75b476 Mon Sep 17 00:00:00 2001 From: From-wh Date: Thu, 23 Feb 2023 09:40:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?improve:=20=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4/=E6=B5=AE=E7=AA=97=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/components/side-menu/collapsed-menu.vue | 1 + .../components/main/components/side-menu/side-menu.vue | 8 ++++++-- template/admin/src/components/main/main.less | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) 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 @@