From 195ea35798527560962524810f9617f38d3698a8 Mon Sep 17 00:00:00 2001
From: mahe <mh980577760@163.com>
Date: Mon, 18 Dec 2023 15:35:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E5=86=85=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/shopEntry/ShopEntry.vue | 13 +++++++++++--
 seller/src/views/home/home.vue          |  8 +++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/buyer/src/pages/shopEntry/ShopEntry.vue b/buyer/src/pages/shopEntry/ShopEntry.vue
index a55cc7ed..78a7ce54 100644
--- a/buyer/src/pages/shopEntry/ShopEntry.vue
+++ b/buyer/src/pages/shopEntry/ShopEntry.vue
@@ -26,9 +26,11 @@
       <Button type="primary" @click='currentIndex = 0'
         v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
     </div>
-
+ 
     <Modal title="店铺入驻协议" v-model="showAgreement" width="1200" :closable="false" :mask-closable="false">
-      <div class="agreeent-con" v-html="agreementCon"></div>
+      <Scroll :on-reach-bottom="handleReachBottom">
+        <div class="agreeent-con" v-html="agreementCon"></div>
+      </Scroll>
 
       <div slot="footer" style="text-align: center">
         <p>
@@ -69,6 +71,9 @@ export default {
       agreement().then((res) => {
         this.agreementCon = res.result.content;
       });
+    },
+    handleReachBottom(){
+
     },
     getData(status) {
       // 获取已填写店铺信息
@@ -173,6 +178,10 @@ export default {
 }
 .agreeent-con {
   max-height: 500px;
+  ::v-deep img{
+    max-width: 100%;
+    max-height: 200px;
+  }
 }
 .success-page {
   height: 500px;
diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue
index 639fbe3f..e4a55035 100644
--- a/seller/src/views/home/home.vue
+++ b/seller/src/views/home/home.vue
@@ -2,7 +2,7 @@
   <div>
 
     <Modal v-model="noticeFlage" :title="noticesDetail.title">
-      <div v-if="noticesDetail" v-html="noticesDetail.content">
+      <div v-if="noticesDetail" class="noticesDetail" v-html="noticesDetail.content">
 
       </div>
     </Modal>
@@ -294,4 +294,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "./home.scss";
+.noticesDetail{
+  /deep/ img{
+    max-width: 100%;
+    max-height: 200px;
+  }
+}
 </style>