From 8fda99bb210dfb2521beffafc657e85f3251cdc8 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 10 Mar 2024 20:43:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news/recycling/index.vue | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/pages/news/recycling/index.vue b/pages/news/recycling/index.vue
index 016f412..80c30a7 100644
--- a/pages/news/recycling/index.vue
+++ b/pages/news/recycling/index.vue
@@ -148,31 +148,12 @@
 </script>
 
 <style lang="scss" scoped>
-<<<<<<< HEAD
 	.recycling {
 		background: url(https://www.royaum.com.cn/static/news/recycling-bg.png) center top no-repeat;
 		background-size: 100% auto;
 
 		&-hd {
 			height: 320rpx;
-=======
-.recycling{
-	background: #fff url(https://www.royaum.com.cn/static/news/recycling-bg.png) center top no-repeat;
-	background-size: 100% auto;
-	&-hd{
-		height: 280rpx;
-	}
-	&-notice{
-		border-radius: 30rpx 30rpx 0 0;
-		background-color: #fff;
-		display: flex;
-		align-items: center;
-		padding: 0 30rpx;
-		image{
-			width: 50rpx;
-			height: 50rpx;
-			display: block;
->>>>>>> 6e373bfa00736a89d269cd841552ba87aef59342
 		}
 
 		&-notice {