From e4365294d4f4e9ddbfde959231cb485d7a755b83 Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Thu, 19 Nov 2020 23:21:33 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88vue-router?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                       |   3 +-
 src/App.vue                        | 406 +++++++++++++++++++----------
 src/assets/css/bbbug.css           |   3 +-
 src/components/DingCallback.vue    |  48 ----
 src/components/GiteeCallback.vue   |  48 ----
 src/components/GithubCallback.vue  |  48 ----
 src/components/Login.vue           |  12 +-
 src/components/MySetting.vue       |  32 ++-
 src/components/MySongList.vue      |   8 +-
 src/components/OSChinaCallback.vue |  48 ----
 src/components/OnlineList.vue      |  13 +-
 src/components/PlayingSongList.vue |  10 +-
 src/components/Profile.vue         |   7 +-
 src/components/QQCallback.vue      |  48 ----
 src/components/RoomCreate.vue      |  19 +-
 src/components/RoomList.vue        |  17 +-
 src/components/RoomPassword.vue    |  10 +-
 src/components/RoomSetting.vue     |  21 --
 src/components/SearchSongs.vue     |   4 -
 src/components/SystemSetting.vue   |  17 +-
 src/main.js                        | 117 +--------
 21 files changed, 350 insertions(+), 589 deletions(-)
 delete mode 100755 src/components/DingCallback.vue
 delete mode 100755 src/components/GiteeCallback.vue
 delete mode 100755 src/components/GithubCallback.vue
 delete mode 100755 src/components/OSChinaCallback.vue
 delete mode 100755 src/components/QQCallback.vue

diff --git a/package.json b/package.json
index 78b9935..3cfc7dc 100755
--- a/package.json
+++ b/package.json
@@ -12,8 +12,7 @@
     "clipboard": "^2.0.6",
     "element-ui": "^2.3.4",
     "vue": "^2.5.16",
