更新优化

dist/assets/index.e7cd6f1c.js → dist/assets/index.aacc2fb7.js

@@ -1 +1 @@
-import{d as i,a as s,n as t}from"./vendor.ec1a2a7a.js";const e="_wscnHttp404Container_1v1ex_1",c="_wscnHttp404_1v1ex_1",u="_pic404_1v1ex_13",n="_pic404__parent_1v1ex_19",o="_pic404__child_1v1ex_22",a="_left_1v1ex_25",d="_cloudLeft_1v1ex_1",r="_mid_1v1ex_36",h="_cloudMid_1v1ex_1",p="_right_1v1ex_47",v="_cloudRight_1v1ex_1",b="_bullshit_1v1ex_124",x="_bullshit__oops_1v1ex_132",m="_slideUp_1v1ex_1",g="_bullshit__headline_1v1ex_143",f="_bullshit__info_1v1ex_155",H="_bullshit__returnHome_1v1ex_166";var _={wscnHttp404Container:e,wscnHttp404:c,pic404:u,pic404__parent:n,pic404__child:o,left:a,cloudLeft:d,mid:r,cloudMid:h,right:p,cloudRight:v,bullshit:b,bullshit__oops:x,slideUp:m,bullshit__headline:g,bullshit__info:f,bullshit__returnHome:H},F="./assets/404.538aa4d7.png",l="./assets/404_cloud.98e7ac66.png",w=i({name:"Page404",data(){return{message:"\u5F88\u62B1\u6B49\uFF0C\u4F60\u8BBF\u95EE\u7684\u9875\u9762\u4E0D\u5B58\u5728"}},render(){return s("div",{class:_.wscnHttp404Container},[s("div",{class:_.wscnHttp404},[s("div",{class:_.pic404},[s("img",{class:_.pic404__parent,src:F,alt:"404"},null),s("img",{class:[_.pic404__child,_.left],src:l,alt:"404"},null),s("img",{class:[_.pic404__child,_.mid],src:l,alt:"404"},null),s("img",{class:[_.pic404__child,_.right],src:l,alt:"404"},null)]),s("div",{class:_.bullshit},[s("div",{class:_.bullshit__oops},[t("OOPS!")]),s("div",{class:_.bullshit__headline},[this.message]),s("div",{class:_.bullshit__info},[t("\u8BF7\u68C0\u67E5\u60A8\u8F93\u5165\u7684\u7F51\u5740\u662F\u5426\u6B63\u786E\uFF0C\u6216\u8005\u70B9\u51FB\u94FE\u63A5\u7EE7\u7EED\u6D4F\u89C8")]),s("a",{href:"",class:_.bullshit__returnHome},[t("\u8FD4\u56DE\u9996\u9875")])])])])}});export{w as default};
+import{d as i,a as s,l as t}from"./vendor.9de3b924.js";const e="_wscnHttp404Container_1v1ex_1",c="_wscnHttp404_1v1ex_1",u="_pic404_1v1ex_13",n="_pic404__parent_1v1ex_19",o="_pic404__child_1v1ex_22",a="_left_1v1ex_25",d="_cloudLeft_1v1ex_1",r="_mid_1v1ex_36",h="_cloudMid_1v1ex_1",p="_right_1v1ex_47",v="_cloudRight_1v1ex_1",b="_bullshit_1v1ex_124",x="_bullshit__oops_1v1ex_132",m="_slideUp_1v1ex_1",g="_bullshit__headline_1v1ex_143",f="_bullshit__info_1v1ex_155",H="_bullshit__returnHome_1v1ex_166";var _={wscnHttp404Container:e,wscnHttp404:c,pic404:u,pic404__parent:n,pic404__child:o,left:a,cloudLeft:d,mid:r,cloudMid:h,right:p,cloudRight:v,bullshit:b,bullshit__oops:x,slideUp:m,bullshit__headline:g,bullshit__info:f,bullshit__returnHome:H},F="./assets/404.538aa4d7.png",l="./assets/404_cloud.98e7ac66.png",w=i({name:"Page404",data(){return{message:"\u5F88\u62B1\u6B49\uFF0C\u4F60\u8BBF\u95EE\u7684\u9875\u9762\u4E0D\u5B58\u5728"}},render(){return s("div",{class:_.wscnHttp404Container},[s("div",{class:_.wscnHttp404},[s("div",{class:_.pic404},[s("img",{class:_.pic404__parent,src:F,alt:"404"},null),s("img",{class:[_.pic404__child,_.left],src:l,alt:"404"},null),s("img",{class:[_.pic404__child,_.mid],src:l,alt:"404"},null),s("img",{class:[_.pic404__child,_.right],src:l,alt:"404"},null)]),s("div",{class:_.bullshit},[s("div",{class:_.bullshit__oops},[t("OOPS!")]),s("div",{class:_.bullshit__headline},[this.message]),s("div",{class:_.bullshit__info},[t("\u8BF7\u68C0\u67E5\u60A8\u8F93\u5165\u7684\u7F51\u5740\u662F\u5426\u6B63\u786E\uFF0C\u6216\u8005\u70B9\u51FB\u94FE\u63A5\u7EE7\u7EED\u6D4F\u89C8")]),s("a",{href:"",class:_.bullshit__returnHome},[t("\u8FD4\u56DE\u9996\u9875")])])])])}});export{w as default};

dist/index.html

@@ -5,8 +5,8 @@
     <link rel="icon" href="./favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>管乐迷</title>
