Browse Source

Merge branch 'master' of http://git.dayaedu.com/yonge/dy-admin-live

wolyshaw 3 years ago
parent
commit
145068bf2c

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.a5e5b181.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.cb0451a3.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.f2fee49c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.2c48b1b5.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.4e845b91.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.a6d93b12.js


+ 2 - 2
dist/index.html

@@ -5,7 +5,7 @@
     <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.83bf1f3e.js"></script>
+    <script type="module" crossorigin src="./assets/index.a6d93b12.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>
@@ -15,6 +15,6 @@
     
     <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.68541211.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.9813b828.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.f2fee49c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

+ 16 - 1
src/components/live-message/model/join-model.tsx

@@ -13,6 +13,8 @@ export default defineComponent({
     return {
       joinList: {} as { [key: string]: any }, // 连麦学生列表
       loadingJoin: false, // 连麦列表状态
+      upStatus: false,
+      downStatus: false,
     }
   },
   computed: {
@@ -116,9 +118,11 @@ export default defineComponent({
 
     },
     agree(item: any) {
-      if (this.count > 3) {
+      if (this.count > 3 || this.upStatus) {
+        console.log(true, 2323)
         return
       }
+      this.upStatus = true
       const data = {
         ...item,
         audienceName: item.name,
@@ -131,8 +135,16 @@ export default defineComponent({
       RuntimeModelUtils.addJoin(item.id, data)
       RuntimeModelUtils.addLook(item.id, data)
       RuntimeUtils.sendMessage(data, 'SeatResponse')
+
+      setTimeout(() => {
+        this.upStatus = false
+      }, 300);
     },
     refuse(item: any) {
+      if(this.downStatus) {
+        return
+      }
+      this.downStatus = true
       const data = {
         ...item,
         audienceName: item.name,
@@ -144,6 +156,9 @@ export default defineComponent({
       }
       RuntimeModelUtils.addJoin(item.id, data)
       RuntimeUtils.sendMessage(data, 'SeatApply')
+      setTimeout(() => {
+        this.downStatus = false
+      }, 300);
     },
     onSwitchRole(evt: any) {
       console.log(evt, 'onSwitchRole')

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

@@ -13,6 +13,8 @@ export default defineComponent({
   data() {
     return {
       loadingLook: false, // 观看列表状态
+      upStatus: false,
+      downStatus: false
     }
   },
   computed: {

Some files were not shown because too many files changed in this diff