Merge branch 'master' into dev

# Conflicts:
#	src/apis/member.ts
#	src/pages/user/VipIntro.vue

public/static-home.html

@@ -285,6 +285,10 @@
             border-radius: 1rem;
             margin-top: 1.2rem;
         }
+
+        .cursor-pointer{
+            cursor: pointer;
+        }
     </style>
 
     <script>
@@ -576,7 +580,7 @@
         <header>
             <div class="title">QQ群</div>
             <svg
-                    onclick="toggleXhsDialog()"
+                    onclick="toggleQQDialog()"
                     viewBox="0 0 20 20" width="24" height="1.2em" class="cursor-pointer">
                 <path fill="currentColor"
                       d="m4.089 4.216l.057-.07a.5.5 0 0 1 .638-.057l.07.057L10 9.293l5.146-5.147a.5.5 0 0 1 .638-.057l.07.057a.5.5 0 0 1 .057.638l-.057.07L10.707 10l5.147 5.146a.5.5 0 0 1 .057.638l-.057.07a.5.5 0 0 1-.638.057l-.07-.057L10 10.707l-5.146 5.147a.5.5 0 0 1-.638.057l-.07-.057a.5.5 0 0 1-.057-.638l.057-.07L9.293 10L4.146 4.854a.5.5 0 0 1-.057-.638l.057-.07z"></path>