diff --git a/src/App.vue b/src/App.vue
index aa74039..3c9f428 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,48 +1,40 @@
 <script setup lang="ts">
-import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
-onLaunch(() => {
-  console.log("App Launch");
-});
-onShow(() => {
-  console.log("App Show");
-});
-onHide(() => {
-  console.log("App Hide");
-});
+import { onLaunch, onShow, onHide } from "@dcloudio/uni-app"
+onLaunch(() => {})
+onShow(() => {})
+onHide(() => {})
 </script>
 
-
 <style lang="scss">
 @import "@/sheep/scss/global.scss";
 @import url(@/uni_modules/tm-ui/css/remixicon.min.css);
 
-
 $theme-green: #06be36;
 $theme-blue: #0094ff;
 $theme-gray: #999;
 
 .botder_btn {
-  border: 1px solid #999;
-  color: #999;
-  font-weight: 500;
-  font-size: 28rpx;
-  border-radius: 10rpx;
-  padding: 8rpx 15rpx;
+	border: 1px solid #999;
+	color: #999;
+	font-weight: 500;
+	font-size: 28rpx;
+	border-radius: 10rpx;
+	padding: 8rpx 15rpx;
 }
 
 .prefix_title {
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #333;
+	font-size: 32rpx;
+	font-weight: 500;
+	color: #333;
 
-  &::before {
-    content: '';
-    display: inline-block;
-    width: 8rpx;
-    height: 24rpx;
-    background: $theme-blue;
-    border-radius: 4rpx;
-    margin-right: 10rpx;
-  }
+	&::before {
+		content: "";
+		display: inline-block;
+		width: 8rpx;
+		height: 24rpx;
+		background: $theme-blue;
+		border-radius: 4rpx;
+		margin-right: 10rpx;
+	}
 }
 </style>
diff --git a/src/pages/refund/apply.vue b/src/pages/refund/apply.vue
index 15d996c..b42c13a 100644
--- a/src/pages/refund/apply.vue
+++ b/src/pages/refund/apply.vue
@@ -37,10 +37,7 @@ onLoad((options: any) => {
 	if (!isEmpty(options.id)) {
 		state.detailId = options.id
 	}
-<<<<<<< HEAD
 	state.header = hooks.useDefaultHeader()
-=======
->>>>>>> c3eaafa5d0575ebd0fa74be0180c5cfe8a9901ea
 })
 onShow(() => {
 	getDetail()
@@ -105,10 +102,7 @@ const doSubmit = async () => {
 		images: [],
 		applyReason: applyForm.reasonStr,
 		applyDescription: applyForm.remark,
-<<<<<<< HEAD
 		applyPicUrls: applyPicUrls.value,
-=======
->>>>>>> c3eaafa5d0575ebd0fa74be0180c5cfe8a9901ea
 	}
 	try {
 		uni.showLoading({ title: "申请中...", mask: false })
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 584c28f..f1bc0bd 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive } from "vue"
+import { reactive } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
 import { isEmpty } from "radash"