-    "vue-photo-preview": "^1.1.3",
-    "vue-router": "^3.3.2"
+    "vue-photo-preview": "^1.1.3"
   },
   "engines": {
     "node": ">=6"
diff --git a/src/App.vue b/src/App.vue
index 0bbbf5c..558d06e 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -21,31 +21,31 @@
                     <div v-if="roomInfo.room_type==1 || roomInfo.room_type==4">
                         <div class="bbbug_main_menu_icon"
                             v-if="roomInfo.room_addsong==0 || roomInfo.room_user==userInfo.user_id || userInfo.user_admin">
-                            <router-link to="/search_songs">
+                            <div @click="hideAll();dialog.SearchSongs=true;">
                                 <img src="//cdn.bbbug.com/new/images/menubar_picksong.png" title="点歌" />
                                 <div>点歌</div>
-                            </router-link>
+                            </div>
                         </div>
                         <div class="bbbug_main_menu_icon"
                             v-if="roomInfo.room_type==1 || (roomInfo.room_type==4 &&  roomInfo.room_addsong==0)">
-                            <router-link to="/playing_songs">
+                            <div @click="hideAll();dialog.PlayingSongList=true;">
                                 <img src="//cdn.bbbug.com/new/images/menubar_pickedsong.png" title="已点歌曲列表" />
                                 <div>已点</div>
-                            </router-link>
+                            </div>
                         </div>
                         <div class="bbbug_main_menu_icon"
                             v-if="roomInfo.room_type==1 || (roomInfo.room_type==4 && (roomInfo.room_addsong==0 || roomInfo.room_user==userInfo.user_id))">
-                            <router-link to="/my_songs">
+                            <div @click="hideAll();dialog.MySongList=true;">
                                 <img src="//cdn.bbbug.com/new/images/menubar_mysong.png" title="我点过的歌单" />
                                 <div>歌单</div>
-                            </router-link>
+                            </div>
                         </div>
                     </div>
                     <div class="bbbug_main_menu_icon">
-                        <router-link to="/hot_rooms">
+                        <div @click="hideAll();dialog.RoomList=true;">
                             <img src="//cdn.bbbug.com/new/images/menubar_selectroom.png" title="切换房间" />
                             <div>房间</div>
-                        </router-link>
+                        </div>
 
                     </div>
                     <div class="bbbug_main_menu_song_ctrl">
@@ -64,9 +64,9 @@
                         <img src="//cdn.bbbug.com/new/images/loading.png" />
                     </div>
                     <div class="bbbug_main_menu_setting">
-                        <router-link to="/system_setting"><img src="//cdn.bbbug.com/new/images/menubar_setting.png"
-                                title="系统设置" />
-                        </router-link>
+                        <div @click="hideAll();dialog.SystemSetting=true;">
+                            <img src="//cdn.bbbug.com/new/images/menubar_setting.png" title="系统设置" />
+                        </div>
                     </div>
                 </div>
                 <div class="bbbug_main_chat">
@@ -284,9 +284,22 @@
                             {{urldecode(songInfo.user.user_name)}}</font>
                     </div>
                 </div>
+                <div class="bbbug_frame">
+                    <MySetting class="bbbug_frame_box" v-if="dialog && dialog.MySetting"></MySetting>
+                    <MySongList class="bbbug_frame_box" v-if="dialog && dialog.MySongList"></MySongList>
+                    <OnlineList class="bbbug_frame_box" v-if="dialog && dialog.OnlineList"></OnlineList>
+                    <PlayingSongList class="bbbug_frame_box" v-if="dialog && dialog.PlayingSongList">
+                    </PlayingSongList>
+                    <Profile class="bbbug_frame_box" v-if="dialog && dialog.Profile"></Profile>
+                    <RoomCreate class="bbbug_frame_box" v-if="dialog && dialog.RoomCreate"></RoomCreate>
+                    <RoomList class="bbbug_frame_box" v-if="dialog && dialog.RoomList"></RoomList>
+                    <RoomPassword class="bbbug_frame_box" v-if="dialog && dialog.RoomPassword"></RoomPassword>
+                    <RoomSetting class="bbbug_frame_box" v-if="dialog && dialog.RoomSetting"></RoomSetting>
+                    <SearchSongs class="bbbug_frame_box" v-if="dialog && dialog.SearchSongs"></SearchSongs>
+                    <SystemSetting class="bbbug_frame_box" v-if="dialog && dialog.SystemSetting"></SystemSetting>
+                    <Login v-if="dialog && dialog.Login"></Login>
+                </div>
             </div>
-            <router-view @App="AppController" class="bbbug_frame">
-            </router-view>
         </div>
         <div v-if="isLocked">
             <div class="bbbug_locked bbbug_bg" @click.stop="isLocked=!isLocked;"
@@ -309,10 +322,28 @@
     </div>
 </template>
 <script>
+    import MySetting from './components/MySetting.vue';
+    import MySongList from './components/MySongList.vue';
+    import OnlineList from './components/OnlineList.vue';
+    import PlayingSongList from './components/PlayingSongList.vue';
+    import Profile from './components/Profile.vue';
+    import RoomCreate from './components/RoomCreate.vue';
+    import RoomList from './components/RoomList.vue';
+    import RoomPassword from './components/RoomPassword.vue';
+    import RoomSetting from './components/RoomSetting.vue';
+    import SearchSongs from './components/SearchSongs.vue';
+    import SystemSetting from './components/SystemSetting.vue';
+
+    import Login from './components/Login.vue';
+
     export
         default {
+            components: {
+                MySetting, MySongList, OnlineList, PlayingSongList, Profile, RoomCreate, RoomList, RoomPassword, RoomSetting, SearchSongs, SystemSetting, Login
+            },
             data() {
                 return {
+                    dialog: false,
                     audioUrl: "",
                     audioImage: "//cdn.bbbug.com/new/images/loading.png",
                     uploadImageUrl: "",
@@ -361,85 +392,50 @@
             },
             created() {
                 let that = this;
-                that.updateDarkModel();
-                for (let i = 1; i <= 30; i++) {
-                    that.emojiList.push('https://cdn.bbbug.com/images/emoji/' + i + '.png');
-                }
             },
             mounted() {
                 let that = this;
-                let access_token = localStorage.getItem("access_token") || false;
-                that.updateServerTime();
-                window.onkeydown = function (e) {
-                    switch (e.keyCode) {
-                        case 27:
-                            that.isLocked = !that.isLocked;
-                            break;
-                        default:
-                    }
-                };
 
-                if (access_token) {
-                    that.global.baseData.access_token = access_token;
-                } else {
-                    that.global.baseData.access_token = that.global.guestUserInfo.access_token;
-                }
-                that.baseData = that.global.baseData;
-                that.uploadImageUrl = that.global.api.url + "attach/uploadimage";
-
-                let room_change_id = localStorage.getItem('room_change_id') || that.global.room_id;
-                that.request({
-                    url: "room/getRoomByDomain",
-                    data: {
-                        room_domain: location.host.replace(".bbbug.com", "")
-                    },
-                    success(res) {
-                        if (!room_change_id) {
-                            localStorage.setItem('room_change_id', res.data.room_id);
-                        }
+                that.checkInitUrl(function () {
+                    that.$on('App', function (data) {
+                        that.AppController(data);
+                    });
+                    let isDarkModel = localStorage.getItem("isDarkModel") == 1 ? true : false;
+                    that.updateDarkModel(isDarkModel);
+                    for (let i = 1; i <= 30; i++) {
+                        that.emojiList.push('https://cdn.bbbug.com/images/emoji/' + i + '.png');
                     }
-                    , error(res) {
-                        if (!room_change_id) {
-                            localStorage.setItem('room_change_id', that.global.room_id);
+
+                    that.hideAll();
+                    let access_token = localStorage.getItem("access_token") || false;
+                    that.updateServerTime();
+                    window.onkeydown = function (e) {
+                        switch (e.keyCode) {
+                            case 27:
+                                that.isLocked = !that.isLocked;
+                                break;
+                            default:
                         }
+                    };
+
+                    if (access_token) {
+                        that.global.baseData.access_token = access_token;
+                    } else {
+                        that.global.baseData.access_token = that.global.guestUserInfo.access_token;
                     }
-                });
-                if (!localStorage.getItem('isDarkModel') && localStorage.getItem('isDarkModel') != 0) {
-                    that.$confirm('全新的BBBUG暗黑模式上线啦,是否体验一下?', '暗黑模式上线啦', {
-                        confirmButtonText: '体验',
-                        cancelButtonText: '暂不',
-                        closeOnClickModal: false,
-                        closeOnPressEscape: false,
-                        type: 'warning'
-                    }).then(function () {
-                        that.isDarkModel = true;
-                        localStorage.setItem('isDarkModel', 1);
-                        that.updateDarkModel();
-                        that.getUserInfo();
-                        that.callParentFunction('noticeClicked', 'success');
-                        that.$nextTick(function () {
-                            that.$refs.audio.volume = parseFloat(that.audioVolume / 100);
-                            if (that.audioUrl) {
-                                that.$refs.audio.play();
-                            }
-                        });
-                    }).catch(function () {
-                        that.isDarkModel = false;
-                        localStorage.setItem('isDarkModel', 0);
-                        that.updateDarkModel();
-                        that.getUserInfo();
-                        that.callParentFunction('noticeClicked', 'success');
-                        that.$nextTick(function () {
-                            that.$refs.audio.volume = parseFloat(that.audioVolume / 100);
-                            if (that.audioUrl) {
-                                that.$refs.audio.play();
-                            }
-                        });
-                    });
-                } else {
-                    that.$alert('嗨，欢迎来到BBBUG音乐聊天室一起听歌聊天呀~', 'BBBUG.COM', {
-                        confirmButtonText: '确定',
-                        callback() {
+                    that.baseData = that.global.baseData;
+                    that.uploadImageUrl = that.global.api.url + "attach/uploadimage";
+
+                    let room_change_id = localStorage.getItem('room_change_id') || that.global.room_id;
+                    if (!localStorage.getItem('isDarkModel') && localStorage.getItem('isDarkModel') != 0) {
+                        that.$confirm('全新的BBBUG暗黑模式上线啦,是否体验一下?', '暗黑模式上线啦', {
+                            confirmButtonText: '体验',
+                            cancelButtonText: '暂不',
+                            closeOnClickModal: false,
+                            closeOnPressEscape: false,
+                            type: 'warning'
+                        }).then(function () {
+                            that.updateDarkModel(true);
                             that.getUserInfo();
                             that.callParentFunction('noticeClicked', 'success');
                             that.$nextTick(function () {
@@ -448,32 +444,175 @@
                                     that.$refs.audio.play();
                                 }
                             });
-                        }
+                        }).catch(function () {
+                            that.updateDarkModel(false);
+                            that.getUserInfo();
+                            that.callParentFunction('noticeClicked', 'success');
+                            that.$nextTick(function () {
+                                that.$refs.audio.volume = parseFloat(that.audioVolume / 100);
+                                if (that.audioUrl) {
+                                    that.$refs.audio.play();
+                                }
+                            });
+                        });
+                    } else {
+                        that.$alert('嗨，欢迎来到BBBUG音乐聊天室一起听歌聊天呀~', 'BBBUG.COM', {
+                            confirmButtonText: '确定',
+                            callback() {
+                                that.getUserInfo();
+                                that.callParentFunction('noticeClicked', 'success');
+                                that.$nextTick(function () {
+                                    that.$refs.audio.volume = parseFloat(that.audioVolume / 100);
+                                    if (that.audioUrl) {
+                                        that.$refs.audio.play();
+                                    }
+                                });
+                            }
+                        });
+                    }
+                    that._clipboard = new that.clipboard(".bbbug_main_chat_invate");
+                    that._clipboard.on('success', function () {
+                        that.$message.success("复制成功，快去发给好友吧~");
                     });
-                }
-                that._clipboard = new that.clipboard(".bbbug_main_chat_invate");
-                that._clipboard.on('success', function () {
-                    that.$message.success("复制成功，快去发给好友吧~");
-                });
-                that._clipboard.on('error', function () {
-                    that.$message.error("复制失败")
+                    that._clipboard.on('error', function () {
+                        that.$message.error("复制失败")
+                    });
+                    let volume = localStorage.getItem('volume');
+                    if (volume == '' || volume == undefined || volume == null) {
+                        volume = 50;
+                    }
+                    that.audioVolume = parseInt(volume);
+                    document.addEventListener('paste', that.getClipboardFiles);
+                    that.loadConfig();
                 });
-                let volume = localStorage.getItem('volume');
-                if (volume == '' || volume == undefined || volume == null) {
-                    volume = 50;
-                }
-                that.audioVolume = parseInt(volume);
-                document.addEventListener('paste', that.getClipboardFiles);
-                that.loadConfig();
             },
             methods: {
-                updateDarkModel() {
-                    this.isDarkModel = localStorage.getItem('isDarkModel') == 1 ? true : false;
+                checkInitUrl(callback) {
+                    let that = this;
+                    let code = '';
+                    switch (location.pathname) {
+                        case '/gitee':
+                            code = location.search.replace('?code=', '');
+                            that.request({
+                                url: 'user/thirdlogin',
+                                data: {
+                                    from: "gitee",
+                                    code: code,
+                                },
+                                success(res) {
+                                    that.global.baseData.access_token = res.data.access_token;
+                                    localStorage.setItem('access_token', res.data.access_token);
+                                    location.replace("/");
+                                },
+                                error(res) {
+                                    setTimeout(function () {
+                                        location.replace("/");
+                                    }, 3000);
+                                }
+                            });
+                            break;
+                        case '/ding':
+                            code = location.search.replace('?code=', '').replace('&state=STATE', '');
+                            that.request({
+                                url: 'user/thirdlogin',
+                                data: {
+                                    from: "ding",
+                                    code: code,
+                                },
+                                success(res) {
+                                    that.global.baseData.access_token = res.data.access_token;
+                                    localStorage.setItem('access_token', res.data.access_token);
+                                    location.replace("/");
+                                },
+                                error(res) {
+                                    setTimeout(function () {
+                                        location.replace("/");
+                                    }, 3000);
+                                }
+                            });
+                            break;
+                        case '/oschina':
+                            code = location.search.replace('?code=', '').replace('&state=', '');
+                            console.log(code);
+                            that.request({
+                                url: 'user/thirdlogin',
+                                data: {
+                                    from: "oschina",
+                                    code: code,
+                                },
+                                success(res) {
+                                    that.global.baseData.access_token = res.data.access_token;
+                                    localStorage.setItem('access_token', res.data.access_token);
+                                    location.replace("/");
+                                },
+                                error(res) {
+                                    setTimeout(function () {
+                                        location.replace("/");
+                                    }, 3000);
+                                }
+                            });
+                            break;
+                        case '/qq':
+                            code = location.search.replace('?code=', '').replace('&state=' + encodeURIComponent(location.origin), '');
+                            that.request({
+                                url: 'user/thirdlogin',
+                                data: {
+                                    from: "qq",
+                                    code: code,
+                                },
+                                success(res) {
+                                    that.global.baseData.access_token = res.data.access_token;
+                                    localStorage.setItem('access_token', res.data.access_token);
+                                    location.replace("/");
+                                },
+                                error(res) {
+                                    setTimeout(function () {
+                                        location.replace("/");
+                                    }, 3000);
+                                }
+                            });
+                            break;
+                        default:
+                            if (location.search != '') {
+                                let room_id = this.getQueryString("room_id") || 888;
+                                let access_token = this.getQueryString("access_token") || false;
+                                if (access_token) {
+                                    localStorage.setItem('access_token', access_token);
+                                }
+                                localStorage.setItem('room_change_id', room_id);
+                                location.replace("/");
+                                return;
+                            }
+                            callback();
+                    }
+                },
+                getQueryString(name) {
+                    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+                    var r = window.location.search.substr(1).match(reg);
+                    if (r != null) return unescape(r[2]); return null;
+                },
+                loginGuest() {
+                    localStorage.removeItem('access_token');
+                    this.global.baseData.access_token = this.global.guestUserInfo.access_token;
+                    this.global.userInfo = this.global.guestUserInfo;
+                    this.hideAll();
+                    this.getUserInfo();
+                },
+                showLoginForm() {
+                    this.userInfo = this.global.guestUserInfo;
+                    this.hideAll();
+                    this.dialog.Login = true;
+                },
+                updateDarkModel(isDarkModel) {
+                    this.isDarkModel = isDarkModel;
                     if (this.isDarkModel) {
                         document.body.className = 'bbbug_dark';
+                        localStorage.setItem('isDarkModel', 1);
                     } else {
                         document.body.className = '';
+                        localStorage.setItem('isDarkModel', 0);
                     }
+                    this.$forceUpdate();
                 },
                 loadConfig() {
                     this.isEnableNoticePlayer = localStorage.getItem('isEnableNoticePlayer') != 1 ? true : false;
@@ -593,7 +732,7 @@
                     return;
                 },
                 showQrCode() {
-                    this.$alert('<center><span class="item" style="color:red;font-size:14px;"><font color=black style="font-size:20px;">手机扫码立即穿梭</font><br><br><img width="200px" src="https://qr.hamm.cn?data=' + encodeURIComponent('https://bbbug.com/auto_login?access_token=' + this.baseData.access_token) + '"/><br>请不要截图发给其他人,避免账号被盗</span></center>', {
+                    this.$alert('<center><span class="item" style="color:red;font-size:14px;"><font color=black style="font-size:20px;">手机扫码立即穿梭</font><br><br><img width="200px" src="https://qr.hamm.cn?data=' + encodeURIComponent(location.origin + '/?access_token=' + this.baseData.access_token) + '"/><br>请不要截图发给其他人,避免账号被盗</span></center>', {
                         dangerouslyUseHTMLString: true
                     });
                 },
@@ -770,25 +909,32 @@
                     }
                 },
                 openMySetting() {
-                    if (location.pathname != '/') {
-                        this.hideAll();
-                    } else {
-                        this.$router.push('/my_setting');
-                    }
+                    this.hideAll();
+                    this.dialog.MySetting = true;
                 },
                 openRoomSetting() {
-                    if (location.pathname != '/room_setting') {
-                        this.$router.push('/room_setting');
-                    }
+                    this.hideAll();
+                    this.dialog.RoomSetting = true;
                 },
                 hideAll() {
-                    if (location.pathname != '/') {
-                        this.$router.push('/');
-                    }
                     this.isEmojiBoxShow = false;
                     this.isSongPannelShow = false;
                     this.closeMenu();
                     this.global.songKeyword = '';
+                    this.dialog = {
+                        MySetting: false,
+                        MySongList: false,
+                        OnlineList: false,
+                        PlayingSongList: false,
+                        Profile: false,
+                        RoomCreate: false,
+                        RoomList: false,
+                        RoomPassword: false,
+                        RoomSetting: false,
+                        SearchSongs: false,
+                        SystemSetting: false,
+                        Login: false,
+                    };
                 },
                 hideAllDialog() {
                     this.isEmojiBoxShow = false;
@@ -848,7 +994,8 @@
 
                     if (e.keyCode && e.keyCode == 13 && e.ctrlKey) {
                         that.global.songKeyword = that.message;
-                        that.$router.push('/search_songs');
+                        that.hideAll();
+                        that.dialog.SearchSongs = true;
                         return;
                     }
 
@@ -893,6 +1040,7 @@
                     });
                 },
                 AppController(data) {
+                    console.log(data);
                     eval("this." + data + "()");
                 },
                 hideLoading() {
@@ -957,8 +1105,6 @@
                                 }
                             }
                             that.addSystemMessage(that.global.roomInfo.room_notice ? that.global.roomInfo.room_notice : ('欢迎来到' + that.global.roomInfo.room_name + '!'));
-                            // that.messageList.push(JSON.parse('{"type":"text","content":"兄弟萌,BBBUG微信小程序开源并上线啦,欢迎体验一下呀,也欢迎牛逼的你来贡献代码~","where":"channel","at":false,"message_id":"14385","time":1705447369,"resource":"","user":{"user_id":10000,"user_icon":1,"user_sex":1,"user_vip":"BBBUG项目发起者与开发者","user_device":"MacOS","user_name":"Hamm","user_head":"https://cdn.bbbug.com/uploads/thumb/image/20201110/02cf1719d8b759c3c4927e544ec1b28e.gif","user_remark":"开发者交流群1140258698","app_id":1,"app_name":"BBBUG","app_url":"https://bbbug.com","user_admin":true}}'));
-                            // that.messageList.push(JSON.parse('{"type":"img","content":"https://cdn.bbbug.com/new/images/qrcode.jpg","where":"channel","at":null,"message_id":"-1","time":1705447367,"resource":"https://cdn.bbbug.com/new/images/qrcode.jpg","user":{"user_id":10000,"user_icon":1,"user_sex":1,"user_vip":"BBBUG项目发起者与开发者","user_extra":"","user_device":"MacOS","user_name":"Hamm","user_head":"https://cdn.bbbug.com/uploads/thumb/image/20201110/02cf1719d8b759c3c4927e544ec1b28e.gif","app_id":1,"app_name":"BBBUG","app_url":"https://bbbug.com","user_admin":true}}'));
                             that.autoScroll();
                         }
                     });
@@ -1044,7 +1190,7 @@
                         case 'sendSong':
                             that.global.atSongUserInfo = cmd.row;
                             that.hideAll();
-                            that.$router.push('/search_songs');
+                            that.dialog.SearchSongs = true;
                             break;
                         case 'shutdown':
                             that.request({
@@ -1080,10 +1226,8 @@
                             that.global.profileUserId = cmd.row.user_id;
                             that.hideAll();
                             that.$nextTick(function () {
-                                if (location.pathname == '/profile') {
-                                    that.$router.push('/');
-                                }
-                                that.$router.push('/profile');
+                                that.hideAll();
+                                that.dialog.Profile = true;
                             });
                             break;
                         case 'sendSong':
@@ -1093,7 +1237,8 @@
                     }
                 },
                 showOnlineList() {
-                    this.$router.push('/online');
+                    this.hideAll();
+                    this.dialog.OnlineList = true;
                 },
                 autoScroll() {
                     let that = this;
@@ -1128,9 +1273,8 @@
                             that.appLoading = false;
                             switch (res.code) {
                                 case 302:
-                                    if (location.pathname != '/room_password') {
-                                        that.$router.push('/room_password');
-                                    }
+                                    that.hideAll();
+                                    that.dialog.RoomPassword = true;
                                     break;
                                 default:
                                     localStorage.setItem('room_change_id', 888);
@@ -1149,15 +1293,7 @@
                             that.copyData = decodeURIComponent(that.songInfo.user.user_name) + " 在 " + that.roomInfo.room_name + ' 点了一首 ' + that.songInfo.song.name + "(" + that.songInfo.song.singer + ")快来一起听听吧~\n";
                         }
                     }
-                    if (that.roomInfo.room_domain && that.roomInfo.room_domainstatus) {
-                        if (that.roomInfo.room_single) {
-                            that.copyData += that.roomInfo.room_url;
-                        } else {
-                            that.copyData += "https://" + that.roomInfo.room_domain + ".bbbug.com";
-                        }
-                    } else {
-                        that.copyData += "https://bbbug.com/" + that.roomInfo.room_id + ".html";
-                    }
+                    that.copyData += location.origin + that.roomInfo.room_id + ".html";
                 },
                 passTheSong() {
                     let that = this;
diff --git a/src/assets/css/bbbug.css b/src/assets/css/bbbug.css
index 50a2a27..a748858 100644
--- a/src/assets/css/bbbug.css
+++ b/src/assets/css/bbbug.css
@@ -203,7 +203,7 @@
      text-decoration: none;
      outline:none;
  }
- .bbbug_main_menu_icon a{
+ .bbbug_main_menu_icon div{
     font-size:12px;
     color:#999;
     text-decoration: none;
@@ -456,6 +456,7 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     vertical-align: middle;
+    line-height: 20px;
 }
 
 .bbbug_main_right_online_user {
diff --git a/src/components/DingCallback.vue b/src/components/DingCallback.vue
deleted file mode 100755
index 322cd98..0000000
--- a/src/components/DingCallback.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-    <div id="DingCallback">
-        <div class="DingLoading" v-loading.fullscreen="true"></div>
-    </div>
-</template>
-<script>
-    export
-        default {
-            data() {
-                return {
-                }
-            },
-            created() {
-                let that = this;
-                let code = location.search.replace('?code=', '').replace('&state=STATE','');
-                console.log(code);
-                that.request({
-                    url: 'user/thirdlogin',
-                    data: {
-                        from: "ding",
-                        code: code,
-                    },
-                    success(res) {
-                        that.global.baseData.access_token = res.data.access_token;
-                        localStorage.setItem('access_token', res.data.access_token);
-                        that.$emit('App', 'getUserInfo');
-                        that.$router.push('/');
-                    },
-                    error(res) {
-                        setTimeout(function () {
-                            that.$router.push('/login');
-                        }, 3000);
-                    }
-                });
-            },
-            methods: {
-            },
-        }
-</script>
-<style>
-    .DingLoading {
-        position: absolute;
-        left: 0 !important;
-        right: 0 !important;
-        top: 0 !important;
-        bottom: 0 !important;
-    }
-</style>
\ No newline at end of file
diff --git a/src/components/GiteeCallback.vue b/src/components/GiteeCallback.vue
deleted file mode 100755
index dc53566..0000000
--- a/src/components/GiteeCallback.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-    <div id="GiteeCallback">
-        <div class="GiteeLoading" v-loading.fullscreen="true"></div>
-    </div>
-</template>
-<script>
-    export
-        default {
-            data() {
-                return {
-                }
-            },
-            created() {
-                let that = this;
-                let code = location.search.replace('?code=', '');
-                console.log(code);
-                that.request({
-                    url: 'user/thirdlogin',
-                    data: {
-                        from: "gitee",
-                        code: code,
-                    },
-                    success(res) {
-                        that.global.baseData.access_token = res.data.access_token;
-                        localStorage.setItem('access_token', res.data.access_token);
-                        that.$emit('App', 'getUserInfo');
-                        that.$router.push('/');
-                    },
-                    error(res) {
-                        setTimeout(function () {
-                            that.$router.push('/login');
-                        }, 3000);
-                    }
-                });
-            },
-            methods: {
-            },
-        }
-</script>
-<style>
-    .GiteeLoading {
-        position: absolute;
-        left: 0 !important;
-        right: 0 !important;
-        top: 0 !important;
-        bottom: 0 !important;
-    }
-</style>
\ No newline at end of file
diff --git a/src/components/GithubCallback.vue b/src/components/GithubCallback.vue
deleted file mode 100755
index 2f1df2b..0000000
--- a/src/components/GithubCallback.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-    <div id="GithubCallback">
-        <div class="GithubLoading" v-loading.fullscreen="true"></div>
-    </div>
-</template>
-<script>
-    export
-        default {
-            data() {
-                return {
-                }
-            },
-            created() {
-                let that = this;
-                let code = location.search.replace('?code=', '');
-                console.log(code);
-                that.request({
-                    url: 'user/thirdlogin',
-                    data: {
-                        from: "github",
-                        code: code,
-                    },
-                    success(res) {
-                        that.global.baseData.access_token = res.data.access_token;
-                        localStorage.setItem('access_token', res.data.access_token);
-                        that.$emit('App', 'getUserInfo');
-                        that.$router.push('/');
-                    },
-                    error(res) {
-                        setTimeout(function () {
-                            that.$router.push('/login');
-                        }, 3000);
-                    }
-                });
-            },
-            methods: {
-            },
-        }
-</script>
-<style>
-    .GithubLoading {
-        position: absolute;
-        left: 0 !important;
-        right: 0 !important;
-        top: 0 !important;
-        bottom: 0 !important;
-    }
-</style>
\ No newline at end of file
diff --git a/src/components/Login.vue b/src/components/Login.vue
index 6d6cbd6..3d02e68 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="login">
-        <div class="bbbug_bg"></div>
+        <!-- <div class="bbbug_bg"></div> -->
         <div class="bbbug_login">
             <el-form :model="form" ref="bbbug_login_form" label-width="60px" class="bbbug_login_form"
                 v-loading="bbbug_loading">
@@ -67,11 +67,7 @@
             },
             methods: {
                 loginGuest() {
-                    let that = this;
-                    that.global.baseData.access_token = that.global.guestUserInfo.access_token;
-                    that.global.userInfo = that.global.guestUserInfo;
-                    that.$emit('App', 'getUserInfo');
-                    that.$router.push('/');
+                    this.$parent.loginGuest();
                 },
                 doLogin(formName) {
                     let that = this;
@@ -85,8 +81,8 @@
                                     that.bbbug_loading = false;
                                     that.global.baseData.access_token = res.data.access_token;
                                     localStorage.setItem('access_token', res.data.access_token);
-                                    that.$emit('App', 'getUserInfo');
-                                    that.$router.push('/');
+                                    that.$parent.hideAll();
+                                    that.$parent.getUserInfo();
                                 },
                                 error(res) {
                                     that.bbbug_loading = false;
diff --git a/src/components/MySetting.vue b/src/components/MySetting.vue
index 5634737..91a99c9 100755
--- a/src/components/MySetting.vue
+++ b/src/components/MySetting.vue
@@ -5,7 +5,7 @@
                 <div class="bbbug_main_right_room_title">我的个人中心
                     <div class="bbbug_main_right_song_right" @click="updateMyInfo">保存</div>
                 </div>
-                <el-form label-width="60px" class="bbbug_my_setting__form">
+                <el-form label-width="60px" class="bbbug_my_setting__form" v-loading="loading">
                     <div style="text-align: center;margin-bottom: 20px;">
                         <el-upload :action="uploadHeadUrl" :show-file-list="false"
                             :on-success="handleProfileHeadUploadSuccess" :before-upload="doUploadBefore"
@@ -54,6 +54,7 @@
         default {
             data() {
                 return {
+                    loading: false,
                     userInfo: {},
                     roomInfo: {},
                     uploadHeadUrl: "",
@@ -68,10 +69,6 @@
                 }
             },
             created() {
-                if (!this.global.userInfo || !this.global.roomInfo) {
-                    this.$router.push('/');
-                    return;
-                }
                 this.userInfo = Object.assign({}, this.global.userInfo);
                 this.roomInfo = Object.assign({}, this.global.roomInfo);
 
@@ -80,8 +77,8 @@
                 this.uploadHeadUrl = this.global.api.url + "attach/uploadHead";
                 this.baseData = this.global.baseData;
                 if (this.userInfo.user_id < 0) {
-                    this.$emit('App', 'hideAll');
-                    this.$router.push('/login');
+                    this.$parent.hideAll();
+                    this.$parent.showLoginForm();
                 }
             },
             methods: {
@@ -117,13 +114,26 @@
                 },
                 updateMyInfo() {
                     let that = this;
+                    that.loading = true;
                     that.request({
                         url: "user/updateMyInfo",
                         data: that.userInfo,
                         success(res) {
                             that.$message.success(res.msg);
-                            that.$emit('App', 'getUserInfo');
-                            that.$router.push('/');
+                            that.request({
+                                url: "user/getmyinfo",
+                                success(res) {
+                                    that.loading = false;
+                                    that.$parent.userInfo = res.data;
+                                    that.global.userInfo = res.data;
+                                    that.$parent.hideAll();
+                                },
+                                error() {
+                                    that.loading = false;
+                                }
+                            });
+                        }, error() {
+                            that.loading = false;
                         }
                     });
                 },
@@ -137,8 +147,8 @@
                         localStorage.removeItem('access_token');
                         that.global.userInfo = that.global.guestUserInfo;
                         that.global.baseData.access_token = that.global.guestUserInfo.access_token;
-                        that.$emit('App', 'getUserInfo');
-                        that.$router.push('/');
+                        that.$parent.hideAll();
+                        that.$parent.getUserInfo();
                     }).catch(function () { });
                 },
             },
diff --git a/src/components/MySongList.vue b/src/components/MySongList.vue
index 59b30b7..3e596c0 100755
--- a/src/components/MySongList.vue
+++ b/src/components/MySongList.vue
@@ -2,9 +2,7 @@
     <div id="MySongList">
         <div class="bbbug_main_right">
             <div class="bbbug_main_right_song">
-                <div class="bbbug_main_right_song_title">我点过的歌
-                    <!-- <router-link to="/search_songs" class="bbbug_main_right_song_right">我要点歌</router-link> -->
-                </div>
+                <div class="bbbug_main_right_song_title">我点过的歌</div>
                 <div class="bbbug_main_right_song_list" v-loading="bbbug_loading">
                     <div class="bbbug_scroll" v-if="list.length>0" @scroll="onScroll">
                         <div class="bbbug_main_right_song_item" v-for="(item,index) in list" v-loading="item.loading">
@@ -46,10 +44,6 @@
                 }
             },
             created() {
-                if (!this.global.userInfo || !this.global.roomInfo) {
-                    this.$router.push('/');
-                    return;
-                }
                 this.userInfo = this.global.userInfo;
                 this.roomInfo = Object.assign({}, this.global.roomInfo);
                 this.getList();
diff --git a/src/components/OSChinaCallback.vue b/src/components/OSChinaCallback.vue
deleted file mode 100755
index c685d79..0000000
--- a/src/components/OSChinaCallback.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-    <div id="OSChinaCallback">
-        <div class="OSChinaLoading" v-loading.fullscreen="true"></div>
-    </div>
-</template>
-<script>
-    export
-        default {
-            data() {
-                return {
-                }
-            },
-            created() {
-                let that = this;
-                let code = location.search.replace('?code=', '').replace('&state=','');
-                console.log(code);
-                that.request({
-                    url: 'user/thirdlogin',
-                    data: {
-                        from: "oschina",
-                        code: code,
-                    },
-                    success(res) {
-                        that.global.baseData.access_token = res.data.access_token;
-                        localStorage.setItem('access_token', res.data.access_token);
-                        that.$emit('App', 'getUserInfo');
-                        that.$router.push('/');
-                    },
-                    error(res) {
-                        setTimeout(function () {
-                            that.$router.push('/login');
-                        }, 3000);
-                    }
-                });
-            },
-            methods: {
-            },
-        }
-</script>
-<style>
-    .OSChinaLoading {
-        position: absolute;
-        left: 0 !important;
-        right: 0 !important;
-        top: 0 !important;
-        bottom: 0 !important;
-    }
-</style>
\ No newline at end of file
diff --git a/src/components/OnlineList.vue b/src/components/OnlineList.vue
index c06483a..9b95cfd 100755
--- a/src/components/OnlineList.vue
+++ b/src/components/OnlineList.vue
@@ -47,7 +47,8 @@
                                     </el-dropdown>
                                 </div>
                                 <div class="bbbug_main_right_online_user">
-                                    <div class="bbbug_main_right_online_user_nick" :style="{color:item.user_shutdown?'#aaa':'#333'}">
+                                    <div class="bbbug_main_right_online_user_nick"
+                                        :style="{color:item.user_shutdown?'#aaa':'#333'}">
                                         <i class="iconfont icon-icon_certification_f user_icon"
                                             style="font-size:18px;color:#097AD8;" v-if="item.user_vip"
                                             :title="item.user_vip"></i>
@@ -92,7 +93,7 @@
                     this.roomInfo = this.global.roomInfo;
                     this.getList();
                 } else {
-                    this.$router.push('/');
+                    this.$parent.hideAll();
                 }
             },
             methods: {
@@ -135,7 +136,7 @@
                                 user_name: cmd.row.user_name
                             };
                             that.$emit('App', 'atUser');
-                            that.$router.push('/');
+                            that.$parent.hideAll();
                             break;
                         case 'touch':
                             that.doTouch(cmd.row.user_id);
@@ -182,12 +183,14 @@
                         case 'profile':
                             that.global.profileUserId = cmd.row.user_id;
                             that.$nextTick(function () {
-                                that.$router.push('/profile');
+                                that.$parent.hideAll();
+                                that.$parent.dialog.Profile = true;
                             });
                             break;
                         case 'sendSong':
                             that.global.atSongUserInfo = cmd.row;
-                            that.$router.push('/search_songs');
+                            that.$parent.hideAll();
+                            that.$parent.dialog.SearchSongs = true;
                             break;
                         default:
                             that.$message.error('即将上线，敬请期待');
diff --git a/src/components/PlayingSongList.vue b/src/components/PlayingSongList.vue
index e91a971..74d7ce8 100755
--- a/src/components/PlayingSongList.vue
+++ b/src/components/PlayingSongList.vue
@@ -3,7 +3,7 @@
         <div class="bbbug_main_right">
             <div class="bbbug_main_right_song">
                 <div class="bbbug_main_right_song_title">正在等待播放的歌
-                    <router-link to="/search_songs" class="bbbug_main_right_song_right">我要点歌</router-link>
+                    <div @click="searchSong" class="bbbug_main_right_song_right">我要点歌</div>
                 </div>
                 <div class="bbbug_main_right_song_list" v-loading="bbbug_loading">
                     <div class="bbbug_scroll" v-if="list.length>0">
@@ -54,15 +54,15 @@
                 }
             },
             created() {
-                if (!this.global.userInfo || !this.global.roomInfo) {
-                    this.$router.push('/');
-                    return;
-                }
                 this.userInfo = this.global.userInfo;
                 this.roomInfo = Object.assign({}, this.global.roomInfo);
                 this.getList();
             },
             methods: {
+                searchSong() {
+                    this.$parent.hideAll();
+                    this.$parent.dialog.SearchSongs = true;
+                },
                 getList() {
                     let that = this;
                     if (that.bbbug_loading) {
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index f1e0dee..c023cb9 100755
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -66,10 +66,6 @@
                 }
             },
             created() {
-                if (!this.global.roomInfo) {
-                    this.$router.push('/');
-                    return;
-                }
                 this.roomInfo = this.global.roomInfo;
                 this.getUserProfile();
                 this.getSongList();
@@ -108,7 +104,8 @@
                     if (that.userInfo.myRoom) {
                         let room_id = that.userInfo.myRoom.room_id;
                         localStorage.setItem('room_change_id', room_id);
-                        that.$emit('App', 'changeRoom');
+                        that.$parent.hideAll();
+                        that.$parent.changeRoom();
                     } else {
                         that.$message.error("Ta当前没有创建自己的音乐房间");
                     }
diff --git a/src/components/QQCallback.vue b/src/components/QQCallback.vue
deleted file mode 100755
index bfc39a0..0000000
--- a/src/components/QQCallback.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-    <div id="QQCallback">
-        <div class="QQLoading" v-loading.fullscreen="true"></div>
-    </div>
-</template>
-<script>
-    export
-        default {
-            data() {
-                return {
-                }
-            },
-            created() {
-                let that = this;
-                let code = location.search.replace('?code=', '').replace('&state=https%3A%2F%2Fbbbug.com','');
-                console.log(code);
-                that.request({
-                    url: 'user/thirdlogin',
-                    data: {
-                        from: "qq",
-                        code: code,
-                    },
-                    success(res) {
-                        that.global.baseData.access_token = res.data.access_token;
-                        localStorage.setItem('access_token', res.data.access_token);
-                        that.$emit('App', 'getUserInfo');
-                        that.$router.push('/');
-                    },
-                    error(res) {
-                        setTimeout(function () {
-                            that.$router.push('/login');
-                        }, 3000);
-                    }
-                });
-            },
-            methods: {
-            },
-        }
-</script>
-<style>
-    .QQLoading {
-        position: absolute;
-        left: 0 !important;
-        right: 0 !important;
-        top: 0 !important;
-        bottom: 0 !important;
-    }
-</style>
\ No newline at end of file
diff --git a/src/components/RoomCreate.vue b/src/components/RoomCreate.vue
index 77a8cbb..072d036 100755
--- a/src/components/RoomCreate.vue
+++ b/src/components/RoomCreate.vue
@@ -46,26 +46,13 @@
                     }, {
                         value: 1,
                         title: "点歌音乐房"
-                        // }, {
-                        //     value: 2,
-                        //     title: "猜歌游戏房"
                     }, {
-                        //     value: 3,
-                        //     title: "有声故事房"
-                        // }, {
                         value: 4,
                         title: "房主电台房"
-                        // }, {
-                        //     value: 5,
-                        //     title: "虎牙直播房"
                     }],
                 }
             },
             created() {
-                if (!this.global.userInfo) {
-                    this.$router.push('/');
-                    return;
-                }
                 this.userInfo = this.global.userInfo;
             },
             methods: {
@@ -81,10 +68,10 @@
                                 type: 'warning'
                             }).then(function () {
                                 localStorage.setItem('room_change_id', res.data.room_id);
-                                that.$emit('App', 'getUserInfo');
-                                that.$router.push('/');
+                                that.$parent.hideAll();
+                                that.$parent.getUserInfo();
                             }).catch(function () {
-                                that.$router.push('/');
+                                that.$parent.hideAll();
                             });
                         }
                     });
