梁航：合并冲突

pages/my/my.vue

@@ -126,6 +126,7 @@
 		align-items: center;
 		flex-direction: column;
 		// gap: 10rpx;
+
 		.profile-bgi {
 			position: absolute;
 			width: 100%;

pages/publish/publishTransfer/publishTransfer.vue

@@ -17,6 +17,7 @@
 				label-width="auto">
 				<text @click="show1 = true" class="checkedtext" v-if="form.region.length>0">{{form.region}}</text>
 				<text @click="show1 = true" class="checktext" v-else>请选择所属区域</text>
+
 				<view class="arrow-icon">
 					<u-icon name="arrow-right" size="30px" @click="show1 = true"></u-icon>
 				</view>
@@ -79,6 +80,7 @@
 				imageLength: '0',
 				fileList1: [],
 				regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [],
+
 				form: {
 					title: '',
 					region: '',
@@ -94,6 +96,7 @@
 					longitude: '',
 					latitude: '',
 					id: '',
+
 				},
 				Classcolumns: [],
 				ClassCheckId: '',
@@ -169,6 +172,7 @@
 							trigger: ['change', 'blur'],
 						}
 					]
+
 				},
 			}
 		},
@@ -291,6 +295,7 @@
 		},
 		onReady() {
 			this.$refs.uForm.setRules(this.rules)
+
 		},
 		onLoad() {
 			this.$api.getClassList().then(res => {
@@ -301,6 +306,7 @@
 				this.pid = res.data.data.map((item) => {
 					return item = item.id
 				})
+
 			})
 		},
 		computed: {
@@ -336,7 +342,6 @@
 		background-color: #F8F8F8;
 
 		// height: 300rpx;
-		// margin-right: 20px;
 		.count {
 			margin-bottom: 30px;
 		}