修复打包报错

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 })