diff --git a/src/components/RoomList.vue b/src/components/RoomList.vue
index 8d6c9f0..e6d5a9a 100755
--- a/src/components/RoomList.vue
+++ b/src/components/RoomList.vue
@@ -3,8 +3,7 @@
         <div class="bbbug_main_right">
             <div class="bbbug_main_right_room">
                 <div class="bbbug_main_right_room_title">热门房间列表
-                    <router-link to="/create_room" class="bbbug_main_right_song_right" v-if="!userInfo.myRoom">创建房间
-                    </router-link>
+                    <div class="bbbug_main_right_room_right" @click="createNewRoom" v-if="!userInfo.myRoom">创建房间</div>
                     <div class="bbbug_main_right_room_right" @click="joinMyRoom" v-if="userInfo.myRoom">我的房间</div>
                     <el-input style="margin-top:20px;" placeholder="输入房间ID" size="small" class="input-with-select"
                         prefix-icon="el-icon-search" v-model="room_id" @keydown.13.native="joinRoom(room_id)">
@@ -63,18 +62,22 @@
                 urldecode(str) {
                     return decodeURIComponent(str);
                 },
+                createNewRoom() {
+                    this.$parent.hideAll();
+                    this.$parent.dialog.RoomCreate = true;
+                },
                 joinRoom(room_id) {
-                    let that = this;
                     if (room_id) {
                         localStorage.setItem('room_change_id', room_id);
-                        that.$emit('App', 'changeRoom');
+                        this.$parent.hideAll();
+                        this.$parent.changeRoom();
                     }
                 },
                 joinMyRoom() {
-                    let that = this;
-                    let room_id = that.userInfo.myRoom.room_id;
+                    let room_id = this.userInfo.myRoom.room_id;
                     localStorage.setItem('room_change_id', room_id);
-                    that.$emit('App', 'changeRoom');
+                    this.$parent.hideAll();
+                    this.$parent.changeRoom();
                 },
                 getList() {
                     let that = this;
diff --git a/src/components/RoomPassword.vue b/src/components/RoomPassword.vue
index 0723257..be7b986 100755
--- a/src/components/RoomPassword.vue
+++ b/src/components/RoomPassword.vue
@@ -26,18 +26,18 @@
             },
             created() {
                 if (!this.global.userInfo) {
-                    this.$router.push('/');
                     localStorage.setItem('room_change_id', 888);
+                    this.$parent.hideAll();
+                    this.$parent.getRoomInfo();
                     return;
                 }
                 this.userInfo = this.global.userInfo;
             },
             methods: {
                 enterRoom() {
-                    let that = this;
-                    that.global.room_password = that.room_password;
-                    that.$emit('App', 'getRoomInfo');
-                    that.$router.push('/');
+                    this.global.room_password = this.room_password;
+                    this.$parent.hideAll();
+                    this.$parent.getRoomInfo();
                 },
             },
         }