-    <script type="module" crossorigin src="./assets/index.07d1df06.js"></script>
-    <link rel="modulepreload" href="./assets/vendor.ec1a2a7a.js">
+    <script type="module" crossorigin src="./assets/index.59722d82.js"></script>
+    <link rel="modulepreload" href="./assets/vendor.9de3b924.js">
     <link rel="stylesheet" href="./assets/index.fb6968e4.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
   </head>
@@ -14,7 +14,7 @@
     <div id="app"></div>
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c8689cf4.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.dd7450d1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.68541211.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.635de733.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/components/live-message/index.tsx

@@ -71,7 +71,7 @@ export default defineComponent({
         <div class={styles.tabContent}>
           <Message />
           <div class={styles.tabList} id="tabList">
-            <MessageModel v-show={this.modelIndex === 'message'} />
+            <MessageModel ref="messageModel" v-show={this.modelIndex === 'message'} />
             <JoinModel v-show={this.modelIndex === 'join'} />
             <LookModel v-show={this.modelIndex === 'look'} />
           </div>

src/components/live-message/model/index.module.less

@@ -20,7 +20,7 @@
   align-items: center;
   padding-top: 3px;
   .userName {
-    font-size: 14px;
+    font-size: 15px;
     line-height: 22px;
     // display: flex;
     align-items: center;

src/components/live-message/model/join-model.tsx

@@ -68,8 +68,18 @@ export default defineComponent({
       const response = evt.$EventMessage.messageType === 'RC:Chatroom:SeatResponse'
       const userRoomType = response ? 4 : 3
       // if(evt.$EventMessage.messageType === 'RC:Chatroom:SeatResponse')
+      const sendTime = dayjs(evt.$EventMessage.sentTime || new Date()).format('HH:mm:ss')
+      let tempObj = {
+        name: evt.audienceName,
+        id: evt.audienceId,
+        system: 1,
+        isSelf: false,
+        content: '',
+        sendTime
+      }
       // 申请连麦
       if (evt.type === 3) {
+        console.log(evt, '申请连麦')
         const params = {
           name: evt.audienceName,
           id: evt.audienceId,
@@ -78,6 +88,10 @@ export default defineComponent({
         }
         RuntimeModelUtils.addJoin(evt.audienceId, params)
         RuntimeModelUtils.addLook(evt.audienceId, params)
+
+        tempObj.content = '发起了连麦申请'
+        RuntimeModelUtils.addMessage(tempObj);
+        event.emit('MESSAGE:Change')
       }
       // 取消连麦
       if (evt.type === 4) {
@@ -90,7 +104,13 @@ export default defineComponent({
           userLook.userRoomType = 1
           RuntimeModelUtils.addLook(evt.audienceId, userLook)
         }
+
+        //
+        tempObj.content = response ? '拒绝了连麦申请' : '取消了连麦申请'
+        RuntimeModelUtils.addMessage(tempObj);
+        event.emit('MESSAGE:Change')
       }
+
     },
     agree(item: any) {
       if (this.count > 3) {

src/components/live-message/model/look-model.tsx

@@ -81,6 +81,8 @@ export default defineComponent({
         let isExist = runtimeModel.lookList[tempObj.id] ? true : false;
         if (!isExist) {
           RuntimeModelUtils.addLook(tempObj.id, tempObj);
+          console.log('添加观看人员', tempObj)
+          runtime.lookCount += 1;
         }
 
         this.loadingLook = false

src/components/live-message/model/message-model.tsx

@@ -25,7 +25,7 @@ export default defineComponent({
     event.on(LIVE_EVENT_MESSAGE["RC:TxtMsg"], this.onMessage);
     // event.on(LIVE_EVENT_MESSAGE["RC:Chatroom:Like"], this.onLike)
     event.on(LIVE_EVENT_MESSAGE["RC:ForcedOffline"], this.onForcedOffline)
-
+    event.on('MESSAGE:Change', this.scrollToBottom) // 添加消息
     setTimeout(() => {
       this.loadingMessage = false;
     }, 2000);
@@ -108,7 +108,7 @@ export default defineComponent({
               <div class={styles.itemName}>
                 <div class={styles.userName}>
                   {item.isSelf ? <ElTag effect="dark" color="#01A79E">主讲人</ElTag> : null}
-                  <span class={styles['name-style']}>{item.name}：</span>
+                  <span class={styles['name-style']}>{item.name}{ item.system ? null : '：' }</span>
                   <span class={[styles.itemText, item.isSelf ? styles.active : null]}>
                     {item.content}
                   </span>

src/utils/auth.ts

@@ -4,17 +4,17 @@ const TokenKeyMain = 'dy_admin_token'
 const TokenKey = 'live_admin_token'
 
 export const getToken = () => {
-  const mainToken = Cookies.get(TokenKeyMain)
+  // const mainToken = Cookies.get(TokenKeyMain)
   const token = localStorage.getItem(TokenKey)
-  let returnToken: string | null = null
-  if (token) {
-    returnToken = token
-  } else if (mainToken) {
-    // 如果有主系统的token，则设置为主系统的token
-    localStorage.setItem(TokenKey, mainToken)
-    returnToken = mainToken
-  }
-  return returnToken
+  // let returnToken: string | null = null
+  // if (token) {
+  //   returnToken = token
+  // } else if (mainToken) {
+  //   // 如果有主系统的token，则设置为主系统的token
+  //   localStorage.setItem(TokenKey, mainToken)
+  //   returnToken = mainToken
+  // }
+  return token
 }
 
 export function setToken (token: string) {
@@ -22,7 +22,7 @@ export function setToken (token: string) {
 }
 
 export function removeToken () {
-  Cookies.remove(TokenKeyMain)
+  // Cookies.remove(TokenKeyMain)
   return localStorage.removeItem(TokenKey)
 }