diff --git a/miniapp/config/index.js b/miniapp/config/index.js index 1887089..9260896 100644 --- a/miniapp/config/index.js +++ b/miniapp/config/index.js @@ -21,7 +21,7 @@ const ENV = { } // 当前环境 - 开发时使用 development,打包时改为 production -const CURRENT_ENV = 'production' +const CURRENT_ENV = 'development' // 导出配置 export const config = { diff --git a/miniapp/pages/search/index.vue b/miniapp/pages/search/index.vue index 7f7eb66..8b6e8ad 100644 --- a/miniapp/pages/search/index.vue +++ b/miniapp/pages/search/index.vue @@ -257,8 +257,8 @@ - - + + 取消 选择地区 @@ -284,7 +284,11 @@ 按省份选择 - + { } } +// 阻止遮罩层的touchmove事件 +const onMaskTouchMove = () => { + // 空函数,仅用于阻止事件 +} + // 切换省份展开 const toggleProvince = (provinceName) => { if (expandedProvince.value === provinceName) { @@ -1110,12 +1119,20 @@ onMounted(() => { .province-scroll { flex: 1; - height: 500rpx; + height: 400rpx; + min-height: 400rpx; + max-height: 50vh; + padding-bottom: 120rpx; } .province-item { border-bottom: 1rpx solid #f5f5f5; + &:last-child { + border-bottom: none; + margin-bottom: 80rpx; + } + .province-name { display: flex; align-items: center; diff --git a/server/src/XiangYi.AppApi/Controllers/ProfileController.cs b/server/src/XiangYi.AppApi/Controllers/ProfileController.cs index 6a6b75d..4d10cd4 100644 --- a/server/src/XiangYi.AppApi/Controllers/ProfileController.cs +++ b/server/src/XiangYi.AppApi/Controllers/ProfileController.cs @@ -62,9 +62,28 @@ public class ProfileController : ControllerBase /// 照片文件 /// 上传结果 [HttpPost("photos")] - public async Task> UploadPhotos([FromForm] List files) + public async Task> UploadPhotos([FromForm] IFormFile? files) { - if (files == null || files.Count == 0) + // 支持单文件上传(小程序 uni.uploadFile 每次只能上传一个文件) + var fileList = new List(); + if (files != null) + { + fileList.Add(files); + } + + // 也支持多文件上传 + if (Request.Form.Files.Count > 0) + { + foreach (var file in Request.Form.Files) + { + if (!fileList.Contains(file)) + { + fileList.Add(file); + } + } + } + + if (fileList.Count == 0) { return ApiResponse.Error(ErrorCodes.MissingParameter, "请选择要上传的照片"); } @@ -72,7 +91,7 @@ public class ProfileController : ControllerBase var userId = GetCurrentUserId(); // 检查是否可以上传 - var canUpload = await _profileService.CanUploadPhotosAsync(userId, files.Count); + var canUpload = await _profileService.CanUploadPhotosAsync(userId, fileList.Count); if (!canUpload) { return ApiResponse.Error(ErrorCodes.PhotoLimitExceeded, "照片数量超过限制,最多5张"); @@ -80,7 +99,7 @@ public class ProfileController : ControllerBase // 转换为Stream列表 var streams = new List(); - foreach (var file in files) + foreach (var file in fileList) { var stream = file.OpenReadStream(); streams.Add(stream); diff --git a/server/src/XiangYi.AppApi/appsettings.json b/server/src/XiangYi.AppApi/appsettings.json index fc7b91f..dcc232c 100644 --- a/server/src/XiangYi.AppApi/appsettings.json +++ b/server/src/XiangYi.AppApi/appsettings.json @@ -51,7 +51,7 @@ "SecretKey": "89GWr7JPWYTL8ueHlAYowGZnvzKZjqs9", "Region": "ap-shanghai", "BucketName": "miaoyu", - "CdnDomain": "miaoyu-1308826010.cos.ap-shanghai.myqcloud.com" + "CdnDomain": "https://miaoyu-1308826010.cos.ap-shanghai.myqcloud.com" } }, "AliyunSms": {