Merge branch 'dev' into order

# Conflicts: # src/assets/dance/logo3.png

Merge branch 'dev' into order
# Conflicts: # src/assets/dance/logo3.png
杨炀
Showing 3 changed files with 1 additions and 1 deletions
src/assets/dance/logo3.png
src/assets/dance/logo4.png
src/viewsPc/index.vue
--- a/src/assets/dance/logo3.png 0 → 100644
View file @5fbc073
+++ b/src/assets/dance/logo3.png 0 → 100644
View file @5fbc073
--- a/src/assets/dance/logo4.png
View file @5fbc073
+++ b/src/assets/dance/logo4.png
View file @5fbc073
--- a/src/viewsPc/index.vue
View file @5fbc073
+++ b/src/viewsPc/index.vue
View file @5fbc073
@@ -980,7 +980,7 @@ const goGuide = () => {
  margin: 0 0 30px;

  img {
-    width: 100%
+    width: 100%;height: 100%;object-fit: contain;
  }
 }