梁航：冲突合并

pages/Partnerships/Partnerships.vue

@@ -1,4 +1,4 @@
-<template>
+<<template>
 	<view>
 		<view v-if="member!=2">
 			<view class="name">

pages/my/my.vue

@@ -12,7 +12,6 @@
 				<view class="account">账号:{{account}}
 					<u-icon name="edit-pen" class="edit-icon" size="20" color="#fff" @click="toEdit"></u-icon>
 				</view>
-
 			</view>
 			<view class="publish">
 				<u-cell-group>
@@ -112,7 +111,6 @@
 					}
 				})
 			}
-			
 		}
 	}
 </script>
@@ -128,7 +126,6 @@
 		align-items: center;
 		flex-direction: column;
 		// gap: 10rpx;
-
 		.profile-bgi {
 			position: absolute;
 			width: 100%;

pages/publish/publishTransfer/publishTransfer.vue

@@ -17,7 +17,6 @@
 				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>
@@ -73,7 +72,6 @@
 		<view class="bug-figure"></view>
 	</view>
 </template>
-
 <script>
 	export default {
 		data() {
@@ -81,7 +79,6 @@
 				imageLength: '0',
 				fileList1: [],
 				regionColumns: [JSON.parse(uni.getStorageSync('regionList'))] || [],
-
 				form: {
 					title: '',
 					region: '',
@@ -91,14 +88,12 @@
 					area: '',
 					rent: '',
 					transferFee: '',
-					contact:'',
 					mobile: '',
 					content: '',
 					images: [],
 					longitude: '',
 					latitude: '',
 					id: '',
-					
 				},
 				Classcolumns: [],
 				ClassCheckId: '',
@@ -174,7 +169,6 @@
 							trigger: ['change', 'blur'],
 						}
 					]
-
 				},
 			}
 		},
@@ -297,7 +291,6 @@
 		},
 		onReady() {
 			this.$refs.uForm.setRules(this.rules)
-
 		},
 		onLoad() {
 			this.$api.getClassList().then(res => {
@@ -308,7 +301,6 @@
 				this.pid = res.data.data.map((item) => {
 					return item = item.id
 				})
-
 			})
 		},
 		computed: {
@@ -321,7 +313,6 @@
 		}
 	}
 </script>
-
 <style lang="scss">
 	.count {}
 
@@ -345,9 +336,6 @@
 		background-color: #F8F8F8;
 
 		// height: 300rpx;
-		.count {
-			margin-bottom: 30px;
-		}
 		// margin-right: 20px;
 		.count {
 			margin-bottom: 30px;