修改bug

2026-08-25 15:00:50 +08:00
parent d7436f5c54
commit e1522e7792
7 changed files with 53 additions and 62 deletions
--- 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;
 }

 /* 操作按钮 */
--- a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue
@@ -43,14 +43,16 @@
          <view class="info-item">
            <view class="info-label">活动时间</view>
            <view class="info-value">
-              <text>{{formatTime(activityConent.startTime)}} 至 {{formatTime(activityConent.endTime)}}</text>
+              <view>{{formatTime(activityConent.startTime)}}</view>
+              <view>至 {{formatTime(activityConent.endTime)}}</view>
            </view>
          </view>

          <view class="info-item">
            <view class="info-label">签到时间</view>
            <view class="info-value">
-              <text>{{formatTime(activityConent.signinStartTime)}} 至 {{formatTime(activityConent.signinEndTime)}}</text>
+              <view>{{formatTime(activityConent.signinStartTime)}}</view>
+              <view v-if="activityConent.signinEndTime">至 {{formatTime(activityConent.signinEndTime)}}</view>
            </view>
          </view>

@@ -177,8 +179,11 @@
        取消报名
      </button>

-	  <!-- 活动实况页显示添加实况按钮（活动开始之后、结束之前显示） -->
-	  <button class="action-btn add-status-btn" v-if="isActivityStarted && !isActivityEndedByTime && activeTab === 'status'" @click="liveClick">添加实况</button>
+	  <!-- 活动实况页显示添加实况按钮（活动开始之后、结束之前显示；已报名显示） -->
+		<button class="action-btn add-status-btn"
+		 v-if="isActivityStarted && !isActivityEndedByTime && activeTab === 'status'&& hasSigned"   @click="liveClick">
+		  添加实况
+		</button>
    </view>

    <!-- 报名确认模态框 -->
@@ -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;
 }

 /* 实况图片 */
--- 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: '请允许获取位置信息以显示具体地点',
--- 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
--- 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'
+		}
 	])

 	// 格式化字节大小
--- 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 {