github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 03:03:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-09-30 17:00:23 +08:00
parent dd447de467
commit 0d74e8f04b
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electron/package.json
View File

@ -32,7 +32,7 @@
"@electron-forge/maker-squirrel": "^6.0.0-beta.64", "@electron-forge/maker-squirrel": "^6.0.0-beta.64",
"@electron-forge/maker-zip": "^6.0.0-beta.64", "@electron-forge/maker-zip": "^6.0.0-beta.64",
"dotenv": "^16.0.1", "dotenv": "^16.0.1",
"electron": "^20.1.1", "electron": "^21.0.1",
"electron-builder": "^23.3.3", "electron-builder": "^23.3.3",
"electron-notarize": "^1.2.1", "electron-notarize": "^1.2.1",
"form-data": "^4.0.0", "form-data": "^4.0.0",
@ -43,7 +43,7 @@
"crc": "^3.8.0", "crc": "^3.8.0",
"electron-log": "^4.4.8", "electron-log": "^4.4.8",
"electron-squirrel-startup": "^1.0.0", "electron-squirrel-startup": "^1.0.0",
"electron-updater": "^5.0.5", "electron-updater": "^5.2.1",
"fs-extra": "^10.1.0", "fs-extra": "^10.1.0",
"pdf-lib": "^1.17.1" "pdf-lib": "^1.17.1"
}, },

2
resources/assets/js/components/RightBottom.vue
View File

@ -14,7 +14,7 @@
{{ $L('更新客户端') }} {{ $L('更新客户端') }}
</div> </div>
</template> </template>
<a v-if="showPrivacy" class="common-right-bottom-link" target="_blank" :href="$A.apiUrl('../privacy.html')"> <a v-if="showPrivacy" class="common-right-bottom-link" target="_blank" :href="$A.apiUrl('privacy')">
《{{ $L('隐私政策') }}》 《{{ $L('隐私政策') }}》
</a> </a>
<Modal <Modal

6
resources/assets/js/functions/web.js vendored
View File

@ -15,6 +15,12 @@
* @returns {string|string|*} * @returns {string|string|*}
*/ */
apiUrl(str) { apiUrl(str) {
if (str == "privacy") {
let apiHome = $A.getDomain(window.systemInfo.apiUrl)
if (apiHome == "" || apiHome == "public") {
return "https://www.dootask.com/privacy.html"
}
}
if (str.substring(0, 2) === "//" || if (str.substring(0, 2) === "//" ||
str.substring(0, 7) === "http://" || str.substring(0, 7) === "http://" ||
str.substring(0, 8) === "https://" || str.substring(0, 8) === "https://" ||

2
resources/assets/js/pages/login.vue
View File

@ -131,7 +131,7 @@
:mask-closable="false"> :mask-closable="false">
<div class="privacy-content"> <div class="privacy-content">
<div>欢迎使用本软件！</div> <div>欢迎使用本软件！</div>
<p>在您使用本软件前，请您认真阅读并了解相应的<a target="_blank" :href="$A.apiUrl('../privacy.html')">《{{ $L('隐私政策') }}》</a>，以了解我们的服务内容和您相关个人信息的处理规则。我们将严格的按照隐私服务协议为您提供服务，保护您的个人信息。</p> <p>在您使用本软件前，请您认真阅读并了解相应的<a target="_blank" :href="$A.apiUrl('privacy')">《{{ $L('隐私政策') }}》</a>，以了解我们的服务内容和您相关个人信息的处理规则。我们将严格的按照隐私服务协议为您提供服务，保护您的个人信息。</p>
</div> </div>
<div slot="footer" class="adaption"> <div slot="footer" class="adaption">
<Button type="default" @click="onPrivacy(false)">{{$L('不同意')}}</Button> <Button type="default" @click="onPrivacy(false)">{{$L('不同意')}}</Button>

2
resources/assets/js/pages/manage/setting/index.vue
View File

@ -168,7 +168,7 @@ export default {
}, },
openPrivacy() { openPrivacy() {
const url = $A.apiUrl('../privacy.html') const url = $A.apiUrl('privacy')
if (this.$isEEUiApp) { if (this.$isEEUiApp) {
$A.eeuiAppOpenPage({ $A.eeuiAppOpenPage({
pageType: 'app', pageType: 'app',

2
resources/mobile

@ -1 +1 @@
Subproject commit 5a48bcd34e7c79a1818bbe61d84b5ce47b005538 Subproject commit 35f6c38481bc1abacecbd26317286c691a279f78