no message

src/App.vue

@@ -1,10 +1,11 @@
 <template>
 
     <layout-entry>
+<!--      v-slot="{Component}"-->
         <router-view v-slot="{Component}">
-          <keep-alive ref="keep" :include="$store.state.router.keepLiveRoute">
+<!--          <keep-alive ref="keep" :include="$store.state.router.keepLiveRoute">-->
               <component :is="Component"></component>
-          </keep-alive>
+<!--          </keep-alive>-->
         </router-view>
 
     </layout-entry>

src/config/cate.ts

@@ -53,7 +53,9 @@ export default {
                     image:require('../views/view-cate/images/cate/2.png'),
                     tid:-998,
                     options:{
-                        is_hot:2
+                        is_hot:2,
+                        sort:2,
+                        sort_type:1
                     }
                 },
             ],
@@ -67,4 +69,4 @@ export default {
         }
     }
 
-}
+}

src/config/config.ts

@@ -2,8 +2,8 @@ export default <Config>{
 
     baseApiURL:'/api',
 
-    // baseURL:'http://newqiaoyu.lanmaonet.com/',
-    baseURL:'http://newqiaoyu.com/',
+    baseURL:'http://newqiaoyu.lanmaonet.com/',
+    // baseURL:'http://newqiaoyu.com/',
 
     app:undefined,
 

src/layout/layout-entry/data/about.ts

@@ -1,15 +1,21 @@
+import {LocationTrigger} from "$mixins/trigger/class";
+
 export default {
 
     data:<LibDataArray>[
         {
             label:'关于我们',
+            trigger: new LocationTrigger('https://www.baidu.com')
         },
         {
             label:'用户协议',
+            trigger: new LocationTrigger('https://www.baidu.com')
         }
     ],
 
-    label:'版权所有© ****网络科技有限公司 *公网安备42018502004524号 备案号：*ICP备20007050号'
+    label:'版权所有© ****网络科技有限公司 *公网安备42018502004524号 备案号：*ICP备20007050号',
+
+    trigger: new LocationTrigger('https://www.baidu.com')
 
 
-} as LibData;
+} as LibData;

src/layout/layout-status/const/status.ts

@@ -1,11 +1,11 @@
 enum PlayStatus {
 
     // 在线
-    onLine,
+    onLine1=1,
 
     // 离线
-    offLine,
+    offLine=0,
 
 }
 
-export default PlayStatus;
+export default PlayStatus;

src/pages/talking/mixins/handle.ts

