diff --git a/pages/store-home/main/main.vue b/pages/store-home/main/main.vue
index 21d0439..58dfdae 100644
--- a/pages/store-home/main/main.vue
+++ b/pages/store-home/main/main.vue
@@ -33,7 +33,6 @@
 				<image class="image"
 					src="https://ide.code.fun/api/image?token=671134c30a3d780012a6a0cb&name=9be8d37ecdad5a4ae97f3017b8b13575.png" />
 				<input class="text-wrapper ml-3" placeholder="请输入内容" />
->>>>>>> d61915696c41b2c7ea2ed249616fab862ccfe43a
 			</view>
 
 		</view>