lex-xin 3 роки тому
батько
коміт
94d2f393f6

+ 2 - 2
src/components/live-broadcast/action-bar.module.less

@@ -25,8 +25,8 @@
 }
 :global {
   .el-button:active {
-    border-color: transparent;
-    background: rgba(94, 98, 109, 0.33);
+    // border-color: transparent;
+    // background: rgba(94, 98, 109, 0.33);
   }
   .el-dropdown__popper.el-popper {
     border-color: var(--live-main-color) !important;

+ 5 - 4
src/components/live-broadcast/runtime.ts

@@ -370,6 +370,7 @@ export const loopSyncLike = async () => {
   if (runtime.likeCount !== runtime.lastLikeCount || runtime.likeCount === 0) {
     try {
       await request.get('/api-web/imLiveBroadcastRoom/syncLike', {
+        hideLoading: true,
         params: {
           likeNum: runtime.likeCount,
           roomUid: runtime.roomUid,
@@ -387,10 +388,10 @@ type SendMessageType = 'text' | 'image' | 'audio' | 'video' | 'file' | 'SeatsCtr
 
 export const getSendMessageUser = () => {
   return {
-    id: state.user?.id,
-    name: state.user?.realName,
-    userId: state.user?.id,
-    userName: state.user?.realName,
+    id: state.user?.speakerId,
+    name: state.user?.speakerName,
+    userId: state.user?.speakerId,
+    userName: state.user?.speakerName,
   }
 }
 

+ 1 - 1
src/components/live-message/message.module.less

@@ -6,11 +6,11 @@
     padding: 15px 16px;
   }
   .btn {
-    width: 88px;
     height: 30px;
     line-height: 30px;
     font-size: 14px;
     font-weight: 600;
+    padding: 0 15px;
     background: var(--message-color);
     border-radius: 2px;
     color: var(--live-color);

+ 2 - 2
src/components/live-message/message.tsx

@@ -25,8 +25,8 @@ export default defineComponent({
     return (
       <div class={styles.message}>
         <div class={styles.buttonGroup}>
-          <div onClick={this.ChatBan} class={[this.options === 'ALL' ? styles.active : null, styles.btn]}>全体禁言</div>
-          <div onClick={this.SeatsCtrl} class={styles.btn}>禁止连麦</div>
+          <div onClick={this.ChatBan} class={[!runtime.allowChatCtrl ? styles.active : null, styles.btn]}>{runtime.allowChatCtrl ? '全体禁言' : '关闭全体禁言'}</div>
+          <div onClick={this.SeatsCtrl} class={[!runtime.allowSeatsCtrl ? styles.active : null, styles.btn]}>{runtime.allowSeatsCtrl ? '禁止连麦' : '关闭禁止连麦'}</div>
         </div>
       </div>
     )

+ 17 - 8
src/components/live-message/model/index.module.less

@@ -58,14 +58,23 @@
     display: flex;
     align-items: center;
   }
-  .btn {
-    font-size: 13px;
-    line-height: 20px;
-    background-color: var(--live-light-color);
-    text-align: center;
-    padding: 3px 15px 1px;
-    border-radius: 2px;
-    cursor: pointer;
+}
+
+.btn {
+  font-size: 13px;
+  line-height: 20px;
+  background-color: var(--live-light-color);
+  border-color: var(--live-light-color);
+  text-align: center;
+  padding: 3px 15px 1px;
+  border-radius: 2px;
+  cursor: pointer;
+  color: var(--live-color);
+  text-decoration: none;
+  &.downBtn {
+    background-color: transparent;
+    border-color: var(--live-light-color);
+    color: var(--live-light-color);
   }
 }
 

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

@@ -104,7 +104,7 @@ export default defineComponent({
       <div style={{ minHeight: '100%', position: 'relative' }}>
         {list.length > 0 ? list.map((item : any) => (
           <div class={styles.itemContent}>
-            <img src="/src/assets/home/placehorder-icon.png" alt="" />
+            {/* <img src="/src/assets/home/placehorder-icon.png" alt="" /> */}
             <div class={styles.itemInfo}>
               <div class={styles.itemName}>
                 <p class={styles.userName}>{item.name}</p>
@@ -114,14 +114,14 @@ export default defineComponent({
                   <div class={styles.join}>
                     申请连麦
                   </div>
-                  <ElButton size="small" disabled={this.count > 3} class={styles.btn} onClick={() => this.agree(item)}>上麦</ElButton>
+                  <ElButton size="small" type="primary" disabled={this.count > 3} class={styles.btn} onClick={() => this.agree(item)}>上麦</ElButton>
                 </div>
               ) : (
                 <div class={styles.joinText}>
                   <div class={styles.join}>
                     正在连麦
                   </div>
-                  <ElButton size="small" class={styles.btn} onClick={() => this.refuse(item)}>下麦</ElButton>
+                  <ElButton size="small" plain class={[styles.btn, styles.downBtn]} onClick={() => this.refuse(item)}>下麦</ElButton>
                 </div>
               )}
             </div>

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

@@ -56,7 +56,7 @@ export default defineComponent({
       <div>
         {this.lookList.length > 0 ? this.lookList.map((item : any) => (
           <div class={styles.itemContent}>
-            <img src="/src/assets/home/placehorder-icon.png" alt="" />
+            {/* <img src="/src/assets/home/placehorder-icon.png" alt="" /> */}
             <div class={styles.itemInfo} >
               <div class={styles.itemName}>
                 <p class={styles.userName}>{item.name}</p>

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

@@ -18,7 +18,7 @@ export default defineComponent({
   },
   data() {
     return {
-      messageList: [{ name: 1, id: 1 }] as any[], // 回复学生列表
+      messageList: [] as any[], // 回复学生列表
       loadingMessage: false, // 观看列表状态
     }
   },
@@ -100,7 +100,7 @@ export default defineComponent({
       <div style={{ minHeight: '100%', position: 'relative' }}>
         {this.messageList.length > 0 ? this.messageList.map((item : any) => (
           <div class={styles.itemContent}>
-            <img src="/src/assets/home/placeholder-icon.png" alt="" />
+            {/* <img src="/src/assets/home/placeholder-icon.png" alt="" /> */}
             <div class={styles.itemInfo}>
               <div class={styles.itemName}>
                 <p class={styles.userName}>{item.name} {item.isSelf ? <ElTag>主播</ElTag> : null}</p>

+ 0 - 2
src/pages/home/header/index.tsx

@@ -16,8 +16,6 @@ export default defineComponent({
         RuntimeUtils.closeDevice('camera')
         RuntimeUtils.closeDevice('microphone')
         ElMessage.success('退出成功');
-        // console.log(this)
-        // this.$message.success('退出成功');
         removeToken();
         (this as any).$router.push({
           path: '/login',