From 305e67c454ba4d8cc4810b4efa1307030d75ad54 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 28 Jun 2022 10:58:21 +0800 Subject: [PATCH] =?UTF-8?q?App=E6=98=BE=E7=A4=BA=E9=9A=90=E7=A7=81?= =?UTF-8?q?=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/privacy.html | 12 +++++----- .../assets/js/components/RightBottom.vue | 23 ++++++++++++++++++- .../assets/js/pages/manage/setting/index.vue | 10 +++++++- .../js/pages/manage/setting/privacy.vue | 22 ++++++++++++++++++ .../assets/js/pages/manage/setting/system.vue | 10 +------- resources/assets/js/routes.js | 5 ++++ .../assets/sass/components/right-bottom.scss | 1 + 7 files changed, 66 insertions(+), 17 deletions(-) create mode 100644 resources/assets/js/pages/manage/setting/privacy.vue diff --git a/public/privacy.html b/public/privacy.html index 74844405e..323ab7abd 100644 --- a/public/privacy.html +++ b/public/privacy.html @@ -1,12 +1,11 @@ - - - DooTask 隐私政策 + +
@@ -76,12 +75,13 @@ 我们出于不同的目的使用各种Cookie，包括：严格必要型Cookie、性能Cookie、营销Cookie和功能Cookie。 某些Cookie可能由外部第三方提供，以向我们的产品提供其它功能。 我们不会将 Cookie 用于本政策所述目的之外的任何用途。您可根据自己的偏好管理或删除 Cookie。 您可以清除计算机上或手机中保存的所有 Cookie，大部分网络浏览器都设有阻止或禁用 Cookie 的功能， 您可对浏览器进行配置。阻止或禁用 Cookie 功能后，可能影响您使用或不能充分使用我们的产品和服务。 -
+ + - - + + diff --git a/resources/assets/js/pages/manage/setting/system.vue b/resources/assets/js/pages/manage/setting/system.vue index 8e97b6ae1..1d4bb3ff0 100644 --- a/resources/assets/js/pages/manage/setting/system.vue +++ b/resources/assets/js/pages/manage/setting/system.vue @@ -48,17 +48,9 @@ export default { 't.hitosea.com', 'dootask.com', 'www.dootask.com' - ].includes(this.getDomain($A.apiUrl('../')))) { + ].includes($A.getDomain($A.apiUrl('../')))) { this.appPush = true; } }, - - methods: { - getDomain(weburl) { - let urlReg = /http(s)?:\/\/([^\/]+)/i; - let domain = (weburl + "").match(urlReg); - return ((domain != null && domain.length > 0) ? domain[2] : ""); - } - } } diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js index df8e61c1b..20e4302ef 100755 --- a/resources/assets/js/routes.js +++ b/resources/assets/js/routes.js @@ -54,6 +54,11 @@ export default [ path: 'system', component: () => import('./pages/manage/setting/system.vue'), }, + { + name: 'manage-setting-privacy', + path: 'privacy', + component: () => import('./pages/manage/setting/privacy.vue'), + }, ] }, { diff --git a/resources/assets/sass/components/right-bottom.scss b/resources/assets/sass/components/right-bottom.scss index 978e9804e..af13ad14b 100644 --- a/resources/assets/sass/components/right-bottom.scss +++ b/resources/assets/sass/components/right-bottom.scss @@ -94,6 +94,7 @@ right: auto; left: 50%; transform: translateX(-50%); + align-items: center; .common-right-bottom-link { color: $primary-text-color !important;