From 386b45dea049e119877b6adc04b7b8a77db9bd11 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 24 Apr 2023 11:17:15 +0800 Subject: [PATCH 1/4] =?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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index de7f28ce0..e98bc9370 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -33531,8 +33531,7 @@ 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), -(433, 'network_security', 'text', 'input', 26, '', 1, '', 100, 0, '\"\"', '网安备案', '公安部门登记的备案信息，显示在pc底部', 0, 1); +(432, 'user_brokerage_type', 'radio', 'input', 73, '0=>按照商品价格返佣\n1=>按照实际支付价格返佣', 1, '', 0, 0, '\"0\"', '返佣类型', '选择返佣类型，按照商品价格返佣（按照商品售价计算返佣金额）以及按照实际支付价格返佣（按照商品的实际支付价格计算返佣 ）', 97, 1); -- -------------------------------------------------------- From 0c061fea464a4e7a876a1115f92cbb19bcbdbc65 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 24 Apr 2023 14:34:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/setting/devisePage/index.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/template/admin/src/pages/setting/devisePage/index.vue b/template/admin/src/pages/setting/devisePage/index.vue index 40302981b..dd81df2df 100644 --- a/template/admin/src/pages/setting/devisePage/index.vue +++ b/template/admin/src/pages/setting/devisePage/index.vue @@ -55,9 +55,7 @@ export default { if (Number(this.$route.query.type) === 1) { this.iframeUrl = `${moveLink}/pages/index/index?type=iframeWindow`; } else { - this.iframeUrl = `https://v4.wuht.net/pages/index/index?type=iframeWindow`; - - // this.iframeUrl = `${location.origin}/pages/index/index?type=iframeWindow`; + this.iframeUrl = `${location.origin}/pages/index/index?type=iframeWindow`; } diyGetInfo(parseInt(pageId)).then((datas) => { let data = datas.data.info.value; From 63a2dcbbee23332cf8b83d5f259d57e716bbefa1 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 24 Apr 2023 16:33:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?improve:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/system/codeGeneration/components/TableForm.vue | 6 +++++- template/admin/src/pages/system/codeGeneration/list.vue | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue index 2d091e216..ed0099d04 100644 --- a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue +++ b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue @@ -17,7 +17,11 @@ diff --git a/template/admin/src/pages/system/codeGeneration/list.vue b/template/admin/src/pages/system/codeGeneration/list.vue index 9146aef39..87e35705e 100644 --- a/template/admin/src/pages/system/codeGeneration/list.vue +++ b/template/admin/src/pages/system/codeGeneration/list.vue @@ -1,7 +1,7 @@ @@ -225,7 +227,8 @@ export default { }) .catch(() => {}); }, 150); - } else if (path === 'wareHouse') { + } else if (path === 'user') { + this.$router.push({ name: 'systemUser' }); } else { this.$router.push(path); } diff --git a/template/admin/src/layout/navBars/tagsView/tagsView.vue b/template/admin/src/layout/navBars/tagsView/tagsView.vue index ba45c569d..b2787ead7 100644 --- a/template/admin/src/layout/navBars/tagsView/tagsView.vue +++ b/template/admin/src/layout/navBars/tagsView/tagsView.vue @@ -252,8 +252,7 @@ export default { this.closeCurrentTagsView(path); break; case 2: - this.$router.push({ path, query: currentTag.query }); - this.closeOtherTagsView(path); + this.closeOtherTagsView(path, currentTag.query); break; case 3: this.closeAllTagsView(path); @@ -284,20 +283,22 @@ export default { // this.addBrowserSetSession(this.tagNavList); }, // 3、关闭其它 tagsView：如果是设置了固定的（isAffix），不进行关闭 - closeOtherTagsView(path) { + closeOtherTagsView(path, query) { let tagsViewList = []; this.tagsViewRoutesList.map((v) => { - if (v.meta.isAffix && !v.meta.isHide) tagsViewList.push({ ...v }); - if ((v.path = path)) tagsViewList.push({ ...v }); + if ((v.meta && v.meta.isAffix) || v.path === path) tagsViewList.push({ ...v }); }); + console.log(tagsViewList, this.tagsViewRoutesList, path); this.addBrowserSetSession(tagsViewList); + this.$router.push({ path, query }); + // this.addTagsView(path); }, // 4、关闭全部 tagsView：如果是设置了固定的（isAffix），不进行关闭 closeAllTagsView(path) { let tagsViewList = []; this.tagsViewRoutesList.map((v) => { - if (v.meta.isAffix && !v.meta.isHide) { + if (v.meta.isAffix) { tagsViewList.push({ ...v }); if (tagsViewList.some((v) => v.path === path)) this.$router.push({ path, query: this.$route.query }); else this.$router.push({ path: v.path, query: this.$route.query }); @@ -326,6 +327,9 @@ export default {