From 57eebcee911a6d7c9124feddd48b57cd3dfb0b2e Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Sat, 6 Apr 2024 16:42:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 combining.css  | 7 ++++---
 combining.html | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/combining.css b/combining.css
index 5f36557..68f5660 100644
--- a/combining.css
+++ b/combining.css
@@ -437,8 +437,8 @@ body {
   width: 2.835rem;
   min-height: 1.5rem;
   margin: 0 auto;
-  position: relative;
-  top: 30%;
+  position: absolute;
+  top: 20%;
   background-color: #fff;
   border-radius: 0.15rem;
   text-align: center;
@@ -492,5 +492,6 @@ body {
   padding: 0.05rem 0.2rem;
 }
 .err-list-p {
-  padding: 0.05rem;
+  padding: 0.02rem;
+  font-size: 0.12rem;
 }
diff --git a/combining.html b/combining.html
index ff05b3e..eac1eb6 100644
--- a/combining.html
+++ b/combining.html
@@ -132,7 +132,7 @@
 
             <!-- 弹窗 -->
             <div class="tip-pop mask" v-show="popMsg">
-                <div class="tip-main" style="top: 10%;">
+                <div class="tip-main">
                     <div class="tip-pop-head">
                         <img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/combining/zh-dd.png"
                             class="tip-pop-dd" />
@@ -157,8 +157,7 @@
                         请根据界面错误原因进行调整后再重试
                     </p>
 
-                    <div v-if="errListShow"
-                        style="padding: 0 0.2rem;overflow-y: scroll;max-height: 2rem;text-align: left;">
+                    <div v-if="errListShow" style="padding: 0 0.2rem;text-align: left;">
                         <p class="err-list-p" v-for="(item,index) in goods.err_msg">错误{{Number(index) + 1}}: {{ item }}
                         </p>
                     </div>