说明：解决git冲突

pages/index/index.vue

@@ -16,12 +16,7 @@
 			</view>
 		</view>
 		<!--弹窗-->
-<<<<<<< HEAD
 		<modal v-if="showPop" title="用户绑定" confirm-text="确定" cancel-text="重置" @cancel="resetPop" @confirm="confirmPop">
-=======
-		<modal v-if="showPop" title="用户绑定" confirm-text="确定" cancel-text="重置" @cancel="cancelPop"
-			@confirm="confirmPop">
->>>>>>> 4380156aef5e8beb51c02d4586781d9ce0e14435
 			<view class="lineGroup">
 				<text class="iconfont icon-shengchengmingpianicon label-icon"></text>
 				<input type='text' class="stu-number" maxlength="14" placeholder="请输入学号" v-model="stu_number" />
@@ -100,11 +95,7 @@
 					});
 				}
 			},
-<<<<<<< HEAD
 			resetPop() { // 重置
-=======
-			cancelPop() { //取消
->>>>>>> 4380156aef5e8beb51c02d4586781d9ce0e14435
 				this.stu_number = ''
 				this.id_card = ''
 			},
@@ -251,11 +242,7 @@
 			border-bottom: 1px solid #c2c2c2;
 			font-size: 38rpx;
 			white-space: nowrap;
-<<<<<<< HEAD
-
-=======
 			
->>>>>>> 4380156aef5e8beb51c02d4586781d9ce0e14435
 			.label-icon {
 				display: flex;
 				flex-direction: row;
@@ -268,11 +255,7 @@
 				color: $my-color-primary;
 				margin: 22rpx 0 0 50rpx;
 			}
-<<<<<<< HEAD
 
-=======
-			
->>>>>>> 4380156aef5e8beb51c02d4586781d9ce0e14435
 			.stu-number {
 				margin-top: 20rpx;
 				color: #00c200;

pages/reshui/reshui.vue

@@ -1009,15 +1009,7 @@
 						}
 					})
 
-<<<<<<< HEAD
 					// console.log(res)
-=======
-<<<<<<< HEAD
-					// console.log(res)
-=======
-					console.log(res)
->>>>>>> 4380156aef5e8beb51c02d4586781d9ce0e14435
->>>>>>> 3aae76fbef288891c62c32f6824323d94dcfeeb2
 					if (res.data.mess == "支付成功") {
 						uni.showToast({
 							icon: 'success',