From d7b1b17751d8d1cfaf33d12f04c7f57727a18f2e Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Wed, 21 Jun 2023 17:24:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopro-notice-modal/shopro-notice-modal.vue   | 15 +++++++++++++++
 pages/index/index.vue                             |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/components/shopro-notice-modal/shopro-notice-modal.vue b/components/shopro-notice-modal/shopro-notice-modal.vue
index 5fc954e..a8bbffe 100644
--- a/components/shopro-notice-modal/shopro-notice-modal.vue
+++ b/components/shopro-notice-modal/shopro-notice-modal.vue
@@ -4,7 +4,11 @@
 			<view class="cu-modal" :class="{ show: showModal }" @tap="hideModal(p, index)" v-if="popupCurrent === index && p.image">
 				<view class="cu-dialog" style="width: 610rpx;background: none;">
 					<view class="img-box" @tap.stop="onPopup(p.path)"><image class="modal-img" :src="p.image" mode="aspectFit"></image></view>
+					<view class="close" @tap="hideModal(p, index)">
+						<u-icon name="close" size="34"></u-icon>
+					</view>
 				</view>
+				
 			</view>
 		</view>
 	</view>
@@ -68,4 +72,15 @@ export default {
 		height: 830rpx;
 	}
 }
+.close{
+	position: absolute;
+	top: 0;
+	right: 0;
+	z-index: 999;
+	border-radius: 50%;
+	text-align: center;
+	padding:20rpx;
+	background-color: #aaaaaa;
+	color:#fff;
+}
 </style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2cabe3f..1e60965 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -90,7 +90,7 @@
 			<!-- 登录提示 -->
 			<shopro-auth-modal></shopro-auth-modal>
 			<!-- 悬浮按钮 -->
-			<shopro-float-btn></shopro-float-btn>
+			<!-- <shopro-float-btn></shopro-float-btn> -->
 			<!-- 连续弹窗提醒 -->
 			<shopro-notice-modal v-if="!showPrivacy && isLogin"></shopro-notice-modal>
 			<!-- 隐私协议 -->