优化合并

dist/assets/home-layout-center-legacy.9359fb66.js

@@ -0,0 +1 @@
+!function(){function e(e,t,n,r,o,s,u){try{var c=e[s](u),a=c.value}catch(i){return void n(i)}c.done?t(a):Promise.resolve(a).then(r,o)}System.register(["./ResizeObserver.es-legacy.5e95ce6e.js","./index-legacy.858dbc7d.js","./auth-legacy.301c256b.js","./routes-common-legacy.fc31052f.js"],(function(t){"use strict";var n,r,o,s,u,c,a,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.u,s=e.p,u=e.i,c=e.j,a=e.C,i=e.F},function(e){f=e.a,l=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,c,a;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.next=3,f.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return t=e.sent,c=t.data.authentication,o(c.token_type+" "+c.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:c.token_type+" "+c.access_token}}),e.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:a=e.sent,u(a.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function c(t){e(u,o,s,c,a,"next",t)}function a(t){e(u,o,s,c,a,"throw",t)}c(void 0)}))})()}},render:function(){return c(i,null,[this.status?c("div",{class:l.error},[c(a,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):c("div",null,null)])}}))}}}))}();

dist/assets/home-layout-center.82f84b74.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.dcfe1a74.js
+import{d as r,g as s,u,p as i,i as c,j as e,C as l,F as p}from"./ResizeObserver.es.3de1d2ff.js";import{a,b as h}from"./index.dfd36e06.js";import"./auth.43b706ad.js";import"./routes-common.0319feb4.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};
+========
+import{d as r,g as s,u,p as i,i as c,j as e,C as l,F as p}from"./ResizeObserver.es.3de1d2ff.js";import{a,b as h}from"./index.c73712f6.js";import"./auth.43b706ad.js";import"./routes-common.b6524b72.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};
+>>>>>>>> ponline:dist/assets/home-layout-center.82f84b74.js

dist/assets/home-layout-center.dcfe1a74.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.dcfe1a74.js
 import{d as r,g as s,u,p as i,i as c,j as e,C as l,F as p}from"./ResizeObserver.es.3de1d2ff.js";import{a,b as h}from"./index.dfd36e06.js";import"./auth.43b706ad.js";import"./routes-common.0319feb4.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};
+========
+import{d as r,g as s,u,p as i,i as c,j as e,C as l,F as p}from"./ResizeObserver.es.3de1d2ff.js";import{a,b as h}from"./index.c73712f6.js";import"./auth.43b706ad.js";import"./routes-common.b6524b72.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};
+>>>>>>>> ponline:dist/assets/home-layout-center.82f84b74.js

dist/index.html

@@ -52,10 +52,17 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.dfd36e06.js"></script>
   <link rel="modulepreload" href="./assets/ResizeObserver.es.3de1d2ff.js">
   <link rel="modulepreload" href="./assets/auth.43b706ad.js">
   <link rel="modulepreload" href="./assets/routes-common.0319feb4.js">
+=======
+  <script type="module" crossorigin src="./assets/index.c73712f6.js"></script>
+  <link rel="modulepreload" href="./assets/ResizeObserver.es.3de1d2ff.js">
+  <link rel="modulepreload" href="./assets/auth.43b706ad.js">
+  <link rel="modulepreload" href="./assets/routes-common.b6524b72.js">
+>>>>>>> ponline
   <link rel="stylesheet" href="./assets/ResizeObserver.es.cf474077.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -68,7 +75,11 @@
   <!-- <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>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f87b3bc.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.7577c23b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.858dbc7d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> ponline
 </body>
 
 </html>

dist/teacher.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.e2479e7a.js"></script>
   <link rel="modulepreload" href="./assets/ResizeObserver.es.3de1d2ff.js">
   <link rel="modulepreload" href="./assets/routes-common.0319feb4.js">
+=======
+  <script type="module" crossorigin src="./assets/teacher.2ae1a4a8.js"></script>
+  <link rel="modulepreload" href="./assets/ResizeObserver.es.3de1d2ff.js">
+  <link rel="modulepreload" href="./assets/routes-common.b6524b72.js">
+>>>>>>> ponline
   <link rel="stylesheet" href="./assets/ResizeObserver.es.cf474077.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>