diff --git a/src/components/RoomSetting.vue b/src/components/RoomSetting.vue
index f0e15bc..9ff3472 100755
--- a/src/components/RoomSetting.vue
+++ b/src/components/RoomSetting.vue
@@ -12,14 +12,6 @@
                     <el-form-item label="房间公告">
                         <el-input v-model="roomInfo.room_notice" placeholder="请输入房间公告"></el-input>
                     </el-form-item>
-                    <el-form-item label="二级域名">
-                        <el-input v-model="roomInfo.room_domain" placeholder="请输入一个二级域名前缀"></el-input>
-                    </el-form-item>
-                    <div v-if="roomInfo.room_domain" class="bbbug_room_domain_tips">
-                        地址：<a target="_blank" style="text-decoration:none;color:#666;"
-                            :href="'https://'+roomInfo.room_domain+'.bbbug.com'">
-                            {{roomInfo.room_domain}}.bbbug.com</a>
-                    </div>
                     <el-form-item label="房间权限">
                         <el-select size="small" v-model="roomInfo.room_public" placeholder="请选择房间权限类别">
                             <el-option v-for="(item,index) in room_public" :label="item.title" :value="item.value">
@@ -168,26 +160,13 @@
                     }, {
                         value: 1,
                         title: "点歌音乐房"
-                        // }, {
-                        //     value: 2,
-                        //     title: "猜歌游戏房"
                     }, {
-                        //     value: 3,
-                        //     title: "有声故事房"
-                        // }, {
                         value: 4,
                         title: "房主电台房"
-                        // }, {
-                        //     value: 5,
-                        //     title: "虎牙直播房"
                     }],
                 }
             },
             created() {
-                if (!this.global.userInfo || !this.global.roomInfo) {
-                    this.$router.push('/');
-                    return;
-                }
                 this.userInfo = this.global.userInfo;
                 this.roomInfo = Object.assign({}, this.global.roomInfo);
             },
