Merge remote-tracking branch 'remotes/origin/dev_yijun' into mutou

src/main.js

@@ -5,8 +5,8 @@ import store from './store'
 import axios from 'axios'
 import wx from 'weixin-js-sdk'
 import api from "@/components/axios/api"
-import VConsole from 'vconsole/dist/vconsole.min.js' //import vconsole
-let vConsole = new VConsole() // 初始化
+// import VConsole from 'vconsole/dist/vconsole.min.js' //import vconsole
+// let vConsole = new VConsole() // 初始化
 
 
 Vue.config.productionTip = false

src/views/HaveJoinedGame.vue

@@ -817,7 +817,7 @@ export default {
       width: 0.58rem;
       height: 0.58rem;
       position: absolute;
-      bottom: -0.88rem;
+      top: -0.88rem;
       right: 0;
     }
   }