diff --git a/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue b/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue
index 0cceb90..2fd58bc 100644
--- a/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue
+++ b/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue
@@ -39,16 +39,14 @@
 					</view>
 
 					<view class="grid-list">
-<<<<<<< HEAD
-=======
-
->>>>>>> de6e6ebfc1fe0b87a29728bd9d5d2cddae9f726f
-						<view class="grid-item" v-for="(item, index) in addList" :key="index" @click="goToAdd(item)">
-							<view class="icon-box" :class="item.iconClass">
-								<image class="iconStyle" :src="item.icon"></image>
+						
+							<view class="grid-item" v-for="(item, index) in addList" :key="index"
+								@click="goToAdd(item)">
+								<view class="icon-box" :class="item.iconClass">
+									<image class="iconStyle" :src="item.icon"></image>
+								</view>
+								<text class="item-name">{{ item.name +'费'}}</text>
 							</view>
-							<text class="item-name">{{ item.name +'费'}}</text>
-						</view>
 					</view>
 				</view>
 				<view style="width: 100%;height: 30rpx;"></view>
@@ -62,7 +60,7 @@
 		ref,
 		onMounted,
 		computed
-	
+
 	} from 'vue'
 	import {
 		onShow,
@@ -122,94 +120,7 @@
 			icon: "http://47.104.199.163:9090/images/propertyImgs/electric.png",
 			iconClass: "electric"
 		},
-<<<<<<< HEAD
-		{
-			name: "暖气",
-			type: "heating",
-			icon: "http://47.104.199.163:9090/images/propertyImgs/heating.png",
-			iconClass: "heating"
-=======
-		mounted() {},
-		data() {
-			return {
-				/* 设定状态栏默认高度 */
-				statusBarHeight: 20,
-				paymentList: [{
-						id: 1,
-						name: '物业费',
-						status: '已欠费',
-						address: '桂花园（别墅）2号楼2层',
-						icon: "http://47.104.199.163:9090/images/propertyImgs/property.png",
 
-					},
-					{
-						id: 2,
-						// name: '暖气费',
-						name: '物业费',
-
-						status: '',
-						address: '山东省日照市东港区桂花园（别墅）2号楼2层',
-						icon: "http://47.104.199.163:9090/images/propertyImgs/heating.png",
-
-					},
-					{
-						id: 3,
-						// name: '电费',
-						name: '物业费',
-						status: '已欠费',
-						address: '山东省日照市东港区桂花园（别墅）2号楼2层',
-						icon: "http://47.104.199.163:9090/images/propertyImgs/electric.png",
-
-					}
-				],
-				// 新增缴费列表数据
-				addList: [{
-						// name: "燃气",
-						name: '物业',
-						type: "gas",
-						icon: "http://47.104.199.163:9090/images/propertyImgs/gas.png",
-						iconClass: "gas"
-					},
-					{
-						// name: "水",
-						name: '物业',
-						type: "water",
-						icon: "http://47.104.199.163:9090/images/propertyImgs/water.png",
-						iconClass: "water"
-					},
-					{
-						// name: "物业",
-						name: '物业',
-						type: "property",
-						icon: "http://47.104.199.163:9090/images/propertyImgs/property.png",
-						iconClass: "property"
-					},
-					{
-						// name: "电",
-						name: '物业',
-						type: "electric",
-						icon: "http://47.104.199.163:9090/images/propertyImgs/electric.png",
-						iconClass: "electric"
-					},
-					{
-						// name: "暖气",
-						name: '物业',
-						type: "heating",
-						icon: "http://47.104.199.163:9090/images/propertyImgs/heating.png",
-						iconClass: "heating"
-					},
-					{
-						// name: "车位",
-						name: '物业',
-						type: "parking",
-						icon: "http://47.104.199.163:9090/images/propertyImgs/parkingIcon.png",
-						iconClass: "parking"
-					}
-				]
-
-			}
->>>>>>> de6e6ebfc1fe0b87a29728bd9d5d2cddae9f726f
-		},
 		{
 			name: "车位",
 			type: "parking",
@@ -223,7 +134,6 @@
 	onShow(() => {})
 	onLoad(() => {})
 
-<<<<<<< HEAD
 	// 方法
 	const goToBill = (item) => {
 		uni.setStorageSync('arrearsPayment', item.name)
@@ -237,56 +147,7 @@
 			})
 		}
 	}
-=======
-		methods: {
-			// 跳转到缴费
-			goToBill(item) {
-				uni.setStorageSync('arrearsPayment', item.name)
-				if (item.status == '已欠费') {
-					uni.redirectTo({
-						url: '/pageSubPack/payment-list/arrearsPayment',
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-				} else {
-					uni.redirectTo({
-						url: '/pageSubPack/payment-list/noArrearsPayment',
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-			},
-			// 跳转到缴费记录
-			goToRecord() {
-				uni.redirectTo({
-					url: '/pageSubPack/payment-list/paymentRecord',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			// 跳转到新增缴费
-			goToAdd(type) {
-				// else if (type.name == '水' || type.name == '电')
-				if (type.name == '燃气' || type.name == '暖气') {
-					uni.redirectTo({
-						url: '/pageSubPack/payment-list/selectPaymentEntity',
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-				} else if (type.name == '物业' || type.name == '物业') {
-					uni.redirectTo({
-						url: '/pageSubPack/payment-list/addHydropower',
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-				uni.setStorageSync('addPaymentType', type.name)
->>>>>>> de6e6ebfc1fe0b87a29728bd9d5d2cddae9f726f
+
 
 	const goToRecord = () => {
 		uni.redirectTo({