diff --git a/wuye-manager-uniapp/components/privacy-popup/privacy-popup.vue b/wuye-manager-uniapp/components/privacy-popup/privacy-popup.vue index 60df5e1..f01662f 100644 --- a/wuye-manager-uniapp/components/privacy-popup/privacy-popup.vue +++ b/wuye-manager-uniapp/components/privacy-popup/privacy-popup.vue @@ -54,22 +54,16 @@ const handleMaskClick = () => { } // 打开用户协议 const goToUserAgreement = () => { - // #ifdef APP-PLUS - plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/butler_xieyi.html') - // #endif - // #ifdef H5 - window.open('https://wuye.ckdzkj.com/parivw/butler_xieyi.html') - // #endif + uni.navigateTo({ + url: '/pageSubPack/loginSub/user-agreement' + }) } // 打开隐私政策 const goToPrivacy = () => { - // #ifdef APP-PLUS - plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/butler.html') - // #endif - // #ifdef H5 - window.open('https://wuye.ckdzkj.com/parivw/butler.html') - // #endif + uni.navigateTo({ + url: '/pageSubPack/loginSub/privacy' + }) } diff --git a/wuye-manager-uniapp/manifest.json b/wuye-manager-uniapp/manifest.json index 857cb04..c85f26a 100644 --- a/wuye-manager-uniapp/manifest.json +++ b/wuye-manager-uniapp/manifest.json @@ -2,8 +2,8 @@ "name" : "花开管家", "appid" : "__UNI__5F224F3", "description" : "智慧社区管家端,专为小区物业管理人员打造,支持多小区灵活切换管理。集成账号密码、手机号密码双重登录模式,内置忘记密码找回功能,保障账号安全。涵盖消息通知、日常巡检、故障报修、一键开门、工单流转、投诉处理等核心办公功能,物业人员可在线完成巡检打卡、问题上报、工单派发跟进、投诉对接处理等日常工作,同时支持查看个人上报记录、巡检历史,便捷修改账号信息与登录密码。高效简化社区物业办公流程,提升小区服务与管理效率,打造便捷智能的社区管理服务平台。", - "versionName" : "1.0.4", - "versionCode" : 104, + "versionName" : "1.0.5", + "versionCode" : 105, "transformPx" : false, "app-plus" : { "usingComponents" : true, diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue index 342b032..318ac55 100644 --- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue +++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue @@ -149,22 +149,16 @@ const toggleAgreement = () => { } // 打开用户协议 const goToUserAgreement = () => { - // #ifdef APP-PLUS - plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/butler_xieyi.html') - // #endif - // #ifdef H5 - window.open('https://wuye.ckdzkj.com/parivw/butler_xieyi.html') - // #endif + uni.navigateTo({ + url: '/pageSubPack/loginSub/user-agreement' + }) } // 打开隐私政策 const goToPrivacy = () => { - // #ifdef APP-PLUS - plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/butler.html') - // #endif - // #ifdef H5 - window.open('https://wuye.ckdzkj.com/parivw/butler.html') - // #endif + uni.navigateTo({ + url: '/pageSubPack/loginSub/privacy' + }) } // 不同意隐私协议 diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue b/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue index b09608a..9309287 100644 --- a/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue +++ b/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue @@ -1,94 +1,115 @@ \ No newline at end of file + diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue index a8af761..cac0873 100644 --- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue +++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue @@ -129,22 +129,16 @@ const toggleRemember = () => { // 打开用户协议 const goToUserAgreement = () => { - // #ifdef APP-PLUS - plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/butler_xieyi.html') - // #endif - // #ifdef H5 - window.open('https://wuye.ckdzkj.com/parivw/butler_xieyi.html') - // #endif + uni.navigateTo({ + url: '/pageSubPack/loginSub/user-agreement' + }) } // 打开隐私政策 const goToPrivacy = () => { - // #ifdef APP-PLUS - plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/butler.html') - // #endif - // #ifdef H5 - window.open('https://wuye.ckdzkj.com/parivw/butler.html') - // #endif + uni.navigateTo({ + url: '/pageSubPack/loginSub/privacy' + }) } // 打开隐私协议弹窗 diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/user-agreement.vue b/wuye-manager-uniapp/pageSubPack/loginSub/user-agreement.vue new file mode 100644 index 0000000..8c6ade5 --- /dev/null +++ b/wuye-manager-uniapp/pageSubPack/loginSub/user-agreement.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json index 6a261c0..1175169 100644 --- a/wuye-manager-uniapp/pages.json +++ b/wuye-manager-uniapp/pages.json @@ -40,7 +40,13 @@ { "path": "privacy", "style": { - "navigationBarTitleText": "用户隐私协议" + "navigationBarTitleText": "隐私政策" + } + }, + { + "path": "user-agreement", + "style": { + "navigationBarTitleText": "用户协议" } }, {