From c94f8876805ed2b4b8bf1d39df9e5d3b57412487 Mon Sep 17 00:00:00 2001 From: From-wh Date: Tue, 4 Apr 2023 15:00:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?improve:=20=E6=A0=87=E7=AD=BE=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0565863f99e837c16847da8d0dcf03c1045b9d38) --- template/admin/src/components/userLabel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/admin/src/components/userLabel.vue b/template/admin/src/components/userLabel.vue index eebea8410..30851aa9e 100644 --- a/template/admin/src/components/userLabel.vue +++ b/template/admin/src/components/userLabel.vue @@ -30,7 +30,7 @@ export default { props: { uid: { type: String | Number, - default: '', + default: 0, }, only_get: { default: false, @@ -64,7 +64,7 @@ export default { }, methods: { getList() { - getUserLabel(this.uid).then((res) => { + getUserLabel(this.uid || 0).then((res) => { if (this.selectDataLabel && this.selectDataLabel.length) { this.selectDataLabel.map((el) => { res.data.map((re) => { From d6c7af9e8d71dc4c35932754f61ac492606bda33 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 4 Apr 2023 17:43:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/install/crmeb.sql | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index e95810c91..de7f28ce0 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -1526,7 +1526,7 @@ CREATE TABLE IF NOT EXISTS `eb_lang_code` ( `lang_explain` varchar(255) NOT NULL DEFAULT '' COMMENT '说明', `is_admin` tinyint(1) NOT NULL DEFAULT '0' COMMENT '服务端1，用户端2', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=24971 DEFAULT CHARSET=utf8 COMMENT='语言code表'; +) ENGINE=InnoDB AUTO_INCREMENT=25001 DEFAULT CHARSET=utf8 COMMENT='语言code表'; -- -- 转存表中的数据 `eb_lang_code` @@ -33327,7 +33327,7 @@ CREATE TABLE IF NOT EXISTS `eb_system_config` ( `sort` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '排序', `status` tinyint(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '是否隐藏', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=428 DEFAULT CHARSET=utf8 COMMENT='配置表'; +) ENGINE=InnoDB AUTO_INCREMENT=435 DEFAULT CHARSET=utf8 COMMENT='配置表'; -- -- 转存表中的数据 `eb_system_config` @@ -33531,7 +33531,8 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (429, 'get_avatar', 'radio', 'input', 7, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '强制获取昵称头像', '是否在小程序用户授权之后，弹窗获取用户的昵称和头像', 0, 1), (430, 'share_qrcode', 'radio', 'input', 2, '0=>商城\n1=>公众号', 1, '', 0, 0, '\"0\"', '公众号推广码类型', '公众号生成的推广码类型：商城：扫码直接进入商城，公众号：扫码进入公众号后推送商城的链接', 0, 1), (431, 'member_brokerage', 'radio', 'input', 73, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"0\"', '购买付费会员返佣', '购买付费会员是否按照设置的佣金比例进行返佣', 98, 1), -(432, 'user_brokerage_type', 'radio', 'input', 73, '0=>按照商品价格返佣\n1=>按照实际支付价格返佣', 1, '', 0, 0, '\"0\"', '返佣类型', '选择返佣类型，按照商品价格返佣（按照商品售价计算返佣金额）以及按照实际支付价格返佣（按照商品的实际支付价格计算返佣 ）', 97, 1); +(432, 'user_brokerage_type', 'radio', 'input', 73, '0=>按照商品价格返佣\n1=>按照实际支付价格返佣', 1, '', 0, 0, '\"0\"', '返佣类型', '选择返佣类型，按照商品价格返佣（按照商品售价计算返佣金额）以及按照实际支付价格返佣（按照商品的实际支付价格计算返佣 ）', 97, 1), +(433, 'network_security', 'text', 'input', 26, '', 1, '', 100, 0, '\"\"', '网安备案', '公安部门登记的备案信息，显示在pc底部', 0, 1); -- -------------------------------------------------------- @@ -33550,7 +33551,7 @@ CREATE TABLE IF NOT EXISTS `eb_system_config_tab` ( `type` int(2) NOT NULL DEFAULT '0' COMMENT '配置类型', `sort` int(11) NOT NULL DEFAULT '0' COMMENT '排序', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=109 DEFAULT CHARSET=utf8 COMMENT='配置分类表'; +) ENGINE=InnoDB AUTO_INCREMENT=110 DEFAULT CHARSET=utf8 COMMENT='配置分类表'; -- -- 转存表中的数据 `eb_system_config_tab` @@ -34658,7 +34659,8 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont (1072, 1064, '', '接口文档', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/setting/system_out_interface/index', '56/1064', 1, '', 0, 'setting-system-out-interface-index', 0), (1073, 25, '', '数据维护', 'admin', '', '', '', '', '[]', 7, 1, 0, 1, 'system/database/index', '25', 1, '', 0, 'system-database-index', 0), (1075, 731, '', '会员配置', 'admin', '', '', '', '', '[]', 6, 1, 0, 1, '/marketing/member/system_config/3/67', '27/731', 1, '', 0, 'marketing-member-system_config', 0), -(1076, 56, '', '定时任务', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/system/crontab', '25/56', 1, '', 0, 'system-crontab-index', 0); +(1076, 56, '', '定时任务', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/system/crontab', '25/56', 1, '', 0, 'system-crontab-index', 0), +(1077, 7, '', '主页', 'admin', '', '', '', '', '[]', 100, 1, 0, 1, '/home', '7', 1, '', 0, 'admin-index-index', 0); -- --------------------------------------------------------