diff --git a/property-uniapp-project/manifest.json b/property-uniapp-project/manifest.json index f3045bd..4f11289 100644 --- a/property-uniapp-project/manifest.json +++ b/property-uniapp-project/manifest.json @@ -5,10 +5,10 @@ "versionName" : "1.0.1", "versionCode" : 105, "transformPx" : false, - "uniCloud": { - "provider": "aliyun", - "spaceId": "mp-2d1912d1-5d25-47a9-a4c5-2669573cd0c2" - }, + "uniCloud" : { + "provider" : "aliyun", + "spaceId" : "mp-2d1912d1-5d25-47a9-a4c5-2669573cd0c2" + }, /* 5+App特有相关 */ "app-plus" : { "usingComponents" : true, @@ -184,6 +184,17 @@ "icons" : { "foreground" : "unpackage/res/icons/logo-app.png", "background" : "unpackage/res/icons/background.png" + }, + "signingConfigs" : { + "release" : { + "certpath" : "D:/物业app-ios-harmony-证书/new_harmony/新花开物业正式.cer", + "keyAlias" : "wuye_release", + "keyPassword" : "0000001A9E0C0113E4B700C047F1BE0C671C25CDEE277F48C5706A9799B0FCC3804E17FD7C52B089C710", + "profile" : "D:/物业app-ios-harmony-证书/new_harmony/yonghu_profileRelease.p7b", + "signAlg" : "SHA256withECDSA", + "storeFile" : "D:/物业app-ios-harmony-证书/new_harmony/huakaiwuye.p12", + "storePassword" : "0000001AD76C6FA365F39AF1BEB3ED5A58612AF310FFE4240FC31CB6020C301DEFA1D1F0F8EFF141511E" + } } } } diff --git a/property-uniapp-project/pageSubPack/activity-list/live-add.vue b/property-uniapp-project/pageSubPack/activity-list/live-add.vue index 1e1f8a0..b6685f8 100644 --- a/property-uniapp-project/pageSubPack/activity-list/live-add.vue +++ b/property-uniapp-project/pageSubPack/activity-list/live-add.vue @@ -59,7 +59,8 @@ import { onLoad } from '@dcloudio/uni-app'; import { addActivityLive, signinActivityLive, uploadFile } from '../api/api.js'; // 高德地图 Web API Key(用于逆地址解析,需要去 https://lbs.amap.com 申请免费 Key) -const AMAP_KEY = 'f362f595be12ab7d84bd502b48b30d2a'; +const AMAP_KEY = '38cd7fb803c600a58c5a13e644feab34'; +// const AMAP_KEY = 'f362f595be12ab7d84bd502b48b30d2a'; // 活动ID const activityId = ref(''); diff --git a/property-uniapp-project/pageSubPack/api/request.js b/property-uniapp-project/pageSubPack/api/request.js index a1c2b24..a8fe37b 100644 --- a/property-uniapp-project/pageSubPack/api/request.js +++ b/property-uniapp-project/pageSubPack/api/request.js @@ -2,7 +2,7 @@ let baseUrl = ''; if (process.env.NODE_ENV === 'development') { baseUrl = 'http://192.168.1.222:8080'; // 开发环境 } else { - baseUrl = 'http://192.168.0.224:8080'; // 生产环境 + baseUrl = 'https://wuyeapi.bugtc.com'; // 生产环境 } export default function request(url, data = {}, method = "GET") { diff --git a/property-uniapp-project/pageSubPack/loginSub/login.vue b/property-uniapp-project/pageSubPack/loginSub/login.vue index 647e456..9d10a1e 100644 --- a/property-uniapp-project/pageSubPack/loginSub/login.vue +++ b/property-uniapp-project/pageSubPack/loginSub/login.vue @@ -56,11 +56,11 @@ v-else > - - 我已阅读并同意 - 《用户协议》和 - 《隐私政策》 - + 我已阅读并同意 + 《用户协议》和 + 《隐私政策》 + + @@ -128,13 +128,25 @@ const checkForm = () => { const toggleAgreement = () => { agreeAgreement.value = !agreeAgreement.value; }; -// 跳转隐私协议 -const goToPrivacy = () => { - uni.navigateTo({ - url:'/pageSubPack/loginSub/privacy', - }) +// 打开用户协议 +const goToUserAgreement = () => { + // #ifdef APP-PLUS + plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/ownler_xieyi.html') + // #endif + // #ifdef H5 + window.open('https://wuye.ckdzkj.com/parivw/ownler_xieyi.html') + // #endif } +// 打开隐私政策 +const goToPrivacy = () => { + // #ifdef APP-PLUS + plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/owner.html') + // #endif + // #ifdef H5 + window.open('https://wuye.ckdzkj.com/parivw/owner.html') + // #endif +} // 打开隐私弹窗 const openPrivacyPopup = (action) => { pendingAction.value = action || '' diff --git a/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue b/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue index aba9f6f..e33db52 100644 --- a/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue +++ b/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue @@ -72,7 +72,7 @@ class="agreePrivacy">《用户隐私政策》 --> 我已阅读并同意 - 《用户协议》和 + 《用户协议》《隐私政策》 @@ -152,12 +152,26 @@ const toggleAgreement = () => { agreeAgreement.value = !agreeAgreement.value; }; - // 跳转隐私协议 - const goToPrivacy = () => { - uni.navigateTo({ - url: '/pageSubPack/loginSub/privacy', - }) + // 打开用户协议 + const goToUserAgreement = () => { + // #ifdef APP-PLUS + plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/ownler_xieyi.html') + // #endif + // #ifdef H5 + window.open('https://wuye.ckdzkj.com/parivw/ownler_xieyi.html') + // #endif } + + // 打开隐私政策 + const goToPrivacy = () => { + // #ifdef APP-PLUS + plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/owner.html') + // #endif + // #ifdef H5 + window.open('https://wuye.ckdzkj.com/parivw/owner.html') + // #endif + } + // 检查表单状态(实时更新按钮状态) const checkForm = () => {};