@@ -62,7 +62,7 @@ export default <LibMixins>{
                     return resolve(this.$params.infoData);
                 } else {
                     return this.$request({
-                        url:'room/get_room_info',
+                        url:'room/enter_room_info',
                         data:{
                             rid: this.$params.rid,
                             password: this.$params.password
@@ -96,6 +96,7 @@ export default <LibMixins>{
         setRoomInfo(data,resolve,reject){
             this.roomInfo = data;
 
+            console.log(data);
             if (!this.setRoomInfoStatus && this.agoraRTMIM.status !== AgoraRTMIMStatus.join) {
                 this.setRoomInfoStatus = true;
                 // 安装 socket

src/popup/popup-personal/components/my-naming/mixins/handle.ts

@@ -60,7 +60,8 @@ export default <LibMixins>{
                             naming:{
                                 nick_name: item.nick_name,
                                 image: item.image
-                            }
+                            },
+                            must:true
                         });
 
                     }

src/popup/popup-personal/components/my-naming/src/main.vue

@@ -5,7 +5,9 @@
         :pageSize="15"
     >
       <template v-slot:item="{item,index}">
-        <aside class="dress-up-item flex overflow">
+        <aside class="dress-up-item flex overflow"
+          :style="{marginTop: index > 4 ? '':'0px'}"
+        >
           <div class="flex-1 center">
             <layout-naming :naming="item.naming" :nickName="user.nick_name"></layout-naming>
           </div>

src/store/modules/chat.ts

@@ -21,6 +21,7 @@ export default <Module<any,any>>{
             let newData = [];
             let chatUserObject = [];
             let chatCount = 0;
+
             // 处理 data
             // @ts-ignore
             data = data.map((item)=>{

src/utils/control/roomList/index.ts

@@ -58,7 +58,7 @@ export default {
 
     getFollowRoomList(page){
         return $request({
-            url:'Usercollectroom/get_user_collect_list',
+            url:'Usercollectroom/get_user_collect_list_hx',
             page,
             token:true,
             entrust: entrust.getEntrust(EntrustType.followRoom)
@@ -67,4 +67,4 @@ export default {
 
 
 
-}
+}

src/utils/control/update_cache/getPlayerList.ts

@@ -24,7 +24,7 @@ export default {
 
         return this.updateCache(data.uid,data,function (cacheItem,item) {
 
-            if (cacheItem[0] && !cacheItem[0].guanming) {
+            if (cacheItem[0] && !cacheItem[0].guanming || cacheItem[0] && item.must) {
                 cacheItem[0].guanming = item.naming;
             }
 

src/views/view-header/components/search-modal/components/search-list/src/main.vue

@@ -31,7 +31,7 @@
                 <div class="line-1">{{cItem.nick_name}}</div>
                 <div class="line-1 search-list-id">房间ID：{{cItem.room_number}}</div>
               </div>
-              <div class="search-list-home-button center">交友</div>
+              <div class="search-list-home-button center">{{cItem.category_name}}</div>
             </aside>
             <!--  其他   -->
             <aside v-else class="search-list-user rowACenter cursor-pointer"
@@ -43,7 +43,7 @@
                 <div class="line-1">{{cItem.nick_name}}</div>
                 <div class="line-1 search-list-id">ID：{{cItem.uid}}</div>
               </div>
-              <layout-status></layout-status>
+              <layout-status v-if="item === SearchListType.play" :status="cItem.is_business"></layout-status>
             </aside>
           </template>
         </section>
@@ -113,4 +113,4 @@ export default {
 }
 </script>
 
-<style scoped lang="scss" src="../style.scss"></style>
+<style scoped lang="scss" src="../style.scss"></style>

src/views/view-header/mixins/login.ts

@@ -1,4 +1,5 @@
 import {PopupExportComponent} from "$popup/popup-export/const";
+import popup from "$utils/tool/popup";
 
 export default <LibMixins>{
 
@@ -17,6 +18,7 @@ export default <LibMixins>{
                 title:'您确定要退出登录吗',
                 confirm:()=>{
                     this.$store.dispatch('outLogin');
+                    popup.$open(PopupExportComponent.login);
                 }
             });
         }

src/views/view-play-with/mixins/handle.ts

@@ -60,8 +60,9 @@ export default <LibMixins>{
 
         socket.on('view-play-with', (data)=>{
             if (this.$refs.fetch) {
+
                 let item = this.$refs.fetch.flat_get_data(data.uid);
-                if (!item.guanming) {
+                if (!item.guanming || data.must) {
                     item.guanming = data.naming;
                     this.$refs.fetch.flat_update(data.uid,item);
                 }

src/views/view-room/mixins/handle.ts

@@ -2,6 +2,8 @@ import personalDetail, {OpenType} from '$utils/control/personal-detail';
 
 import roomList from '$utils/control/roomList';
 
+import url from '$utils/tool/url';
+
 export default <LibMixins>{
 
     methods:{
@@ -10,9 +12,18 @@ export default <LibMixins>{
 
             roomList.getRequestList({
                 ...this.options,
-                tid:this.tid
+                tid:this.tid > 0 ? this.tid : 0
             },obj.data).then((data)=>{
-                return obj.success(data.data);
+                return obj.success((data.data || []).map((item)=>{
+
+                    if (item.room_micro_userlist) {
+                        item.room_micro_userlist = item.room_micro_userlist.map((item)=> url.addBaseURL(item));
+                    } else {
+                        item.room_micro_userlist = [];
+                    }
+
+                    return item;
+                }));
             }).catch(obj.fail);
         },
 
@@ -35,4 +46,4 @@ export default <LibMixins>{
         }
     }
 
-}
+}

src/views/view-room/src/main.vue

@@ -21,10 +21,13 @@
               </div>
             </header>
             <footer class="rowACenter view-room-footer">
-              <aside
-                v-for="(item,index) in 4"
-                class="view-room-avatar"
-              ></aside>
+                <v-image
+                  :src="item.room_micro_userlist[cIndex]"
+                  v-for="(cIndex) in 4"
+                  class="view-room-avatar"
+                  radius="50%"
+                  backgroundColor="rgba(255,255,255,0.2)"
+                ></v-image>
             </footer>
           </section>
         </aside>

src/views/view-room/style.scss

@@ -39,9 +39,7 @@
   margin-right: 4px;
 }
 .view-room-avatar{
-  border-radius: 50%;
   @include square(28px);
-  background-color: rgba(255,255,255,0.2);
   margin-left: 5px;
 }
 .view-room-avatar:first-child{