Merge branch 'master' of http://git.ycjcjy.com/H5/njDaTuSha

src/pages/pg2/index.vue

@@ -47,12 +47,12 @@
       <div>
         <InkEffect
           class="ink-ruins"
-          src="./images/pg2/peace-color.png"
+          src="./images/pg2/废墟color.png"
           :speed="10"
           :active="inkActive"
           :clearable="true"
         />
-        <img class="ruins" src="/images/pg2/peace.png" alt />
+        <img class="ruins" src="/images/pg2/废墟.png" alt />
       </div>
     </div>
     <div class="flower1">
@@ -158,7 +158,6 @@ watch(show, (val) => {
   }
 
   .content {
-    position: absolute;
     z-index: 10;
     width: 80vw;
     margin-left: 15vw;
@@ -187,8 +186,7 @@ watch(show, (val) => {
   }
 
   .groups {
-    // top: 50vh;
-    bottom: 0;
+    top: 50vh;
     left: 0;
     width: 100%;
     z-index: 3;
@@ -250,7 +248,7 @@ watch(show, (val) => {
     position: absolute;
     z-index: 20;
     right: 0;
-    top: 280px;
+    top: 250px;
     img {
       width: 80px;
     }