diff --git a/src/components/SearchSongs.vue b/src/components/SearchSongs.vue
index 2cbbcd7..135de61 100755
--- a/src/components/SearchSongs.vue
+++ b/src/components/SearchSongs.vue
@@ -56,10 +56,6 @@
       };
     },
     created() {
-      if (!this.global.userInfo || !this.global.roomInfo) {
-        this.$router.push('/');
-        return;
-      }
       this.userInfo = this.global.userInfo;
       this.roomInfo = Object.assign({}, this.global.roomInfo);
       this.atSongUserInfo = this.global.atSongUserInfo;
diff --git a/src/components/SystemSetting.vue b/src/components/SystemSetting.vue
index 4e6330a..8109549 100755
--- a/src/components/SystemSetting.vue
+++ b/src/components/SystemSetting.vue
@@ -28,19 +28,15 @@
                     roomInfo: {},
                     isEnableNoticePlayer: true,
                     isEnableNotification: true,
-                    isDarkModelTemp: true
+                    isDarkModelTemp: false
                 }
             },
             created() {
-                if (!this.global.userInfo || !this.global.roomInfo) {
-                    this.$router.push('/');
-                    return;
-                }
                 this.userInfo = Object.assign({}, this.global.userInfo);
                 this.roomInfo = Object.assign({}, this.global.roomInfo);
                 this.isEnableNoticePlayer = localStorage.getItem('isEnableNoticePlayer') != 1 ? true : false;
                 this.isEnableNotification = localStorage.getItem('isEnableNotification') != 1 ? true : false;
-                this.isDarkModelTemp = localStorage.getItem('isDarkModel') == 1 ? true : false;
+                this.isDarkModelTemp = this.$parent.isDarkModel;
             },
             methods: {
                 isEnableNoticePlayerChanged() {
@@ -52,14 +48,7 @@
                     this.$emit('App', 'loadConfig');
                 },
                 isDarkModelChanged() {
-                    let that = this;
-                    console.log(this.isDarkModelTemp)
-                    this.isDarkModel = this.isDarkModelTemp;
-                    localStorage.setItem('isDarkModel', this.isDarkModel ? 1 : 0);
-                    this.$emit('App', 'updateDarkModel');
-                    this.$nextTick(function(){
-                        that.$router.push('/');
-                    });
+                    this.$parent.updateDarkModel(this.isDarkModelTemp);
                 }
             },
         }