@@ -65,7 +71,11 @@
   
   <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.4f87b3bc.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.6bd3b1d9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.f3bcbd02.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> ponline
 </body>
 
 </html>

dist/tenant.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.26eac64a.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/tenant.c9d8355c.js"></script>
+>>>>>>> ponline
   <link rel="modulepreload" href="./assets/ResizeObserver.es.3de1d2ff.js">
   <link rel="modulepreload" href="./assets/auth.43b706ad.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.cf474077.css">
@@ -67,7 +71,11 @@
   <!-- <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>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f87b3bc.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.14864d38.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.a7fc19dd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> ponline
 </body>
 
 </html>

src/student/register/index.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, reactive, ref } from 'vue'
+import { defineComponent, nextTick, reactive, ref } from 'vue'
 import styles from './index.module.less'
 import iconTop from './images/icon-top.png'
 import iconBird from './images/icon-bird.png'
@@ -33,7 +33,7 @@ export default defineComponent({
       smsCode: null
     })
     const checked = ref(false) // 是否同意协议
-
+    const subBtn = ref(false) // 是否显示提交按钮
     const imgCodeStatus = ref(false) // 是否显示图片验证码
 
     const countDownTime = ref(1000 * 60) // 倒计时时间，单位毫秒
@@ -50,11 +50,13 @@ export default defineComponent({
     }
     const onCodeSend = () => {
       countDownStatus.value = false
-      countDownRef.value?.start()
+      nextTick(() => {
+        countDownRef.value?.start()
+      })
     }
     const onFinished = () => {
-      countDownStatus.value = true
       countDownRef.value?.reset()
+      countDownStatus.value = true
     }
 
     // 跳转协议
@@ -94,6 +96,7 @@ export default defineComponent({
         if (!checked.value) {
           return Toast('请同意用户注册协议和隐私政策')
         }
+        subBtn.value = true
         // 提交注册信息
         await request.post('/api-auth/smsLogin', {
           requestType: 'form',
@@ -112,6 +115,8 @@ export default defineComponent({
         router.push('/registerDownload')
       } catch {
         //
+      } finally {
+        subBtn.value = false
       }
     }
     return () => (
@@ -164,7 +169,7 @@ export default defineComponent({
                     </span>
                   ) : (
                     <CountDown
-                      ref={countDownRef.value}
+                      ref={(el: any) => (countDownRef.value = el)}
                       auto-start={false}
                       time={countDownTime.value}
                       onFinish={onFinished}
@@ -208,17 +213,23 @@ export default defineComponent({
             </span>
           </div>
           <div class={styles.btnBox}>
-            <Button round block type="primary" onClick={onSubmit}>
+            <Button
+              round
+              block
+              type="primary"
+              onClick={onSubmit}
+              disabled={subBtn.value}
+            >
               立即登录
             </Button>
           </div>
         </div>
 
+{/* registerType="REGISTER" */}
         {imgCodeStatus.value ? (
           <ImgCode
             v-model:value={imgCodeStatus.value}
             phone={forms.phone}
-            registerType="REGISTER"
             onClose={() => {
               imgCodeStatus.value = false
             }}

src/views/music/music-detail/index.tsx

@@ -122,6 +122,12 @@ export default defineComponent({
       return partColumns.value.find((item: any) => item.value === staffData.selectedPartIndex)
     })
 
+    // 硬编码 - 不显示下载按钮
+    const downloadHidden = computed(() => {
+      const users = state.user.data || {}
+      return users.phone === '18888888888'
+    })
+
     // 是否转谱不能转，默认谱面不是五线谱时
     const defaultConvertible = computed(() => {
       const details = staffData.details
@@ -1051,7 +1057,7 @@ export default defineComponent({
                   </div>
                 ) : null}
 
-                <div
+                {!downloadHidden.value && <div
                   class={[styles.functionItem, (loading.value ||
                     (!staffData.musicPdfUrl && staffData.imgs.length <= 0)) ? styles.disabled : '']}
                   onClick={() => {
@@ -1082,7 +1088,7 @@ export default defineComponent({
                 >
                   <img src={iconDownload} />
                   <span>下载</span>
-                </div>
+                </div>}
               </div>
             </div>