diff --git a/property-uniapp-project/manifest.json b/property-uniapp-project/manifest.json index 1fb420a..8396b81 100644 --- a/property-uniapp-project/manifest.json +++ b/property-uniapp-project/manifest.json @@ -2,8 +2,8 @@ "name" : "花开物业", "appid" : "__UNI__29C3D60", "description" : "智慧社区居民端面向小区业主使用，支持注册、验证码、账号密码多种登录方式，提供密码找回功能，账号使用安全便捷。支持多小区切换，首页设有轮播 banner、社区公告，集成远程开门、生活缴费、在线报修、访客邀请、社区活动常用服务。全服务板块统一涵盖门禁开门、线上缴费、报修申报、访客预约、投诉反馈、问卷调研、活动报名、社区公示、一键联系物业功能。个人中心可管理房屋、住户、车位、车辆信息，支持更换手机号、修改密码、消息通知设置、版本更新及账号退出，一站式满足业主居家生活、社区服务、房产车辆管理需求，实现社区生活数字化、便捷化。", - "versionName" : "1.1.9", - "versionCode" : 132, + "versionName" : "1.2.0", + "versionCode" : 133, "transformPx" : false, "uniCloud" : { "provider" : "aliyun", diff --git a/property-uniapp-project/pageSubPack/activity-list/activityList.vue b/property-uniapp-project/pageSubPack/activity-list/activityList.vue index de55109..7d8bf97 100644 --- a/property-uniapp-project/pageSubPack/activity-list/activityList.vue +++ b/property-uniapp-project/pageSubPack/activity-list/activityList.vue @@ -626,6 +626,9 @@ watch(() => myFilter.value, () => { .detail-text-address { flex: 1; font-size: 22rpx; + word-break: break-all; + overflow-wrap: break-word; + white-space: pre-wrap; } /* 操作按钮 */ diff --git a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue index b6eb2c0..e12414b 100644 --- a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue +++ b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue @@ -43,14 +43,16 @@ 活动时间 - {{formatTime(activityConent.startTime)}} 至 {{formatTime(activityConent.endTime)}} + {{formatTime(activityConent.startTime)}} + 至 {{formatTime(activityConent.endTime)}} 签到时间 - {{formatTime(activityConent.signinStartTime)}} 至 {{formatTime(activityConent.signinEndTime)}} + {{formatTime(activityConent.signinStartTime)}} + 至 {{formatTime(activityConent.signinEndTime)}} @@ -177,8 +179,11 @@ 取消报名 - - + + @@ -698,6 +703,8 @@ const showToastMessage = (message) => { display: flex; flex-direction: column; justify-content: flex-start; + flex: 1; + min-width: 0; } .user-name { @@ -717,6 +724,9 @@ const showToastMessage = (message) => { color: #333; line-height: 1.5; margin: 25rpx 0rpx; + word-break: break-all; + overflow-wrap: break-word; + white-space: pre-wrap; } /* 实况图片 */ diff --git a/property-uniapp-project/pageSubPack/activity-list/live-add.vue b/property-uniapp-project/pageSubPack/activity-list/live-add.vue index e2bc2e5..79aa0f6 100644 --- a/property-uniapp-project/pageSubPack/activity-list/live-add.vue +++ b/property-uniapp-project/pageSubPack/activity-list/live-add.vue @@ -131,66 +131,41 @@ const chooseImg = () => { imgList.value.splice(index, 1); }; -// 检查 App 端定位权限（Android/iOS） -const checkAppLocationPermission = () => { +// 跳转系统设置（App 端：Android/iOS；H5/小程序另有处理） +const openAppSettings = () => { // #ifdef APP-PLUS try { const platform = uni.getSystemInfoSync().platform; if (platform === 'android') { - const main = plus.android.runtimeMainActivity(); - const PackageManager = plus.android.importClass('android.content.pm.PackageManager'); - return main.checkSelfPermission('android.permission.ACCESS_FINE_LOCATION') === PackageManager.PERMISSION_GRANTED; - } - if (platform === 'ios') { - const CLAuthorizationStatus = plus.ios.importClass('CLAuthorizationStatus'); - const CLLocationManager = plus.ios.importClass('CLLocationManager'); - return CLLocationManager.authorizationStatus() !== 2; // 2 = denied + const Intent = plus.android.importClass('android.content.Intent'); + const Settings = plus.android.importClass('android.provider.Settings'); + const Uri = plus.android.importClass('android.net.Uri'); + const mainActivity = plus.android.runtimeMainActivity(); + const intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + intent.setData(Uri.parse('package:' + mainActivity.getPackageName())); + mainActivity.startActivity(intent); + } else if (platform === 'ios') { + const UIApplication = plus.ios.importClass('UIApplication'); + const NSURL = plus.ios.importClass('NSURL'); + UIApplication.sharedApplication().openURL(NSURL.URLWithString('app-settings:')); } } catch (e) { - console.error('检查权限失败', e); + console.error('跳转系统设置异常：', e); + uni.showToast({ title: '跳转失败，请手动前往系统设置开启定位权限', icon: 'none' }); } // #endif - return true; // 非 App 端默认通过 -}; -// 跳转系统设置（App 端） -const openAppSettings = () => { - // #ifdef APP-PLUS - const platform = uni.getSystemInfoSync().platform; - if (platform === 'android') { - const Intent = plus.android.importClass('android.content.Intent'); - const Settings = plus.android.importClass('android.provider.Settings'); - const Uri = plus.android.importClass('android.net.Uri'); - const intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); - intent.setData(Uri.parse('package:' + plus.runtime.packageName)); - plus.android.runtimeMainActivity().startActivity(intent); - } else if (platform === 'ios') { - const UIApplication = plus.ios.importClass('UIApplication'); - const app = UIApplication.sharedApplication(); - const NSURL = plus.ios.importClass('NSURL'); - const url = NSURL.URLWithString('app-settings:'); - app.openURL(url); - } + // #ifdef H5 + uni.showToast({ title: '请手动在浏览器设置中允许定位权限', icon: 'none' }); + // #endif + + // #ifdef MP-WEIXIN + uni.openSetting({}); // #endif }; // 重新定位（获取当前位置 + 逆地址解析） const reLocate = () => { - // App 端先检查权限，无权限直接引导设置 - // #ifdef APP-PLUS - if (!checkAppLocationPermission()) { - uni.showModal({ - title: '需要定位权限', - content: '请前往系统设置中允许本应用使用定位权限', - confirmText: '去设置', - success: (res) => { - if (res.confirm) openAppSettings(); - } - }); - return; - } - // #endif - uni.showLoading({ title: '正在定位...', mask: true }); uni.getLocation({ @@ -208,7 +183,7 @@ const reLocate = () => { uni.hideLoading(); const errMsgStr = err?.errMsg || err?.message || JSON.stringify(err); console.error('定位失败：', err); - if (err?.code === -22 || /权限|auth|deny|permission/i.test(errMsgStr)) { + if (err?.code === -22 || /权限|授权|拒绝|auth|deny|permission/i.test(errMsgStr)) { uni.showModal({ title: '需要定位权限', content: '请允许获取位置信息以显示具体地点', diff --git a/property-uniapp-project/pageSubPack/api/useImageUpload.js b/property-uniapp-project/pageSubPack/api/useImageUpload.js index 2de2fd9..2566576 100644 --- a/property-uniapp-project/pageSubPack/api/useImageUpload.js +++ b/property-uniapp-project/pageSubPack/api/useImageUpload.js @@ -1,6 +1,6 @@ // 服务器地址（与 request.js 保持一致） -// const baseUrl = 'https://wuyeapi.ckdzkj.com'; -const baseUrl = "http://192.168.1.6:8080" +const baseUrl = 'https://wuyeapi.ckdzkj.com'; +// const baseUrl = "http://192.168.1.6:8080" /** * 图片上传 Hook diff --git a/property-uniapp-project/pageSubPack/my/settingIndex.vue b/property-uniapp-project/pageSubPack/my/settingIndex.vue index 4b9a7fe..124ac44 100644 --- a/property-uniapp-project/pageSubPack/my/settingIndex.vue +++ b/property-uniapp-project/pageSubPack/my/settingIndex.vue @@ -52,18 +52,18 @@ { title: '清除缓存', type: 'text', - value: '9.2M' + value: '' }, { title: '注销账号', type: 'arrow' }, - // { - // title: '升级版本', - // type: 'text', - // value: '当前版本 1.0.0', - // valueClass: 'item-version' - // } + { + title: '升级版本', + type: 'text', + value: '当前版本 1.0.0', + valueClass: 'item-version' + } ]) // 格式化字节大小 diff --git a/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue b/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue index 9a7d48a..ae7896c 100644 --- a/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue +++ b/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue @@ -279,6 +279,9 @@ const addComplaintsSuggestions = () => { color: #666666; line-height: 40rpx; margin-bottom: 20rpx; + word-break: break-all; + overflow-wrap: break-word; + white-space: pre-wrap; } .img-scroll-container {