diff --git a/src/main.js b/src/main.js
index 314221f..21f5eda 100755
--- a/src/main.js
+++ b/src/main.js
@@ -1,11 +1,12 @@
 //main.js文件中引入
 import Vue from 'vue';
-import VueRouter from 'vue-router';
 //导入ElementUI
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 Vue.use(ElementUI);
 import axios from 'axios';
+import preview from 'vue-photo-preview'
+import 'vue-photo-preview/dist/skin.css'
 import './assets/css/bbbug.css';
 Vue.prototype.$axios = axios;
 import clipboard from 'clipboard';
@@ -14,7 +15,7 @@ Vue.prototype.clipboard = clipboard;
 
 Vue.prototype.Event = new Vue();
 Vue.prototype.global = {
-    isDarkModel:true,
+    isDarkModel: true,
     room_id: 888,
     room_password: "",
     guestUserInfo: {
@@ -39,19 +40,13 @@ Vue.prototype.global = {
         url: "https://api.bbbug.com/api/",
         static: "https://cdn.bbbug.com/",//这里修改为 https://api.bbbug.com/ 对应你的api 根路径
     },
-    songKeyword:"",
+    songKeyword: "",
 };
 
 Vue.prototype.isDarkModel = false;
-Vue.prototype.changeDarkModel=function(enabled){
+Vue.prototype.changeDarkModel = function (enabled) {
     this.isDarkModel = enabled;
 };
-Vue.prototype.doLogout = function () {
-    this.global.userInfo = this.global.guestUserInfo;
-    this.global.baseData.access_token = this.global.guestUserInfo.access_token;
-    localStorage.removeItem('access_token');
-};
-
 Vue.prototype.urldecode = function (str) {
     return decodeURIComponent(str);
 };
@@ -75,6 +70,9 @@ Vue.prototype.request = function (_data) {
                 case 401:
                     that.$emit('App', 'hideLoading');
                     that.$emit('App', 'hideAll');
+                    that.$parent.$emit('App', 'hideLoading');
+                    that.$parent.$emit('App', 'hideAll');
+                    console.log(that);
                     if (_data.login) {
                         that.$message.error(response.data.msg);
                         _data.login();
@@ -86,11 +84,13 @@ Vue.prototype.request = function (_data) {
                             closeOnPressEscape: false,
                             type: 'warning'
                         }).then(function () {
-                            that.doLogout();
-                            that.$router.push('/login');
+                            that.$emit('App', 'loginGuest');
+                            that.$emit('App', 'showLoginForm');
+                            that.$parent.$emit('App', 'loginGuest');
+                            that.$parent.$emit('App', 'showLoginForm');
                         }).catch(function () {
                             if (that.global.baseData.access_token != that.global.guestUserInfo.access_token) {
-                                that.doLogout();
+                                that.$parent.$emit('App', 'loginGuest');
                                 that.request(_data);
                             }
                         });
@@ -129,100 +129,11 @@ Vue.prototype.websocket = {
 };
 //主体
 import App from './App.vue';
-import preview from 'vue-photo-preview'
-import 'vue-photo-preview/dist/skin.css'
-import RoomList from './components/RoomList.vue';
-import MySongList from './components/MySongList.vue';
-import PlayingSongList from './components/PlayingSongList.vue';
-import SearchSongs from './components/SearchSongs.vue';
-import Login from './components/Login.vue';
-import GiteeCallback from './components/GiteeCallback.vue';
-import OSChinaCallback from './components/OSChinaCallback.vue';
-import DingCallback from './components/DingCallback.vue';
-import QQCallback from './components/QQCallback.vue';
-// import GithubCallback from './components/GithubCallback.vue';
-import OnlineList from './components/OnlineList.vue';
-import RoomSetting from './components/RoomSetting.vue';
-import RoomCreate from './components/RoomCreate.vue';
-import RoomPassword from './components/RoomPassword.vue';
-import MySetting from './components/MySetting.vue';
-import AutoLogin from './components/AutoLogin.vue';
-import Profile from './components/Profile.vue';
-import SystemSetting from './components/SystemSetting.vue';
 
 Vue.use(vuePhotoPreview, {});
-//安装插件
-Vue.use(VueRouter); //挂载属性
-//创建路由对象并配置路由规则
-let router = new VueRouter({
-    mode: 'history',
-    routes: [
-        //一个个对象
-        {
-            path: '/login',
-            component: Login
-        }, {
-            path: '/hot_rooms',
-            component: RoomList
-        }, {
-            path: '/my_songs',
-            component: MySongList
-        }, {
-            path: '/playing_songs',
-            component: PlayingSongList
-        }, {
-            path: '/search_songs',
-            component: SearchSongs
-        }, {
-            path: '/gitee',
-            component: GiteeCallback
-        }, {
-            path: '/oschina',
-            component: OSChinaCallback
-        }, {
-            path: '/qq',
-            component: QQCallback
-        }, {
-            path: '/ding',
-            component: DingCallback
-        }, {
-            path: '/online',
-            component: OnlineList
-        }, {
-            path: '/room_setting',
-            component: RoomSetting
-        }, {
-            path: '/room_password',
-            component: RoomPassword
-        }, {
-            path: '/create_room',
-            component: RoomCreate
-        }, {
-            path: '/my_setting',
-            component: MySetting
-        }, {
-            path: '/auto_login',
-            component: AutoLogin
-        }, {
-            path: '/*.html',
-            component: AutoLogin
-        }, {
-            path: '/profile',
-            component: Profile
-        }, {
-            path: '/system_setting',
-            component: SystemSetting
-        },
-        // {
-        //     path: '/github',
-        //     component: GithubCallback
-        // }
-    ]
-});
+
 //new Vue 启动
 new Vue({
     el: '#app',
-    //让vue知道我们的路由规则
-    router: router, //可以简写router
     render: c => c(App),
 });
\ No newline at end of file
-- 
Gitee


From f7afffece4ad9ad4be5ca24f5607784652ff1a27 Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Thu, 19 Nov 2020 23:25:52 +0800
Subject: [PATCH 02/11] =?UTF-8?q?fix:=20=E9=82=80=E8=AF=B7=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E9=94=99=E8=AF=AF=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 558d06e..a708b0f 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -1293,7 +1293,7 @@
                             that.copyData = decodeURIComponent(that.songInfo.user.user_name) + " 在 " + that.roomInfo.room_name + ' 点了一首 ' + that.songInfo.song.name + "(" + that.songInfo.song.singer + ")快来一起听听吧~\n";
                         }
                     }
-                    that.copyData += location.origin + that.roomInfo.room_id + ".html";
+                    that.copyData += location.origin + "/" + that.roomInfo.room_id + ".html";
                 },
                 passTheSong() {
                     let that = this;
-- 
Gitee


From 4f91a9fe38017149b8f1feba9d58cbae06b990b6 Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Thu, 19 Nov 2020 23:32:00 +0800
Subject: [PATCH 03/11] =?UTF-8?q?fix:=20=E9=82=80=E8=AF=B7=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E9=94=99=E8=AF=AF=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a708b0f..eff8dc1 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -572,7 +572,7 @@
                                 }
                             });
                             break;
