合并

dist/assets/home-layout-center.9cdcb3d6.js

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<<< HEAD:dist/assets/home-layout-center.9cdcb3d6.js
 import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.096808cc.js";import{a,b as h}from"./index.65a71d84.js";import"./auth.6ac00a50.js";import"./routes-common.ebe7bd84.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
 ========
@@ -13,3 +14,6 @@ import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.0968
 >>>>>>>> iteration-tenant-album:dist/assets/home-layout-center.ef14b73c.js
 =======
 >>>>>>> iteration-tenant-album
+=======
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.096808cc.js";import{a,b as h}from"./index.65a71d84.js";import"./auth.6ac00a50.js";import"./routes-common.ebe7bd84.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+>>>>>>> iteration-tenant-album

dist/index.html

@@ -53,6 +53,7 @@
     })(Object);
   </script>
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.e9056ae1.js"></script>
@@ -61,14 +62,19 @@
   <link rel="modulepreload" href="./assets/routes-common.9ed4db20.js">
 =======
 >>>>>>> iteration-tenant-album
+=======
+>>>>>>> iteration-tenant-album
   <script type="module" crossorigin src="./assets/index.65a71d84.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
   <link rel="modulepreload" href="./assets/routes-common.ebe7bd84.js">
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> e93ea4b52 (更新)
 >>>>>>> iteration-tenant-album
+=======
+>>>>>>> iteration-tenant-album
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -81,6 +87,7 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <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>
 <<<<<<< HEAD
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.46439f8e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 =======
@@ -92,6 +99,10 @@
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.46439f8e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 >>>>>>> e93ea4b52 (更新)
 >>>>>>> iteration-tenant-album
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.46439f8e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-tenant-album
 </body>
 
 </html>

dist/teacher.html

@@ -53,6 +53,7 @@
     })(Object);
   </script>
 <<<<<<< HEAD
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.91df7aed.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/routes-common.ebe7bd84.js">
@@ -67,6 +68,11 @@
   <link rel="modulepreload" href="./assets/routes-common.ebe7bd84.js">
 >>>>>>> e93ea4b52 (更新)
 >>>>>>> iteration-tenant-album
+=======
+  <script type="module" crossorigin src="./assets/teacher.86ce739f.js"></script>
+  <link rel="modulepreload" href="./assets/index.096808cc.js">
+  <link rel="modulepreload" href="./assets/routes-common.ebe7bd84.js">
+>>>>>>> iteration-tenant-album
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/teacher.ded4b243.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>
@@ -77,6 +83,7 @@
   
   <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>
 <<<<<<< HEAD
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.5d9d36ec.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 =======
@@ -88,6 +95,10 @@
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.5d9d36ec.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 >>>>>>> e93ea4b52 (更新)
 >>>>>>> iteration-tenant-album
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.6792251e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-tenant-album
 </body>
 
 </html>

dist/tenant.html

@@ -53,6 +53,7 @@
     })(Object);
   </script>
 <<<<<<< HEAD
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.95bfeb74.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
@@ -67,6 +68,11 @@
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
 >>>>>>> e93ea4b52 (更新)
 >>>>>>> iteration-tenant-album
+=======
+  <script type="module" crossorigin src="./assets/tenant.bde87011.js"></script>
+  <link rel="modulepreload" href="./assets/index.096808cc.js">
+  <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
+>>>>>>> iteration-tenant-album
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -79,6 +85,7 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <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>
 <<<<<<< HEAD
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.54d8118b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 =======
@@ -90,6 +97,10 @@
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.54d8118b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 >>>>>>> e93ea4b52 (更新)
 >>>>>>> iteration-tenant-album
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.d416aac0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-tenant-album
 </body>
 
 </html>

src/tenant/music/train-tool/index.tsx

@@ -424,7 +424,6 @@ export default defineComponent({
                                 限购:{album.buyedTimes}/{album.buyTimes}次
                               </span>
                             )}
-
                             <Image
                               class={styles.image}
                               width="100%"
@@ -556,7 +555,7 @@ export default defineComponent({
                       round
                       block
                       disabled={
-                        state.details?.musicNum <= 0 && !state.hasBuyStatus
+                        state.details?.musicNum <= 0 || !state.hasBuyStatus
                       }
                       color="linear-gradient(270deg, #FF204B 0%, #FE5B71 100%)"
                       onClick={onSubmit}