diff --git a/property-uniapp-project/App.vue b/property-uniapp-project/App.vue
index dd18548..2d2b101 100644
--- a/property-uniapp-project/App.vue
+++ b/property-uniapp-project/App.vue
@@ -1,15 +1,25 @@
diff --git a/property-uniapp-project/manifest.json b/property-uniapp-project/manifest.json
index 7fcfee4..f3045bd 100644
--- a/property-uniapp-project/manifest.json
+++ b/property-uniapp-project/manifest.json
@@ -1,10 +1,14 @@
{
"name" : "花开物业",
"appid" : "__UNI__29C3D60",
- "description" : "物业用户端app",
+ "description" : "智慧社区居民端面向小区业主使用,支持注册、验证码、账号密码多种登录方式,提供密码找回功能,账号使用安全便捷。支持多小区切换,首页设有轮播 banner、社区公告,集成远程开门、生活缴费、在线报修、访客邀请、社区活动常用服务。全服务板块统一涵盖门禁开门、线上缴费、报修申报、访客预约、投诉反馈、问卷调研、活动报名、社区公示、一键联系物业功能。个人中心可管理房屋、住户、车位、车辆信息,支持更换手机号、修改密码、消息通知设置、版本更新及账号退出,一站式满足业主居家生活、社区服务、房产车辆管理需求,实现社区生活数字化、便捷化。",
"versionName" : "1.0.1",
"versionCode" : 105,
"transformPx" : false,
+ "uniCloud": {
+ "provider": "aliyun",
+ "spaceId": "mp-2d1912d1-5d25-47a9-a4c5-2669573cd0c2"
+ },
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
@@ -173,7 +177,14 @@
"vueVersion" : "3",
"app-harmony" : {
"distribute" : {
- "bundleName" : "com.chengkong.property.owner"
+ "bundleName" : "com.chengkong.property.owner",
+ "modules" : {
+ "uni-push" : {}
+ },
+ "icons" : {
+ "foreground" : "unpackage/res/icons/logo-app.png",
+ "background" : "unpackage/res/icons/background.png"
+ }
}
}
}
diff --git a/property-uniapp-project/pageSubPack/activity-list/activityList.vue b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
index b858674..903573a 100644
--- a/property-uniapp-project/pageSubPack/activity-list/activityList.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
@@ -52,9 +52,6 @@
-
- {{activity.statusText}}
-
已报名
@@ -65,6 +62,9 @@
+
+ {{activity.statusText}}
+
@@ -522,8 +522,8 @@ watch(() => myFilter.value, () => {
/* 活动状态标签 */
.status-badge {
position: absolute;
- top: 33rpx;
- left: 11rpx;
+ top: 0;
+ left: 0;
padding: 6rpx 20rpx;
font-size: 22rpx;
border-radius: 15rpx 0rpx 15rpx 0rpx;
@@ -560,6 +560,7 @@ watch(() => myFilter.value, () => {
.info-image-left {
width: 170rpx;
height: 220rpx;
+ position: relative;
}
.activity-title {
diff --git a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
index dbe6e52..06ddb4d 100644
--- a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
@@ -46,7 +46,7 @@
我已阅读并同意
- 《用户协议》和
+ 《用户协议》和
《隐私政策》
@@ -100,9 +100,24 @@ const toggleAgreement = () => {
const showPrivacyPopup = ref(false)
const pendingAction = ref('') // 记录待执行操作,如 'smsLogin'
-// 跳转隐私协议页面
+// 打开用户协议
+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 = () => {
- uni.navigateTo({ url: "/pageSubPack/loginSub/privacy" })
+ // #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
}
// 打开隐私弹窗(可传入待执行操作标识)
diff --git a/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue b/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue
index c148871..afeb5e0 100644
--- a/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue
+++ b/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue
@@ -259,7 +259,7 @@ const goBack = () => {
.card-img {
width: 100%;
- height: 52px;
+ height: 56px;
object-fit: cover;
}
diff --git a/property-uniapp-project/pages/index/index.vue b/property-uniapp-project/pages/index/index.vue
index 9f08546..50780ff 100644
--- a/property-uniapp-project/pages/index/index.vue
+++ b/property-uniapp-project/pages/index/index.vue
@@ -123,15 +123,13 @@
-
-
- {{ activity.statusText }}
-
-
+
+ {{ activity.statusText }}
+
@@ -662,27 +660,26 @@ const moreClick = () =>{
position: relative;
margin: 30rpx 0rpx;
// overflow: hidden;
- .status-tag {
- position: absolute;
- top: 0;
- left: 0;
- // padding: 6px 18px;
- padding: 0px 7px 10px 11px;
- border-radius: 10px 0px 10px 0px;
- font-size: 12px;
- color: #fff;
- font-weight: 500;
- width: 80rpx;
- height: 20rpx;
- // background-color: #FD7373 ;
- background: repeating-linear-gradient(to right, #FD7373 , #FB3F3F);
- z-index: 5;
- }
.activity-img{
width: 170rpx;
height: 230rpx;
+ position: relative;
// background-color: #333333;
}
+ .status-tag {
+ position: absolute;
+ top: 0;
+ left: 0;
+ padding: 0px 7px 10px 11px;
+ border-radius: 10px 0px 10px 0px;
+ font-size: 12px;
+ color: #fff;
+ font-weight: 500;
+ width: 80rpx;
+ height: 20rpx;
+ background: repeating-linear-gradient(to right, #FD7373 , #FB3F3F);
+ z-index: 5;
+ }
.activity-title{
font-size: 32rpx;
font-weight: bold;
diff --git a/property-uniapp-project/pages/myIndex/myIndex.vue b/property-uniapp-project/pages/myIndex/myIndex.vue
index 9bc7657..91fa1ab 100644
--- a/property-uniapp-project/pages/myIndex/myIndex.vue
+++ b/property-uniapp-project/pages/myIndex/myIndex.vue
@@ -37,6 +37,9 @@
+
@@ -222,6 +225,18 @@