-                        default:
+                        case '/':
                             if (location.search != '') {
                                 let room_id = this.getQueryString("room_id") || 888;
                                 let access_token = this.getQueryString("access_token") || false;
@@ -584,6 +584,14 @@
                                 return;
                             }
                             callback();
+                            break;
+                        default:
+                            let room_id = location.pathname.replace("/", '');
+                            if ((/(^[1-9]\d*$)/).test(room_id)) {
+                                localStorage.setItem('room_change_id', room_id);
+                            }
+                            location.replace("/");
+                            return;
                     }
                 },
                 getQueryString(name) {
@@ -1293,7 +1301,7 @@
                             that.copyData = decodeURIComponent(that.songInfo.user.user_name) + " 在 " + that.roomInfo.room_name + ' 点了一首 ' + that.songInfo.song.name + "(" + that.songInfo.song.singer + ")快来一起听听吧~\n";
                         }
                     }
-                    that.copyData += location.origin + "/" + that.roomInfo.room_id + ".html";
+                    that.copyData += location.origin + "/" + that.roomInfo.room_id;
                 },
                 passTheSong() {
                     let that = this;
-- 
Gitee


From e49f835545a169f3205dd0d86d1d7bc684997355 Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Thu, 19 Nov 2020 23:37:42 +0800
Subject: [PATCH 04/11] =?UTF-8?q?fix:=20=E9=82=80=E8=AF=B7=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E9=94=99=E8=AF=AF=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main.js b/src/main.js
index 21f5eda..7b40ede 100755
--- a/src/main.js
+++ b/src/main.js
@@ -90,6 +90,7 @@ Vue.prototype.request = function (_data) {
                             that.$parent.$emit('App', 'showLoginForm');
                         }).catch(function () {
                             if (that.global.baseData.access_token != that.global.guestUserInfo.access_token) {
+                                that.$emit('App', 'loginGuest');
                                 that.$parent.$emit('App', 'loginGuest');
                                 that.request(_data);
                             }
-- 
Gitee


From 900a42b942d8ebf0a7efb4e84526703d90627743 Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Fri, 20 Nov 2020 10:18:31 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix:=20@=E7=94=A8=E6=88=B7=E6=B2=A1?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=94=E7=9A=84BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OnlineList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/OnlineList.vue b/src/components/OnlineList.vue
index 9b95cfd..59510c6 100755
--- a/src/components/OnlineList.vue
+++ b/src/components/OnlineList.vue
@@ -135,7 +135,7 @@
                                 user_id: cmd.row.user_id,
                                 user_name: cmd.row.user_name
                             };
-                            that.$emit('App', 'atUser');
+                            that.$parent.atUser();
                             that.$parent.hideAll();
                             break;
                         case 'touch':
-- 
Gitee


From 111ac5654450c37d87ce31a4864d04540da74b7e Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Fri, 20 Nov 2020 10:20:00 +0800
Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B8=BB=E9=A1=B5=E4=B8=8A=E7=9A=84=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Profile.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index c023cb9..d1e83e2 100755
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -34,8 +34,8 @@
                         </div>
                         <div class="bbbug_main_profile_user_name"><i :title="userInfo.user_vip" v-if="userInfo.user_vip"
                                 class="iconfont icon-icon_certification_f user_icon"
-                                style="font-size: 18px; color: rgb(9, 122, 216);"></i> <i title="1024程序员节彩蛋"
-                                class="iconfont icon-github user_icon"
+                                style="font-size: 18px; color: rgb(9, 122, 216);"></i> <i title="使用微信小程序登录过即可获得"
+                                class="iconfont icon-weixin user_icon"
                                 style="font-size: 16px; color: rgb(102, 102, 102);" v-if="userInfo.user_icon"></i>
                             {{urldecode(userInfo.user_name)}}</div>
                     </div>
-- 
Gitee


From 668cbfdf6395543dee54ac61736f600592f29abd Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Fri, 20 Nov 2020 10:20:28 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=E7=A0=8D=E6=8E=89=E4=BA=86?=
 =?UTF-8?q?=E6=88=BF=E9=97=B4=E4=BA=8C=E7=BA=A7=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RoomCreate.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/components/RoomCreate.vue b/src/components/RoomCreate.vue
index 072d036..503ef30 100755
--- a/src/components/RoomCreate.vue
+++ b/src/components/RoomCreate.vue
@@ -12,14 +12,6 @@
                     <el-form-item label="房间公告">
                         <el-input v-model="roomInfo.room_notice" placeholder="请输入房间公告"></el-input>
                     </el-form-item>
-                    <el-form-item label="二级域名">
-                        <el-input v-model="roomInfo.room_domain" placeholder="请输入一个二级域名前缀"></el-input>
-                    </el-form-item>
-                    <div v-if="roomInfo.room_domain" class="bbbug_room_domain_tips">
-                        地址：<a target="_blank" style="text-decoration:none;color:#666;"
-                            :href="'https://'+roomInfo.room_domain+'.bbbug.com'">
-                            {{roomInfo.room_domain}}.bbbug.com</a>
-                    </div>
                     <el-form-item label="房间类型">
                         <el-select size="small" v-model="roomInfo.room_type" placeholder="请选择房间类型">
                             <el-option v-for="(item,index) in room_type" :label="item.title" :value="item.value">
-- 
Gitee


From b8ea27b7adfa9c773c631604bce06e27383add3e Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Fri, 20 Nov 2020 10:21:26 +0800
Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Login.vue       | 2 +-
 src/components/SearchSongs.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Login.vue b/src/components/Login.vue
index 3d02e68..b314cf7 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="login">
-        <!-- <div class="bbbug_bg"></div> -->
+        <div class="bbbug_bg"></div>
         <div class="bbbug_login">
             <el-form :model="form" ref="bbbug_login_form" label-width="60px" class="bbbug_login_form"
                 v-loading="bbbug_loading">
diff --git a/src/components/SearchSongs.vue b/src/components/SearchSongs.vue
index 135de61..2c7c4e5 100755
--- a/src/components/SearchSongs.vue
+++ b/src/components/SearchSongs.vue
@@ -4,7 +4,6 @@
       <div class="bbbug_main_right_song">
         <div class="bbbug_main_right_song_title">
           歌曲搜索
-          <!-- <router-link to="/search_songs" class="bbbug_main_right_song_right">我要点歌</router-link> -->
           <el-input style="margin-top: 20px" placeholder="歌名/歌手/专辑搜索" size="small" v-model="keyword" clearable
             @keydown.13.native="getList">
             <el-button slot="append" icon="el-icon-search" @click="getList">搜索</el-button>
-- 
Gitee


From 8bc266810e39c29a66d8247a3de3d2447c136d3e Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Fri, 20 Nov 2020 10:22:16 +0800
Subject: [PATCH 09/11] =?UTF-8?q?delete:=20=E8=80=81=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=9A=84=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoLogin.vue | 54 ------------------------------------
 src/components/Login.vue     |  3 --
 2 files changed, 57 deletions(-)
 delete mode 100755 src/components/AutoLogin.vue

diff --git a/src/components/AutoLogin.vue b/src/components/AutoLogin.vue
deleted file mode 100755
index d1f8d2e..0000000
--- a/src/components/AutoLogin.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-    <div id="AutoLogin">
-        <div class="AutoLogin" v-loading.fullscreen="true" v-if="isLoading"></div>
-    </div>
-</template>
-<script>
-    export
-        default {
-            data() {
-                return {
-                    isLoading: true
-                }
-            },
-            created() {
-                let that = this;
-                let access_token = that.getQueryString('access_token') || '';
-                let room_id = that.getQueryString('room_id') || false;
-                if (access_token) {
-                    that.global.baseData.access_token = access_token;
-                    localStorage.setItem('access_token', access_token);
-                }
-                if (room_id) {
-                    that.global.room_id = room_id;
-                } else {
-                    if (location.pathname != '/auto_login') {
-                        room_id = location.pathname.replace("/", '').replace(".html", "");
-                    }
-                    if (room_id != parseInt(room_id)) {
-                        room_id = 888;
-                    }
-                    that.global.room_id = room_id || 888;
-                }
-                that.$emit('App', 'getUserInfo');
-                that.$router.push('/');
-                that.isLoading = false;
-            },
-            methods: {
-                getQueryString(name) {
-                    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-                    var r = window.location.search.substr(1).match(reg);
-                    if (r != null) return unescape(r[2]); return null;
-                }
-            },
-        }
-</script>
-<style>
-    .AutoLogin {
-        position: absolute;
-        left: 0 !important;
-        right: 0 !important;
-        top: 0 !important;
-        bottom: 0 !important;
-    }
-</style>
\ No newline at end of file
diff --git a/src/components/Login.vue b/src/components/Login.vue
index b314cf7..dcc802b 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -38,9 +38,6 @@
                             href="https://oapi.dingtalk.com/connect/qrconnect?appid=dingoag8afgz20g2otw0jf&response_type=code&scope=snsapi_login&state=STATE&redirect_uri=https://bbbug.com/ding">
                             钉钉
                         </el-link>
-                        <!-- <el-link href="http://github.com/login/oauth/authorize?client_id=Iv1.c287a5d998f38f1f&redirect_uri=https://bbbug.com/github">
-                            Github
-                        </el-link> -->
                     </span>
 
                     <el-button type="primary" @click="doLogin('bbbug_login_form')">立即登录</el-button>
-- 
Gitee


From a29c24fb7a4ba77a546b1a0a65f8cb47fbea3de8 Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Fri, 20 Nov 2020 10:53:58 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=E8=BE=93=E5=85=A5=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E9=94=99=E8=AF=AF=E5=90=8E=E5=88=B7=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index eff8dc1..087a119 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -1281,8 +1281,13 @@
                             that.appLoading = false;
                             switch (res.code) {
                                 case 302:
-                                    that.hideAll();
-                                    that.dialog.RoomPassword = true;
+                                    if (that.global.roomInfo) {
+                                        that.hideAll();
+                                        that.dialog.RoomPassword = true;
+                                    } else {
+                                        localStorage.setItem('room_change_id', 888);
+                                        that.getRoomInfo();
+                                    }
                                     break;
                                 default:
                                     localStorage.setItem('room_change_id', 888);
-- 
Gitee


From 3f2726538da23dd9bcb9954420cda0692b1b9fc5 Mon Sep 17 00:00:00 2001
From: Hamm <majhamm@qq.com>
Date: Fri, 20 Nov 2020 11:03:51 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=E8=BE=93=E5=85=A5=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=AF=86=E7=A0=81=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RoomPassword.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/RoomPassword.vue b/src/components/RoomPassword.vue
index be7b986..64079cf 100755
--- a/src/components/RoomPassword.vue
+++ b/src/components/RoomPassword.vue
@@ -7,7 +7,8 @@
                 </div>
                 <el-form label-width="80px" class="bbbug_room_setting_form">
                     <el-form-item label="房间密码">
-                        <el-input v-model="room_password" placeholder="请输入房间密码"></el-input>
+                        <el-input v-model="room_password" placeholder="请输入房间密码" @keydown.13.native="enterRoom">
+                        </el-input>
                     </el-form-item>
                 </el-form>
             </div>
-- 
Gitee