From 3ca70bdeed2154f0b889e23a5a029cdefb376bb7 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, 27 Feb 2023 14:21:52 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8F=90=E9=86=92=EF=BC=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8F=90=E9=86=92=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA1?= =?UTF-8?q?=E5=88=86=E9=92=9F=EF=BC=8C=E5=90=8E=E5=8F=B0=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=E9=A2=9C=E8=89=B2=E5=8C=BA=E5=88=86?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E7=B1=BB=E7=BC=93=E5=AD=98=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=AE=A2=E6=9C=8D=E6=9F=A5=E8=AF=A2=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E6=B8=A0=E9=81=93=E7=A0=81=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=A4=84=E7=90=86=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=AE=89?= =?UTF-8?q?=E8=A3=85sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/setting/SystemConfig.php | 3 + .../app/listener/admin/AdminLoginListener.php | 4 +- .../app/services/order/StoreOrderServices.php | 126 ++++++++++++++++-- .../product/product/StoreCategoryServices.php | 4 - crmeb/app/services/user/UserAuthServices.php | 2 +- .../services/wechat/WechatQrcodeServices.php | 1 + crmeb/public/install/crmeb.sql | 12 +- 7 files changed, 134 insertions(+), 18 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php b/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php index dd6b405f0..ff4de7ddb 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php @@ -307,6 +307,9 @@ class SystemConfig extends AuthController return app('json')->fail(400763); } } + if (isset($post['uni_brokerage_price']) && preg_match('/\.[0-9]{2,}[1-9][0-9]*$/', (string)$post['uni_brokerage_price']) > 0) { + return app('json')->fail(500029); + } //支付接口类型选择，如果有订单就不能再进行切换 // if (isset($post['pay_wechat_type'])) { diff --git a/crmeb/app/listener/admin/AdminLoginListener.php b/crmeb/app/listener/admin/AdminLoginListener.php index 049fa17c7..1297a4f81 100644 --- a/crmeb/app/listener/admin/AdminLoginListener.php +++ b/crmeb/app/listener/admin/AdminLoginListener.php @@ -35,13 +35,11 @@ class AdminLoginListener } try { - $timerPath = root_path('runtime') . '.timer'; $timer = file_get_contents($timerPath); - if ($timer && $timer <= time() && $timer > (time() - 10)) { + if ($timer && $timer <= time() && $timer > (time() - 70)) { $res1 = true; } - } catch (\Throwable $e) { } diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index 3dc91b255..b37fa8fb0 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -988,10 +988,46 @@ HTML; ] ]] ]; + $series3 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#69cdff' + ], + [ + 'offset' => 0.5, + 'color' => '#3eb3f7' + ], + [ + 'offset' => 1, + 'color' => '#1495eb' + ] + ] + ]] + ]; + $series4 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#6fdeab' + ], + [ + 'offset' => 0.5, + 'color' => '#44d693' + ], + [ + 'offset' => 1, + 'color' => '#2cc981' + ] + ] + ]] + ]; $chartdata['series'][] = ['name' => $chartdata['legend'][0], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['pre']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['now']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 - $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series2, 'data' => $data['now']['price']];//分类1值 + $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series3, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series4, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 //统计总数上期 $pre_total = $this->dao->preTotalFind($datebefor, $dateafter); @@ -1109,10 +1145,46 @@ HTML; ] ]] ]; + $series3 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#69cdff' + ], + [ + 'offset' => 0.5, + 'color' => '#3eb3f7' + ], + [ + 'offset' => 1, + 'color' => '#1495eb' + ] + ] + ]] + ]; + $series4 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#6fdeab' + ], + [ + 'offset' => 0.5, + 'color' => '#44d693' + ], + [ + 'offset' => 1, + 'color' => '#2cc981' + ] + ] + ]] + ]; $chartdata['series'][] = ['name' => $chartdata['legend'][0], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['pre']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['now']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 - $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series2, 'data' => $data['now']['price']];//分类1值 + $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series3, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series4, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 //统计总数上期 $pre_total = $this->dao->preTotalFind($datebefor, $dateafter); @@ -1228,10 +1300,46 @@ HTML; ] ]] ]; + $series3 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#69cdff' + ], + [ + 'offset' => 0.5, + 'color' => '#3eb3f7' + ], + [ + 'offset' => 1, + 'color' => '#1495eb' + ] + ] + ]] + ]; + $series4 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#6fdeab' + ], + [ + 'offset' => 0.5, + 'color' => '#44d693' + ], + [ + 'offset' => 1, + 'color' => '#2cc981' + ] + ] + ]] + ]; $chartdata['series'][] = ['name' => $chartdata['legend'][0], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['pre']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['now']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 - $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series2, 'data' => $data['now']['price']];//分类1值 + $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series3, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series4, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 //统计总数上期 $pre_total = $this->dao->preTotalFind($datebefor, $dateafter); diff --git a/crmeb/app/services/product/product/StoreCategoryServices.php b/crmeb/app/services/product/product/StoreCategoryServices.php index d7bde1e0c..82c3d88a2 100644 --- a/crmeb/app/services/product/product/StoreCategoryServices.php +++ b/crmeb/app/services/product/product/StoreCategoryServices.php @@ -118,7 +118,6 @@ class StoreCategoryServices extends BaseServices throw new AdminException(100005); } else { $this->cacheDriver()->clear(); - $this->cacheDriver()->set('category_version', uniqid()); } } @@ -206,7 +205,6 @@ class StoreCategoryServices extends BaseServices if (!$res) throw new AdminException(100006); $this->cacheDriver()->clear(); - $this->cacheDriver()->set('category_version', uniqid()); return (int)$res->id; } @@ -246,7 +244,6 @@ class StoreCategoryServices extends BaseServices }); $this->cacheDriver()->clear(); - $this->cacheDriver()->set('category_version', uniqid()); } /** @@ -262,7 +259,6 @@ class StoreCategoryServices extends BaseServices if (!$res) throw new AdminException(100008); $this->cacheDriver()->clear(); - $this->cacheDriver()->set('category_version', uniqid()); } /** diff --git a/crmeb/app/services/user/UserAuthServices.php b/crmeb/app/services/user/UserAuthServices.php index b864e2fb9..7e1b1db82 100644 --- a/crmeb/app/services/user/UserAuthServices.php +++ b/crmeb/app/services/user/UserAuthServices.php @@ -50,7 +50,7 @@ class UserAuthServices extends BaseServices if ($token === 'undefined') { throw new AuthException(110002); } - if (!$token || !$tokenData = CacheService::get($md5Token, '', NULL, 'api')) + if (!$token || !$tokenData = CacheService::get($md5Token)) throw new AuthException(110002); if (!is_array($tokenData) || empty($tokenData) || !isset($tokenData['uid'])) { diff --git a/crmeb/app/services/wechat/WechatQrcodeServices.php b/crmeb/app/services/wechat/WechatQrcodeServices.php index 2cf187f4d..8e3db0072 100644 --- a/crmeb/app/services/wechat/WechatQrcodeServices.php +++ b/crmeb/app/services/wechat/WechatQrcodeServices.php @@ -49,6 +49,7 @@ class WechatQrcodeServices extends BaseServices $item['stop'] = $item['end_time'] ? $item['end_time'] > time() ? 1 : -1 : 0; $item['label_name'] = $userLabel->getColumn([['id', 'in', $item['label_id']]], 'label_name'); $item['end_time'] = date('Y-m-d H:i:s', $item['end_time']); + $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']); } $count = $this->dao->count($where); return compact('list', 'count'); diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index a8a6ace13..589cd1782 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -26520,7 +26520,17 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`, (24977, 7, '500028', '请填写邀请码', '초대 코드를 입력하십시오.', 1), (24978, 8, '500028', '请填写邀请码', 'Урилгын кодыг бөглөнө үү', 1), (24979, 9, '500028', '请填写邀请码', 'กรุณากรอกรหัสเชิญ', 1), -(24980, 10, '500028', '请填写邀请码', 'Vui lòng điền mã mời', 1); +(24980, 10, '500028', '请填写邀请码', 'Vui lòng điền mã mời', 1), +(24981, 1, '500029', '金额最多两位小数', '金额最多两位小数', 1), +(24982, 2, '500029', '金额最多两位小数', 'Amount Up to two decimal places', 1), +(24983, 3, '500029', '金额最多两位小数', '金額最多兩位小數', 1), +(24984, 4, '500029', '金额最多两位小数', 'Montant Jusquà deux décimales', 1), +(24985, 5, '500029', '金额最多两位小数', 'Importo Fino a due decimali', 1), +(24986, 6, '500029', '金额最多两位小数', '金額は小数点以下2桁まで', 1), +(24987, 7, '500029', '金额最多两位小数', '양 소수점 이하 두 자리까지', 1), +(24988, 8, '500029', '金额最多两位小数', 'Хэмжээ Хоёр аравтын бутархай газар хүртэл', 1), +(24989, 9, '500029', '金额最多两位小数', 'จำนวนทศนิยมสูงสุดสองตำแหน่ง', 1), +(24990, 10, '500029', '金额最多两位小数', 'Số tiền tối đa hai chữ số thập phân', 1); -- -------------------------------------------------------- From c8407395f11e7297975a21385511516e77996185 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 27 Feb 2023 14:52:09 +0800 Subject: [PATCH 02/17] =?UTF-8?q?style:=20=E5=88=97=E8=A1=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/cms/articleCategory/index.vue | 4 ++-- .../admin/src/pages/finance/balance/index.vue | 6 +----- .../src/pages/finance/capitalFlow/index.vue | 3 +-- .../src/pages/finance/commission/index.vue | 1 - .../pages/marketing/point_record/index.vue | 7 +------ .../marketing/storeBargain/bargainList.vue | 1 - .../storeCombination/combinaList.vue | 1 - .../components/tableList.vue | 2 +- .../admin/src/pages/order/invoice/index.vue | 1 - .../admin/src/pages/order/refund/index.vue | 5 +++-- .../src/pages/product/productList/index.vue | 2 +- .../src/pages/product/productReply/index.vue | 2 +- .../pages/setting/membershipLevel/index.vue | 2 +- .../pages/setting/multiLanguage/country.vue | 4 ++-- .../src/pages/user/grade/record/index.vue | 1 - .../pages/extension/customer_list/chat.vue | 19 +++++++++++-------- 16 files changed, 25 insertions(+), 36 deletions(-) diff --git a/template/admin/src/pages/cms/articleCategory/index.vue b/template/admin/src/pages/cms/articleCategory/index.vue index bc3ba2c13..bf296f1a1 100644 --- a/template/admin/src/pages/cms/articleCategory/index.vue +++ b/template/admin/src/pages/cms/articleCategory/index.vue @@ -36,9 +36,9 @@ - +
- +
- +
- + @@ -296,10 +295,6 @@ export default { margin: 3px 0; } -.tabform { - margin-bottom: 10px; -} - .Refresh { font-size: 12px; color: #1890FF; diff --git a/template/admin/src/pages/marketing/storeBargain/bargainList.vue b/template/admin/src/pages/marketing/storeBargain/bargainList.vue index 58edde922..68570c093 100644 --- a/template/admin/src/pages/marketing/storeBargain/bargainList.vue +++ b/template/admin/src/pages/marketing/storeBargain/bargainList.vue @@ -45,7 +45,6 @@ @@ -104,7 +104,7 @@ - +
@@ -367,21 +367,25 @@ export default { changeMenu(row, name, index) { switch (name) { case '1': - this.promoters(row, 'order'); + this.promoters(row, 'order');//推广人订单 break; case '2': - this.spreadQR(row); + this.spreadQR(row);//推广方式二维码 break; case '3': - this.editS(row); + this.editS(row);//修改上级推广人 break; - case '4': - this.del(row, '解除【 ' + row.nickname + ' 】的上级推广人', index); - case '5': + case '4'://清除上级推广人 + this.del_parent(row, '清除【 ' + row.nickname + ' 】的上级推广人', index); + break; + case '5'://取消推广资格 + this.del_agent(row, '取消【 ' + row.nickname + ' 】的推广资格', index); + break; + case '6'://修改推广等级 this.$modalForm(membershipDataAddApi({ uid: row.uid }, '/agent/get_level_form')).then(() => this.getList()); break; default: - this.del_open(row, '解除【 ' + row.nickname + ' 】的推广资格', index); + break; } }, @@ -397,16 +401,16 @@ export default { this.formInline.spread_uid = e.uid; this.formInline.image = e.image; }, - // 删除 - del(row, tit, num) { - let delfromData = { - title: tit, + // 清除上级关系 + del_parent(rows, titile, num) { + let delfromDatap = { + title: titile, num: num, - url: `agent/stair/delete_spread/${row.uid}`, + url: `agent/stair/delete_spread/${rows.uid}`, method: 'PUT', ids: '', }; - this.$modalSure(delfromData) + this.$modalSure(delfromDatap) .then((res) => { this.$Message.success(res.msg); this.getList(); @@ -415,8 +419,8 @@ export default { this.$Message.error(res.msg); }); }, - // 删除 - del_open(row, tit, num) { + // 取消自己推广资格 + del_agent(row, tit, num) { let delfromData = { title: tit, num: num, From 1369a8447250d5e9866517aa29059abdf53f78b3 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, 27 Feb 2023 15:56:20 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD=EF=BC=8C=E7=A0=8D=E4=BB=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/adminapi/controller/v1/user/User.php | 25 +++++++++---------- .../pages/marketing/storeBargain/index.vue | 2 +- .../src/pages/user/list/handle/userEdit.vue | 4 +-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/user/User.php b/crmeb/app/adminapi/controller/v1/user/User.php index f6da30cb6..0502aa336 100644 --- a/crmeb/app/adminapi/controller/v1/user/User.php +++ b/crmeb/app/adminapi/controller/v1/user/User.php @@ -123,20 +123,19 @@ class User extends AuthController if ($data['card_id']) { if (!check_card($data['card_id'])) return app('json')->fail(400315); } - if ($data['pwd']) { - if (!$data['true_pwd']) { - return app('json')->fail(400263); - } - if ($data['pwd'] != $data['true_pwd']) { - return app('json')->fail(400264); - } - if (strlen($data['pwd']) < 6 || strlen($data['pwd']) > 32) { - return app('json')->fail(400762); - } - $data['pwd'] = md5($data['pwd']); - } else { - unset($data['pwd']); + if (!$data['pwd']) { + return app('json')->fail(400256); } + if (!$data['true_pwd']) { + return app('json')->fail(400263); + } + if ($data['pwd'] != $data['true_pwd']) { + return app('json')->fail(400264); + } + if (strlen($data['pwd']) < 6 || strlen($data['pwd']) > 32) { + return app('json')->fail(400762); + } + $data['pwd'] = md5($data['pwd']); unset($data['true_pwd']); $data['avatar'] = sys_config('h5_avatar'); $data['adminId'] = $this->adminId; diff --git a/template/admin/src/pages/marketing/storeBargain/index.vue b/template/admin/src/pages/marketing/storeBargain/index.vue index 077ae0bc4..4e16a1680 100644 --- a/template/admin/src/pages/marketing/storeBargain/index.vue +++ b/template/admin/src/pages/marketing/storeBargain/index.vue @@ -194,7 +194,7 @@ export default { title: '操作', slot: 'action', fixed: 'right', - minWidth: 130, + minWidth: 160, }, ], tableList: [], diff --git a/template/admin/src/pages/user/list/handle/userEdit.vue b/template/admin/src/pages/user/list/handle/userEdit.vue index 1e469c4e8..43f3b181f 100644 --- a/template/admin/src/pages/user/list/handle/userEdit.vue +++ b/template/admin/src/pages/user/list/handle/userEdit.vue @@ -40,7 +40,7 @@ class="form-sty" type="password" v-model="formItem.pwd" - placeholder="请输入登录密码" + placeholder="请输入登录密码（修改用户可不填写，不填写不修改原密码）" style="width: 80%" > @@ -49,7 +49,7 @@ class="form-sty" type="password" v-model="formItem.true_pwd" - placeholder="请输入确认密码" + placeholder="请输入确认密码（修改用户可不填写，不填写不修改原密码）" style="width: 80%" > From 20099aabcb3fa2bd0087d47797c6a4f69a82d213 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 27 Feb 2023 16:04:24 +0800 Subject: [PATCH 08/17] =?UTF-8?q?improve:=20=E8=8F=9C=E5=8D=95tag=E5=88=87?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/main.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/template/admin/src/main.js b/template/admin/src/main.js index bd75649a7..b5d6439c6 100644 --- a/template/admin/src/main.js +++ b/template/admin/src/main.js @@ -199,7 +199,7 @@ new Vue({ let menus = this.$store.state.menus.menusName; const menuSider = menus; const headerName = getHeaderName(to, menuSider); - + console.log(headerName, to, 'headerName'); if (headerName !== null) { this.$store.commit('menu/setActivePath', path); const openNames = getSiderSubmenu(to, menuSider); @@ -216,9 +216,11 @@ new Vue({ this.$store.commit('menu/setSider', filterMenuSider[0]?.children || []); } else { //子路由给默认 如果你没有使用顶部菜单，则设置为默认的（一般为 home）名称即可 - // this.$store.commit('menu/setHeaderName', 'home'); + this.$store.commit('menu/setHeaderName', settings.routePre + '/home/'); + if (to.name == 'home_index') { + this.$store.commit('menu/setSider', []); + } // 指定当前显示的侧边菜单 - // this.$store.commit('menu/setSider', menuSider); } if (to.meta.kefu) { From fd937108be60861345292dc033367c6b0494851d Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Mon, 27 Feb 2023 16:16:00 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/system/crontab/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/pages/system/crontab/index.vue b/template/admin/src/pages/system/crontab/index.vue index 10d654905..4ca8f2226 100644 --- a/template/admin/src/pages/system/crontab/index.vue +++ b/template/admin/src/pages/system/crontab/index.vue @@ -4,7 +4,7 @@ From 046456f036bbc0d0fb6aefa33611d7f0c5700be9 Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Mon, 27 Feb 2023 16:21:13 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=B7=BB=E5=8A=A0=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/setting/multiLanguage/langList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/admin/src/pages/setting/multiLanguage/langList.vue b/template/admin/src/pages/setting/multiLanguage/langList.vue index abbb78890..b92fd7a3e 100644 --- a/template/admin/src/pages/setting/multiLanguage/langList.vue +++ b/template/admin/src/pages/setting/multiLanguage/langList.vue @@ -57,7 +57,7 @@
- +
Date: Mon, 27 Feb 2023 16:22:10 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=B7=BB=E5=8A=A0=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/setting/multiLanguage/langList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/pages/setting/multiLanguage/langList.vue b/template/admin/src/pages/setting/multiLanguage/langList.vue index b92fd7a3e..f49f227c7 100644 --- a/template/admin/src/pages/setting/multiLanguage/langList.vue +++ b/template/admin/src/pages/setting/multiLanguage/langList.vue @@ -55,7 +55,7 @@ - + From 829567bc2cc2b5a1120ca9772714768e1d911d39 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 27 Feb 2023 16:25:57 +0800 Subject: [PATCH 12/17] =?UTF-8?q?improve:=20=E5=BF=85=E5=A1=AB=E6=98=9F?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/user/list/handle/userEdit.vue | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/template/admin/src/pages/user/list/handle/userEdit.vue b/template/admin/src/pages/user/list/handle/userEdit.vue index 43f3b181f..926d6c82b 100644 --- a/template/admin/src/pages/user/list/handle/userEdit.vue +++ b/template/admin/src/pages/user/list/handle/userEdit.vue @@ -1,10 +1,10 @@ @@ -76,7 +75,6 @@ export default { title: '操作', slot: 'action', align: 'center', - fixed: 'right', minWidth: 100, }, ], From 87b4f8d261065cb3428f4d3ca2cb36c4f747533a Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 27 Feb 2023 16:51:20 +0800 Subject: [PATCH 14/17] =?UTF-8?q?fix:=20=E9=A2=84=E8=A7=88=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uni-app/pages/annex/special/index.vue | 1147 +++++++++-------- 1 file changed, 576 insertions(+), 571 deletions(-) diff --git a/template/uni-app/pages/annex/special/index.vue b/template/uni-app/pages/annex/special/index.vue index 5bb1ffd85..d7238bfdd 100644 --- a/template/uni-app/pages/annex/special/index.vue +++ b/template/uni-app/pages/annex/special/index.vue @@ -1,572 +1,577 @@ - - - - - From 4cabb6aa4f29c0997e43b9b65a31b99dec8e18ca Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Mon, 27 Feb 2023 16:52:13 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/user/level/index.vue | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/template/admin/src/pages/user/level/index.vue b/template/admin/src/pages/user/level/index.vue index 284cc87b1..2076b5e1d 100644 --- a/template/admin/src/pages/user/level/index.vue +++ b/template/admin/src/pages/user/level/index.vue @@ -101,8 +101,8 @@