Merge branch 'f-dev' into 'main'

fix:修复意见反馈图片上传大小

See merge request huang/thingskit-app!55

 .alarm-detail-page {
 .alarm-detail-page {
 	padding: 30rpx;
 	padding: 30rpx;
+	background: #f8f9fa;
 }
 }
 .alarm-detail-column {
 .alarm-detail-column {
 	border-radius: 10px;
 	border-radius: 10px;

@@ -217,6 +217,7 @@ export default {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .command-record {
 .command-record {
 	padding: 0 30rpx;
 	padding: 0 30rpx;
+	background: #f8f9fa;
 	.filter-button {
 	.filter-button {
 		font-size: 12px;
 		font-size: 12px;
 		width: 160rpx;
 		width: 160rpx;

@@ -31,7 +31,8 @@
 					<view class="info" style="margin-top: 15rpx;background: rgba(1, 1, 1, 0);">
 					<view class="info" style="margin-top: 15rpx;background: rgba(1, 1, 1, 0);">
 						<view class="info-contain">
 						<view class="info-contain">
 							<u-form-item label="图片" prop="feedbackInfo.images" borderBottom ref="item1">
 							<u-form-item label="图片" prop="feedbackInfo.images" borderBottom ref="item1">
-								<u-upload :sizeType="compressed" :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="6"></u-upload>
+								<u-upload :sizeType="compressed" :fileList="fileList1" 
+								@afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="6"></u-upload>
 							</u-form-item>
 							</u-form-item>
 						</view>
 						</view>
 					</view>
 					</view>
@@ -89,12 +90,14 @@ export default {
 							'feedbackInfo.phone': {
 							'feedbackInfo.phone': {
 								type: 'number',
 								type: 'number',
 								min: 11,
 								min: 11,
+								max:11,
 								message: '请填写手机或者手机格式错误',
 								message: '请填写手机或者手机格式错误',
 								trigger: ['blur', 'change']
 								trigger: ['blur', 'change']
 							},
 							},
 							'feedbackInfo.qq': {
 							'feedbackInfo.qq': {
 								type: 'number',
 								type: 'number',
-								min: 8,
+								min: 5,
+								max:10,
 								message: '请填写qq或者qq格式错误',
 								message: '请填写qq或者qq格式错误',
 								trigger: ['blur', 'change']
 								trigger: ['blur', 'change']
 							},
 							},
@@ -134,25 +137,38 @@ export default {
 			let lists = [].concat(event.file);
 			let lists = [].concat(event.file);
 			let fileListLen = this[`fileList${event.name}`].length;
 			let fileListLen = this[`fileList${event.name}`].length;
 			lists.map(item => {
 			lists.map(item => {
+				if(item.size>5242880){
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'error',
+						message: '上传失败'
+					});
+				}else{
 				this[`fileList${event.name}`].push({
 				this[`fileList${event.name}`].push({
 					...item,
 					...item,
 					status: 'uploading',
 					status: 'uploading',
 					message: '上传中'
 					message: '上传中'
 				});
 				});
+				}
 			});
 			});
 			for (let i = 0; i < lists.length; i++) {
 			for (let i = 0; i < lists.length; i++) {
-				const result = await this.uploadFilePromise(lists[i].url);
-				let item = this[`fileList${event.name}`][fileListLen];
-				this[`fileList${event.name}`].splice(
-					fileListLen,
-					1,
-					Object.assign(item, {
-						status: 'success',
-						message: '',
-						url: result
-					})
-				);
-				fileListLen++;
+				const judgeImageSize=lists[0].size
+				if(judgeImageSize>5242880){
+					return uni.$u.toast('图片限定5M')
+				}else{
+					const result = await this.uploadFilePromise(lists[i].url);
+					let item = this[`fileList${event.name}`][fileListLen];
+					this[`fileList${event.name}`].splice(
+						fileListLen,
+						1,
+						Object.assign(item, {
+							status: 'success',
+							message: '',
+							url: result
+						})
+					);
+					fileListLen++;
+				}
 			}
 			}
 		},
 		},
 		uploadFilePromise(url) {
 		uploadFilePromise(url) {
@@ -174,12 +190,16 @@ export default {
 					formData: {},
 					formData: {},
 					success: res => {
 					success: res => {
 						setTimeout(() => {
 						setTimeout(() => {
-							if (res) {
+							if(res.statusCode===200){
+								if(res.data){
 								let objImage = JSON.parse(res.data);
 								let objImage = JSON.parse(res.data);
 								if (this.feedbackData.feedbackInfo.images.length < 6) {
 								if (this.feedbackData.feedbackInfo.images.length < 6) {
 									this.feedbackData.feedbackInfo.images.push(objImage.fileStaticUri);
 									this.feedbackData.feedbackInfo.images.push(objImage.fileStaticUri);
 								}
 								}
 								resolve(res.data?.fileStaticUri);
 								resolve(res.data?.fileStaticUri);
+								}
+							}else{
+								return uni.$u.toast('图片上传失败')
 							}
 							}
 						}, 1000);
 						}, 1000);
 					}
 					}

 .alert-page {
 .alert-page {
+	background: #f8f9fa;
 	.device-top {
 	.device-top {
 		padding: 10rpx 30rpx;
 		padding: 10rpx 30rpx;
 		background-color: #fff;
 		background-color: #fff;

 .set-page {
 .set-page {
 	padding: 0rpx 30rpx;
 	padding: 0rpx 30rpx;
+	background: #f8f9fa;
 	.submit {
 	.submit {
 		margin-top: 60rpx;
 		margin-top: 60rpx;
 		color: #fff;
 		color: #fff;