Merge branch 'jenkins' into fine-music-score

.gitignore

@@ -1,6 +1,6 @@
 node_modules
 .DS_Store
-# dist
+dist
 dist-ssr
 *.local
 

Jenkinsfile

@@ -0,0 +1,80 @@
+pipeline {
+    agent any
+
+    environment {
+       BUILD_USER = ""
+    }
+
+    stages {
+        
+        stage('build param') {
+            steps {
+                wrap([$class: 'BuildUser']) {
+                    script {
+                        BUILD_USER = "${env.BUILD_USER}"
+                    }           
+                }
+                echo '${BUILD_USER}'
+            }
+        }
+
+        stage('build job') {
+            steps {
+                sh 'node -v'
+                sh 'npm install && npm run build'
+                sh 'tar -zcf dist.tar.gz dist/'
+            }
+        }
+
+        stage('deploy job') {
+            steps {
+                sshPublisher(publishers: [sshPublisherDesc(configName: 'ECS-CooleShow-47.114.1.200-dev', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: 'cd /mnt/datadisk/www/cooleshow/h5-colexiu && rm -rf dist/ && tar -zxf *.tar.gz && rm *.tar.gz', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/datadisk/www/cooleshow/h5-colexiu', remoteDirectorySDF: false, removePrefix: '', sourceFiles: '**/*.tar.gz')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
+            }
+        }
+
+        stage('clean job') {
+            steps {
+                sh 'rm dist.tar.gz'
+            }
+        }
+    }
+
+    post {
+        
+        success {
+            dingtalk (
+                robot: "a346e21b-706e-4881-8e3b-6c48d16d0c3b",
+                type:'ACTION_CARD',
+                atAll: false,
+                title: "构建成功：${env.JOB_NAME}",
+                //messageUrl: 'xxxx',
+                text: [
+                    "### [${env.JOB_NAME}](${env.JOB_URL}) ",
+                    '---',
+                    "- 任务：[${currentBuild.displayName}](${env.BUILD_URL})",
+                    '- 状态：<font color=#00CD00 >成功</font>',
+                    "- 持续时间：${currentBuild.durationString}".split("and counting")[0],
+                    "- 执行人：${BUILD_USER}",
+                ]
+            )
+        }
+
+        failure{
+            dingtalk (
+                robot: "a346e21b-706e-4881-8e3b-6c48d16d0c3b",
+                type:'ACTION_CARD',
+                atAll: false,
+                title: "构建失败：${env.JOB_NAME}",
+                //messageUrl: 'xxxx',
+                text: [
+                    "### [${env.JOB_NAME}](${env.JOB_URL}) ",
+                    '---',
+                    "- 任务：[${currentBuild.displayName}](${env.BUILD_URL})",
+                    '- 状态：<font color=#EE0000 >失败</font>',
+                    "- 持续时间：${currentBuild.durationString}".split("and counting")[0],
+                    "- 执行人：${BUILD_USER}",
+                ]
+            )
+        }
+    }
+}

dist/assets/cart.40545112.js

@@ -0,0 +1 @@
+import{h as o}from"./vendor.adc65e85.js";const c=o({calcAmount:{},cartPromotionItemList:[],memberReceiveAddressList:[],orderInfo:{}}),i=a=>{let r=null;try{r=JSON.parse(a)}catch{}if(Array.isArray(r)){let e="",t;for(t of r)e+=`${t.key}: ${t.value} `;return e}return a};export{c,i as f};

dist/assets/cart.c3769321.js

@@ -1 +0,0 @@
-import{h as a}from"./vendor.d7020c85.js";const c=a({calcAmount:{},cartPromotionItemList:[],memberReceiveAddressList:[],orderInfo:{}}),i=o=>{let r=null;try{r=JSON.parse(o)}catch{}if(Array.isArray(r)){let e="",t;for(t of r)e+=`${t.key}: ${t.value} `;return e}return o};export{c,i as f};

dist/assets/detail-legacy.e7f6e347.js → dist/assets/detail-legacy.82151f7e.js

@@ -1 +1 @@
-;(function(){System.register(['./index.module-legacy.076ece3e.js','./vendor-legacy.d9b05f74.js'],function(exports){'use strict';var styles,p1,p2,p3,defineComponent,createVNode;return{setters:[function(module){styles=module.s;p1=module.p;p2=module.c;p3=module.d;},function(module){defineComponent=module.d;createVNode=module.a;}],execute:function execute(){var detail=exports('default',defineComponent({name:'detail',render:function render(){return createVNode("div",{"class":styles.detail},[createVNode("img",{"src":p1},null),createVNode("img",{"src":p2},null),createVNode("img",{"src":p3},null)]);}}));}};});})();
+;(function(){System.register(['./index.module-legacy.076ece3e.js','./vendor-legacy.1feeab76.js'],function(exports){'use strict';var styles,p1,p2,p3,defineComponent,createVNode;return{setters:[function(module){styles=module.s;p1=module.p;p2=module.c;p3=module.d;},function(module){defineComponent=module.d;createVNode=module.a;}],execute:function execute(){var detail=exports('default',defineComponent({name:'detail',render:function render(){return createVNode("div",{"class":styles.detail},[createVNode("img",{"src":p1},null),createVNode("img",{"src":p2},null),createVNode("img",{"src":p3},null)]);}}));}};});})();

dist/assets/detail-legacy.b0825bb6.js → dist/assets/detail-legacy.fb6d0cd4.js

@@ -1 +1 @@
-;(function(){System.register(['./vendor-legacy.d9b05f74.js','./index-legacy.f25f109a.js','./index-legacy.f25f109a5.js','./index-legacy.f25f109a4.js'],function(exports){'use strict';var defineComponent,ref,useRoute,createVNode,CellGroup,Field;return{setters:[function(module){defineComponent=module.d;ref=module.l;useRoute=module.u;createVNode=module.a;CellGroup=module.y;Field=module.G;},function(){},function(){},function(){}],execute:function execute(){var detail=exports('default',defineComponent({name:'ReviewListDetail',setup:function setup(){ref({});var route=useRoute();return function(){console.log(route.params.id,route);return createVNode(CellGroup,null,{default:function _default(){return[createVNode(Field,{"value":'12321',"label":"曲目名称"},null)];}});};}}));}};});})();
+;(function(){System.register(['./vendor-legacy.1feeab76.js','./index-legacy.f25f109a.js','./index-legacy.f25f109a5.js','./index-legacy.f25f109a4.js'],function(exports){'use strict';var defineComponent,ref,useRoute,createVNode,CellGroup,Field;return{setters:[function(module){defineComponent=module.d;ref=module.l;useRoute=module.u;createVNode=module.a;CellGroup=module.y;Field=module.G;},function(){},function(){},function(){}],execute:function execute(){var detail=exports('default',defineComponent({name:'ReviewListDetail',setup:function setup(){ref({});var route=useRoute();return function(){console.log(route.params.id,route);return createVNode(CellGroup,null,{default:function _default(){return[createVNode(Field,{"value":'12321',"label":"曲目名称"},null)];}});};}}));}};});})();

dist/assets/detail.20c32e55.js

@@ -0,0 +1 @@
+import{s as a,p as s,c as r,d}from"./index.module.1259073b.js";import{d as l,a as e}from"./vendor.adc65e85.js";var t=l({name:"detail",render(){return e("div",{class:a.detail},[e("img",{src:s},null),e("img",{src:r},null),e("img",{src:d},null)])}});export{t as default};

dist/assets/detail.9bd090fd.js → dist/assets/detail.cc216572.js

@@ -1 +1 @@
-import{d as t,l,u as o,a,y as r,G as s}from"./vendor.d7020c85.js";/* empty css              *//* empty css               *//* empty css               */var p=t({name:"ReviewListDetail",setup(){l({});const e=o();return()=>(console.log(e.params.id,e),a(r,null,{default:()=>[a(s,{value:"12321",label:"\u66F2\u76EE\u540D\u79F0"},null)]}))}});export{p as default};
+import{d as t,l,u as o,a,y as r,G as s}from"./vendor.adc65e85.js";/* empty css              *//* empty css               *//* empty css               */var p=t({name:"ReviewListDetail",setup(){l({});const e=o();return()=>(console.log(e.params.id,e),a(r,null,{default:()=>[a(s,{value:"12321",label:"\u66F2\u76EE\u540D\u79F0"},null)]}))}});export{p as default};

dist/assets/detail.d9e8971f.js

@@ -1 +0,0 @@
-import{s,p as a,c as r,d}from"./index.module.1259073b.js";import{d as l,a as e}from"./vendor.d7020c85.js";var t=l({name:"detail",render(){return e("div",{class:s.detail},[e("img",{src:a},null),e("img",{src:r},null),e("img",{src:d},null)])}});export{t as default};

dist/assets/download-legacy.13d3077d.js

@@ -1,4 +1,12 @@
+<<<<<<< HEAD:dist/assets/download-legacy.a1c73e5a.js
+<<<<<<<< HEAD:dist/assets/download-legacy.a919b33f.js
+;(function(){System.register(['./index.module-legacy.28209fba.js','./wx_bg-legacy.105835c9.js','./index-legacy.3db8b4dc.js','./vendor-legacy.1feeab76.js'],function(exports){'use strict';var styles,__glob_6_0,__glob_6_1,__glob_6_2,__glob_6_3,__glob_6_4,__glob_6_5,browser,defineComponent,createVNode,Button,createTextVNode;return{setters:[function(module){styles=module.s;__glob_6_0=module._;__glob_6_1=module.a;__glob_6_2=module.b;__glob_6_3=module.c;__glob_6_4=module.d;},function(module){__glob_6_5=module._;},function(module){browser=module.b;},function(module){defineComponent=module.d;createVNode=module.a;Button=module.B;createTextVNode=module.j;}],execute:function execute(){var getAssetsHomeFile=exports('getAssetsHomeFile',function(fileName){var path="./images/".concat(fileName);var modules={"./images/bg.png":__glob_6_0,"./images/logo.png":__glob_6_1,"./images/student_bg.png":__glob_6_2,"./images/teacher_bg.png":__glob_6_3,"./images/teacher_logo.png":__glob_6_4,"./images/wx_bg.png":__glob_6_5};return modules[path].default;});var download=exports('default',defineComponent({name:'download',data:function data(){var query=this.$route.query;return{type:query.type||'student',wxStatus:false};},mounted:function mounted(){if(this.type==='student'){document.title='酷乐秀下载';}else if(this.type==='teacher'){document.title='酷乐秀学院下载';}},methods:{downLoadApp:function downLoadApp(){if(browser().weixin){this.wxStatus=true;return;}// 线上地址
+========
+;(function(){System.register(['./index.module-legacy.28209fba.js','./wx_bg-legacy.105835c9.js','./index-legacy.1ce5c464.js','./vendor-legacy.d9b05f74.js'],function(exports){'use strict';var styles,__glob_6_0,__glob_6_1,__glob_6_2,__glob_6_3,__glob_6_4,__glob_6_5,browser,defineComponent,createVNode,Button,createTextVNode;return{setters:[function(module){styles=module.s;__glob_6_0=module._;__glob_6_1=module.a;__glob_6_2=module.b;__glob_6_3=module.c;__glob_6_4=module.d;},function(module){__glob_6_5=module._;},function(module){browser=module.b;},function(module){defineComponent=module.d;createVNode=module.a;Button=module.B;createTextVNode=module.j;}],execute:function execute(){var getAssetsHomeFile=exports('getAssetsHomeFile',function(fileName){var path="./images/".concat(fileName);var modules={"./images/bg.png":__glob_6_0,"./images/logo.png":__glob_6_1,"./images/student_bg.png":__glob_6_2,"./images/teacher_bg.png":__glob_6_3,"./images/teacher_logo.png":__glob_6_4,"./images/wx_bg.png":__glob_6_5};return modules[path].default;});var download=exports('default',defineComponent({name:'download',data:function data(){var query=this.$route.query;return{type:query.type||'student',wxStatus:false};},mounted:function mounted(){if(this.type==='student'){document.title='酷乐秀下载';}else if(this.type==='teacher'){document.title='酷乐秀学院下载';}},methods:{downLoadApp:function downLoadApp(){if(browser().weixin){this.wxStatus=true;return;}// 线上地址
+>>>>>>>> fine-music-score:dist/assets/download-legacy.a1c73e5a.js
+=======
 ;(function(){System.register(['./index.module-legacy.28209fba.js','./wx_bg-legacy.105835c9.js','./index-legacy.373f34de.js','./vendor-legacy.d9b05f74.js'],function(exports){'use strict';var styles,__glob_6_0,__glob_6_1,__glob_6_2,__glob_6_3,__glob_6_4,__glob_6_5,browser,defineComponent,createVNode,Button,createTextVNode;return{setters:[function(module){styles=module.s;__glob_6_0=module._;__glob_6_1=module.a;__glob_6_2=module.b;__glob_6_3=module.c;__glob_6_4=module.d;},function(module){__glob_6_5=module._;},function(module){browser=module.b;},function(module){defineComponent=module.d;createVNode=module.a;Button=module.B;createTextVNode=module.j;}],execute:function execute(){var getAssetsHomeFile=exports('getAssetsHomeFile',function(fileName){var path="./images/".concat(fileName);var modules={"./images/bg.png":__glob_6_0,"./images/logo.png":__glob_6_1,"./images/student_bg.png":__glob_6_2,"./images/teacher_bg.png":__glob_6_3,"./images/teacher_logo.png":__glob_6_4,"./images/wx_bg.png":__glob_6_5};return modules[path].default;});var download=exports('default',defineComponent({name:'download',data:function data(){var query=this.$route.query;return{type:query.type||'student',wxStatus:false};},mounted:function mounted(){if(this.type==='student'){document.title='酷乐秀下载';}else if(this.type==='teacher'){document.title='酷乐秀学院下载';}},methods:{downLoadApp:function downLoadApp(){if(browser().weixin){this.wxStatus=true;return;}// 线上地址
+>>>>>>> fine-music-score:dist/assets/download-legacy.13d3077d.js
 // https://itunes.apple.com/cn/app/id1626971149?mt=8   学院
 // https://itunes.apple.com/cn/app/id1626971695?mt=8   酷乐秀
 // https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk

dist/assets/download-legacy.a919b33f.js

@@ -0,0 +1,30 @@
+<<<<<<<< HEAD:dist/assets/download-legacy.a919b33f.js
+;(function(){System.register(['./index.module-legacy.28209fba.js','./wx_bg-legacy.105835c9.js','./index-legacy.3db8b4dc.js','./vendor-legacy.1feeab76.js'],function(exports){'use strict';var styles,__glob_6_0,__glob_6_1,__glob_6_2,__glob_6_3,__glob_6_4,__glob_6_5,browser,defineComponent,createVNode,Button,createTextVNode;return{setters:[function(module){styles=module.s;__glob_6_0=module._;__glob_6_1=module.a;__glob_6_2=module.b;__glob_6_3=module.c;__glob_6_4=module.d;},function(module){__glob_6_5=module._;},function(module){browser=module.b;},function(module){defineComponent=module.d;createVNode=module.a;Button=module.B;createTextVNode=module.j;}],execute:function execute(){var getAssetsHomeFile=exports('getAssetsHomeFile',function(fileName){var path="./images/".concat(fileName);var modules={"./images/bg.png":__glob_6_0,"./images/logo.png":__glob_6_1,"./images/student_bg.png":__glob_6_2,"./images/teacher_bg.png":__glob_6_3,"./images/teacher_logo.png":__glob_6_4,"./images/wx_bg.png":__glob_6_5};return modules[path].default;});var download=exports('default',defineComponent({name:'download',data:function data(){var query=this.$route.query;return{type:query.type||'student',wxStatus:false};},mounted:function mounted(){if(this.type==='student'){document.title='酷乐秀下载';}else if(this.type==='teacher'){document.title='酷乐秀学院下载';}},methods:{downLoadApp:function downLoadApp(){if(browser().weixin){this.wxStatus=true;return;}// 线上地址
+========
+;(function(){System.register(['./index.module-legacy.28209fba.js','./wx_bg-legacy.105835c9.js','./index-legacy.1ce5c464.js','./vendor-legacy.d9b05f74.js'],function(exports){'use strict';var styles,__glob_6_0,__glob_6_1,__glob_6_2,__glob_6_3,__glob_6_4,__glob_6_5,browser,defineComponent,createVNode,Button,createTextVNode;return{setters:[function(module){styles=module.s;__glob_6_0=module._;__glob_6_1=module.a;__glob_6_2=module.b;__glob_6_3=module.c;__glob_6_4=module.d;},function(module){__glob_6_5=module._;},function(module){browser=module.b;},function(module){defineComponent=module.d;createVNode=module.a;Button=module.B;createTextVNode=module.j;}],execute:function execute(){var getAssetsHomeFile=exports('getAssetsHomeFile',function(fileName){var path="./images/".concat(fileName);var modules={"./images/bg.png":__glob_6_0,"./images/logo.png":__glob_6_1,"./images/student_bg.png":__glob_6_2,"./images/teacher_bg.png":__glob_6_3,"./images/teacher_logo.png":__glob_6_4,"./images/wx_bg.png":__glob_6_5};return modules[path].default;});var download=exports('default',defineComponent({name:'download',data:function data(){var query=this.$route.query;return{type:query.type||'student',wxStatus:false};},mounted:function mounted(){if(this.type==='student'){document.title='酷乐秀下载';}else if(this.type==='teacher'){document.title='酷乐秀学院下载';}},methods:{downLoadApp:function downLoadApp(){if(browser().weixin){this.wxStatus=true;return;}// 线上地址
+>>>>>>>> fine-music-score:dist/assets/download-legacy.a1c73e5a.js
+// https://itunes.apple.com/cn/app/id1626971149?mt=8   学院
+// https://itunes.apple.com/cn/app/id1626971695?mt=8   酷乐秀
+// https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk
+// https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk
+// 酷乐秀 安卓 DEV：
+// 老师端：https://www.pgyer.com/N2U3https://www.pgyer.com/cooleshow
+// 学生端：https://www.pgyer.com/70e7https://www.pgyer.com/cooleshow_student
+// 测试环境
+// https://www.pgyer.com/powy iOS酷乐秀学生端
+// https://www.pgyer.com/iO0m iOS 酷乐秀老师端
+var urlIos='';var urlAndroid='';if(location.origin.indexOf('online.colexiu.com')>-1){if(this.type==='student'){urlIos='https://itunes.apple.com/cn/app/id1626971695?mt=8';urlAndroid='https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk';}else if(this.type==='teacher'){urlIos='https://itunes.apple.com/cn/app/id1626971149?mt=8';urlAndroid='https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk';}}else{if(this.type==='student'){urlIos='https://www.pgyer.com/powy';urlAndroid='https://www.pgyer.com/70e7';}else{urlIos='https://www.pgyer.com/iO0m';urlAndroid='https://www.pgyer.com/N2U3';}}if(browser().ios||/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)){window.location.href=urlIos;// if (this.type == 'student') {
+//   window.location.href =
+//     'https://itunes.apple.com/cn/app/id1626971695?mt=8'
+// } else if (this.type == 'teacher') {
+//   window.location.href =
+//     'https://itunes.apple.com/cn/app/id1626971149?mt=8'
+// }
+}else if(/(Android)/i.test(navigator.userAgent)){window.location.href=urlAndroid;// if (this.type == 'student') {
+//   window.location.href =
+//     'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-student-domain.apk'
+// } else if (this.type == 'teacher') {
+//   window.location.href =
+//     'https://appstore.ks3-cn-beijing.ksyuncs.com/clx-teacher-domain.apk'
+// }
+}else{this.$toast('请用手机或移动设备打开');}}},render:function render(){var _this=this;return createVNode("div",{"class":styles.downContainer},[createVNode("div",{"class":styles.logo},[this.type==='student'?createVNode("img",{"src":getAssetsHomeFile('logo.png'),"alt":""},null):createVNode("img",{"src":getAssetsHomeFile('teacher_logo.png'),"alt":""},null)]),createVNode("div",{"class":styles.down},[createVNode(Button,{"type":"primary","round":true,"plain":true,"onClick":this.downLoadApp},{default:function _default(){return[createTextVNode("\u70B9\u51FB\u4E0B\u8F7DApp")];}})]),createVNode("div",{"class":styles.mainImg},[this.type==='student'?createVNode("img",{"src":getAssetsHomeFile('student_bg.png'),"alt":""},null):createVNode("img",{"src":getAssetsHomeFile('teacher_bg.png'),"alt":""},null)]),this.wxStatus&&createVNode("div",{"class":styles.wxpopup,"onClick":function onClick(){_this.wxStatus=false;}},[createVNode("img",{"src":getAssetsHomeFile('wx_bg.png'),"alt":""},null)])]);}}));}};});})();

dist/assets/help-center-detail.0cadf34b.js

@@ -1 +1,9 @@
+<<<<<<< HEAD:dist/assets/help-center-detail.93d612cc.js
+<<<<<<<< HEAD:dist/assets/help-center-detail.3d9afefc.js
+import{u as d}from"./hooks.9c7b3042.js";import{r as u}from"./index.e009a08b.js";import{d as p,g as c,az as h,a as t,O as g,j as f}from"./vendor.adc65e85.js";/* empty css               *//* empty css              *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.53c77e18.js";var A=p({name:"help-center-detail",data(){const e=this.$route.query;return{catalogType:e.catalogType,documentTitle:e.catalogType==="ANALYSIS"?"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5":"",detail:{title:"",createTime:"",content:""}}},async mounted(){try{const e=this.$route.query,s=await u.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:o,createTime:l,content:r,catalogId:i}=s.data;this.detail={title:a,createTime:i==2?c(o).format("YYYY-MM-DD HH:mm:ss"):c(l).format("YYYY-MM-DD HH:mm:ss"),content:r};const m=i==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}d("\u5E2E\u52A9\u4E2D\u5FC3")},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const o=document.querySelectorAll(".msgWrap img");let l=Array.from(o).map((r,i)=>(e.srcElement==r&&(a=i),r.src));h({images:l,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(g,{title:this.documentTitle,"left-arrow":!0,fixed:!0,"onClick-left":()=>{this.$router.back()}},null),t("h2",null,[this.detail.title]),t("div",{class:n.titleInfo},[t("p",null,[f("\u9177\u4E50\u79C0")]),t("p",null,[this.detail.createTime])]),t("div",{style:{height:"1000px"},class:[n.imgContent,"msgWrap"],innerHTML:this.detail.content},null)])}});export{A as default};
+========
+import{u as d}from"./hooks.77df122a.js";import{r as u}from"./index.f7fbd34a.js";import{d as p,g as m,ay as h,a as t,O as f,j as g}from"./vendor.d7020c85.js";/* empty css               *//* empty css              *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.53c77e18.js";var A=p({name:"help-center-detail",data(){const e=this.$route.query;return{catalogType:e.catalogType,documentTitle:e.catalogType==="ANALYSIS"?"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5":"",detail:{title:"",createTime:"",content:""}}},async mounted(){try{const e=this.$route.query,s=await u.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:o,createTime:l,content:r,catalogId:i}=s.data;this.detail={title:a,createTime:i==2?m(o).format("YYYY-MM-DD HH:mm:ss"):m(l).format("YYYY-MM-DD HH:mm:ss"),content:r};const c=i==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=c}catch{}d("\u5E2E\u52A9\u4E2D\u5FC3")},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const o=document.querySelectorAll(".msgWrap img");let l=Array.from(o).map((r,i)=>(e.srcElement==r&&(a=i),r.src));h({images:l,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(f,{title:this.documentTitle,"left-arrow":!0,fixed:!0,"onClick-left":()=>{this.$router.back()}},null),t("h2",null,[this.detail.title]),t("div",{class:n.titleInfo},[t("p",null,[g("\u9177\u4E50\u79C0")]),t("p",null,[this.detail.createTime])]),t("div",{style:{height:"1000px"},class:[n.imgContent,"msgWrap"],innerHTML:this.detail.content},null)])}});export{A as default};
+>>>>>>>> fine-music-score:dist/assets/help-center-detail.93d612cc.js
+=======
 import{u as d}from"./hooks.998d2816.js";import{r as u}from"./index.c4a3e196.js";import{d as p,g as c,ay as h,a as t,O as g,j as y}from"./vendor.d7020c85.js";/* empty css               *//* empty css              *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.53c77e18.js";var A=p({name:"help-center-detail",data(){const e=this.$route.query;return{catalogType:e.catalogType,documentTitle:e.catalogType==="ANALYSIS"?"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5":"",detail:{title:"",createTime:"",content:""}}},async mounted(){try{const e=this.$route.query,s=await u.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:o,createTime:l,content:r,catalogId:i}=s.data;this.detail={title:a,createTime:i==2?c(o).format("YYYY-MM-DD HH:mm:ss"):c(l).format("YYYY-MM-DD HH:mm:ss"),content:r};const m=i==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}d("\u5E2E\u52A9\u4E2D\u5FC3")},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const o=document.querySelectorAll(".msgWrap img");let l=Array.from(o).map((r,i)=>(e.srcElement==r&&(a=i),r.src));h({images:l,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(g,{title:this.documentTitle,"left-arrow":!0,fixed:!0,"onClick-left":()=>{this.$router.back()}},null),t("h2",null,[this.detail.title]),t("div",{class:n.titleInfo},[t("p",null,[y("\u9177\u4E50\u79C0")]),t("p",null,[this.detail.createTime])]),t("div",{style:{height:"1000px"},class:[n.imgContent,"msgWrap"],innerHTML:this.detail.content},null)])}});export{A as default};
+>>>>>>> fine-music-score:dist/assets/help-center-detail.0cadf34b.js

dist/assets/help-center-detail.3d9afefc.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/help-center-detail.3d9afefc.js
+import{u as d}from"./hooks.9c7b3042.js";import{r as u}from"./index.e009a08b.js";import{d as p,g as c,az as h,a as t,O as g,j as f}from"./vendor.adc65e85.js";/* empty css               *//* empty css              *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.53c77e18.js";var A=p({name:"help-center-detail",data(){const e=this.$route.query;return{catalogType:e.catalogType,documentTitle:e.catalogType==="ANALYSIS"?"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5":"",detail:{title:"",createTime:"",content:""}}},async mounted(){try{const e=this.$route.query,s=await u.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:o,createTime:l,content:r,catalogId:i}=s.data;this.detail={title:a,createTime:i==2?c(o).format("YYYY-MM-DD HH:mm:ss"):c(l).format("YYYY-MM-DD HH:mm:ss"),content:r};const m=i==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}d("\u5E2E\u52A9\u4E2D\u5FC3")},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const o=document.querySelectorAll(".msgWrap img");let l=Array.from(o).map((r,i)=>(e.srcElement==r&&(a=i),r.src));h({images:l,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(g,{title:this.documentTitle,"left-arrow":!0,fixed:!0,"onClick-left":()=>{this.$router.back()}},null),t("h2",null,[this.detail.title]),t("div",{class:n.titleInfo},[t("p",null,[f("\u9177\u4E50\u79C0")]),t("p",null,[this.detail.createTime])]),t("div",{style:{height:"1000px"},class:[n.imgContent,"msgWrap"],innerHTML:this.detail.content},null)])}});export{A as default};
+========
+import{u as d}from"./hooks.77df122a.js";import{r as u}from"./index.f7fbd34a.js";import{d as p,g as m,ay as h,a as t,O as f,j as g}from"./vendor.d7020c85.js";/* empty css               *//* empty css              *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.53c77e18.js";var A=p({name:"help-center-detail",data(){const e=this.$route.query;return{catalogType:e.catalogType,documentTitle:e.catalogType==="ANALYSIS"?"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5":"",detail:{title:"",createTime:"",content:""}}},async mounted(){try{const e=this.$route.query,s=await u.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:o,createTime:l,content:r,catalogId:i}=s.data;this.detail={title:a,createTime:i==2?m(o).format("YYYY-MM-DD HH:mm:ss"):m(l).format("YYYY-MM-DD HH:mm:ss"),content:r};const c=i==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=c}catch{}d("\u5E2E\u52A9\u4E2D\u5FC3")},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const o=document.querySelectorAll(".msgWrap img");let l=Array.from(o).map((r,i)=>(e.srcElement==r&&(a=i),r.src));h({images:l,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(f,{title:this.documentTitle,"left-arrow":!0,fixed:!0,"onClick-left":()=>{this.$router.back()}},null),t("h2",null,[this.detail.title]),t("div",{class:n.titleInfo},[t("p",null,[g("\u9177\u4E50\u79C0")]),t("p",null,[this.detail.createTime])]),t("div",{style:{height:"1000px"},class:[n.imgContent,"msgWrap"],innerHTML:this.detail.content},null)])}});export{A as default};
+>>>>>>>> fine-music-score:dist/assets/help-center-detail.93d612cc.js

dist/assets/hooks.998d2816.js

@@ -1 +1,9 @@
+<<<<<<< HEAD:dist/assets/hooks.77df122a.js
+<<<<<<<< HEAD:dist/assets/hooks.9c7b3042.js
+var E=Object.defineProperty;var a=Object.getOwnPropertySymbols;var r=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var c=(e,u,t)=>u in e?E(e,u,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[u]=t,o=(e,u)=>{for(var t in u||(u={}))r.call(u,t)&&c(e,t,u[t]);if(a)for(var t of a(u))g.call(u,t)&&c(e,t,u[t]);return e};import{p as k,r as i}from"./index.e009a08b.js";const B={SEARCH:"music-songbook-subject",ALBUM:"music-album-subject",MUSIC:"music-subject",LIVE:"live-subject",VIDEO:"video-subject",ELEGANT:"elegant-subject"},_=(e,u,t="get")=>{if(!e)return"";if(t==="get"){let s=localStorage.getItem(e);return s=s?JSON.parse(s):{name:"",id:""},s}else return localStorage.setItem(e,u),""};let n=!1;const F=async(e,u,t="POST")=>{try{if(n)return u;n=!0;const s=t==="POST"?await i.post(e,{requestType:u.requestType||"json",data:o({},u.params)}):await i.get(e,{requestType:u.requestType||"json",params:o({},u.params)});u.loading=!1;const l=s.data||{};u.list=u.list.concat(l.rows||[]),u.finished=l.pageNo>=l.totalPage,u.params.page=l.pageNo+1,u.dataShow=u.list.length>0}catch{u.dataShow=!1,u.finished=!0}return n=!1,u},x={\u4E13\u8F91:"klx_album",\u89C6\u9891\u8BFE:"klx_videoClass",\u76F4\u64AD\u8BFE:"klx_liveClass",\u8FBE\u4EBA\u98CE\u91C7:"klx_talentElegant",\u70ED\u95E8\u8D44\u8BAF:"klx_hotInformation",\u5C0F\u9177AI\u529F\u80FD\u57CB\u70B9:"klx_xiaokuAI",\u6211\u7684\u4E50\u8C31:"klx_myMusic",\u8BC4\u6D4B\u8BB0\u5F55:"klx_myEvaluation",\u8BA2\u5355:"klx_myOrder",\u4EA4\u6613\u8BB0\u5F55:"klx_myTrade",\u4F18\u60E0\u5238:"klx_myCoupon",\u5E2E\u52A9\u4E2D\u5FC3:"klx_helpCenter",\u5546\u54C1\u5217\u8868:"klx_goods",\u5546\u54C1\u8BE6\u60C5:"klx_goodDetail",\u8D2D\u4E70\u652F\u4ED8:"klx_payment",\u53D6\u6D88\u652F\u4ED8:"klx_cancelPayment"},b=e=>{k({api:"setEventTracking",content:{type:x[e]}})};export{B as S,_ as a,F as b,b as u};
+========
+var E=Object.defineProperty;var a=Object.getOwnPropertySymbols;var r=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var c=(e,u,t)=>u in e?E(e,u,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[u]=t,o=(e,u)=>{for(var t in u||(u={}))r.call(u,t)&&c(e,t,u[t]);if(a)for(var t of a(u))g.call(u,t)&&c(e,t,u[t]);return e};import{p as k,r as i}from"./index.f7fbd34a.js";const B={SEARCH:"music-songbook-subject",ALBUM:"music-album-subject",MUSIC:"music-subject",LIVE:"live-subject",VIDEO:"video-subject",ELEGANT:"elegant-subject"},_=(e,u,t="get")=>{if(!e)return"";if(t==="get"){let s=localStorage.getItem(e);return s=s?JSON.parse(s):{name:"",id:""},s}else return localStorage.setItem(e,u),""};let n=!1;const F=async(e,u,t="POST")=>{try{if(n)return u;n=!0;const s=t==="POST"?await i.post(e,{requestType:u.requestType||"json",data:o({},u.params)}):await i.get(e,{requestType:u.requestType||"json",params:o({},u.params)});u.loading=!1;const l=s.data||{};u.list=u.list.concat(l.rows||[]),u.finished=l.pageNo>=l.totalPage,u.params.page=l.pageNo+1,u.dataShow=u.list.length>0}catch{u.dataShow=!1,u.finished=!0}return n=!1,u},x={\u4E13\u8F91:"klx_album",\u89C6\u9891\u8BFE:"klx_videoClass",\u76F4\u64AD\u8BFE:"klx_liveClass",\u8FBE\u4EBA\u98CE\u91C7:"klx_talentElegant",\u70ED\u95E8\u8D44\u8BAF:"klx_hotInformation",\u5C0F\u9177AI\u529F\u80FD\u57CB\u70B9:"klx_xiaokuAI",\u6211\u7684\u4E50\u8C31:"klx_myMusic",\u8BC4\u6D4B\u8BB0\u5F55:"klx_myEvaluation",\u8BA2\u5355:"klx_myOrder",\u4EA4\u6613\u8BB0\u5F55:"klx_myTrade",\u4F18\u60E0\u5238:"klx_myCoupon",\u5E2E\u52A9\u4E2D\u5FC3:"klx_helpCenter",\u5546\u54C1\u5217\u8868:"klx_goods",\u5546\u54C1\u8BE6\u60C5:"klx_goodDetail",\u8D2D\u4E70\u652F\u4ED8:"klx_payment",\u53D6\u6D88\u652F\u4ED8:"klx_cancelPayment"},b=e=>{k({api:"setEventTracking",content:{type:x[e]}})};export{B as S,_ as a,F as b,b as u};
+>>>>>>>> fine-music-score:dist/assets/hooks.77df122a.js
+=======
 var E=Object.defineProperty;var a=Object.getOwnPropertySymbols;var r=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var c=(e,u,t)=>u in e?E(e,u,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[u]=t,o=(e,u)=>{for(var t in u||(u={}))r.call(u,t)&&c(e,t,u[t]);if(a)for(var t of a(u))g.call(u,t)&&c(e,t,u[t]);return e};import{p as k,r as i}from"./index.c4a3e196.js";const B={SEARCH:"music-songbook-subject",ALBUM:"music-album-subject",MUSIC:"music-subject",LIVE:"live-subject",VIDEO:"video-subject",ELEGANT:"elegant-subject"},_=(e,u,t="get")=>{if(!e)return"";if(t==="get"){let s=localStorage.getItem(e);return s=s?JSON.parse(s):{name:"",id:""},s}else return localStorage.setItem(e,u),""};let n=!1;const F=async(e,u,t="POST")=>{try{if(n)return u;n=!0;const s=t==="POST"?await i.post(e,{requestType:u.requestType||"json",data:o({},u.params)}):await i.get(e,{requestType:u.requestType||"json",params:o({},u.params)});u.loading=!1;const l=s.data||{};u.list=u.list.concat(l.rows||[]),u.finished=l.pageNo>=l.totalPage,u.params.page=l.pageNo+1,u.dataShow=u.list.length>0}catch{u.dataShow=!1,u.finished=!0}return n=!1,u},x={\u4E13\u8F91:"klx_album",\u89C6\u9891\u8BFE:"klx_videoClass",\u76F4\u64AD\u8BFE:"klx_liveClass",\u8FBE\u4EBA\u98CE\u91C7:"klx_talentElegant",\u70ED\u95E8\u8D44\u8BAF:"klx_hotInformation",\u5C0F\u9177AI\u529F\u80FD\u57CB\u70B9:"klx_xiaokuAI",\u6211\u7684\u4E50\u8C31:"klx_myMusic",\u8BC4\u6D4B\u8BB0\u5F55:"klx_myEvaluation",\u8BA2\u5355:"klx_myOrder",\u4EA4\u6613\u8BB0\u5F55:"klx_myTrade",\u4F18\u60E0\u5238:"klx_myCoupon",\u5E2E\u52A9\u4E2D\u5FC3:"klx_helpCenter",\u5546\u54C1\u5217\u8868:"klx_goods",\u5546\u54C1\u8BE6\u60C5:"klx_goodDetail",\u8D2D\u4E70\u652F\u4ED8:"klx_payment",\u53D6\u6D88\u652F\u4ED8:"klx_cancelPayment"},D=e=>{k({api:"setEventTracking",content:{type:x[e]}})};export{B as S,_ as a,F as b,D as u};
+>>>>>>> fine-music-score:dist/assets/hooks.998d2816.js

dist/assets/hooks.9c7b3042.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/hooks.9c7b3042.js
+var E=Object.defineProperty;var a=Object.getOwnPropertySymbols;var r=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var c=(e,u,t)=>u in e?E(e,u,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[u]=t,o=(e,u)=>{for(var t in u||(u={}))r.call(u,t)&&c(e,t,u[t]);if(a)for(var t of a(u))g.call(u,t)&&c(e,t,u[t]);return e};import{p as k,r as i}from"./index.e009a08b.js";const B={SEARCH:"music-songbook-subject",ALBUM:"music-album-subject",MUSIC:"music-subject",LIVE:"live-subject",VIDEO:"video-subject",ELEGANT:"elegant-subject"},_=(e,u,t="get")=>{if(!e)return"";if(t==="get"){let s=localStorage.getItem(e);return s=s?JSON.parse(s):{name:"",id:""},s}else return localStorage.setItem(e,u),""};let n=!1;const F=async(e,u,t="POST")=>{try{if(n)return u;n=!0;const s=t==="POST"?await i.post(e,{requestType:u.requestType||"json",data:o({},u.params)}):await i.get(e,{requestType:u.requestType||"json",params:o({},u.params)});u.loading=!1;const l=s.data||{};u.list=u.list.concat(l.rows||[]),u.finished=l.pageNo>=l.totalPage,u.params.page=l.pageNo+1,u.dataShow=u.list.length>0}catch{u.dataShow=!1,u.finished=!0}return n=!1,u},x={\u4E13\u8F91:"klx_album",\u89C6\u9891\u8BFE:"klx_videoClass",\u76F4\u64AD\u8BFE:"klx_liveClass",\u8FBE\u4EBA\u98CE\u91C7:"klx_talentElegant",\u70ED\u95E8\u8D44\u8BAF:"klx_hotInformation",\u5C0F\u9177AI\u529F\u80FD\u57CB\u70B9:"klx_xiaokuAI",\u6211\u7684\u4E50\u8C31:"klx_myMusic",\u8BC4\u6D4B\u8BB0\u5F55:"klx_myEvaluation",\u8BA2\u5355:"klx_myOrder",\u4EA4\u6613\u8BB0\u5F55:"klx_myTrade",\u4F18\u60E0\u5238:"klx_myCoupon",\u5E2E\u52A9\u4E2D\u5FC3:"klx_helpCenter",\u5546\u54C1\u5217\u8868:"klx_goods",\u5546\u54C1\u8BE6\u60C5:"klx_goodDetail",\u8D2D\u4E70\u652F\u4ED8:"klx_payment",\u53D6\u6D88\u652F\u4ED8:"klx_cancelPayment"},b=e=>{k({api:"setEventTracking",content:{type:x[e]}})};export{B as S,_ as a,F as b,b as u};
+========
+var E=Object.defineProperty;var a=Object.getOwnPropertySymbols;var r=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var c=(e,u,t)=>u in e?E(e,u,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[u]=t,o=(e,u)=>{for(var t in u||(u={}))r.call(u,t)&&c(e,t,u[t]);if(a)for(var t of a(u))g.call(u,t)&&c(e,t,u[t]);return e};import{p as k,r as i}from"./index.f7fbd34a.js";const B={SEARCH:"music-songbook-subject",ALBUM:"music-album-subject",MUSIC:"music-subject",LIVE:"live-subject",VIDEO:"video-subject",ELEGANT:"elegant-subject"},_=(e,u,t="get")=>{if(!e)return"";if(t==="get"){let s=localStorage.getItem(e);return s=s?JSON.parse(s):{name:"",id:""},s}else return localStorage.setItem(e,u),""};let n=!1;const F=async(e,u,t="POST")=>{try{if(n)return u;n=!0;const s=t==="POST"?await i.post(e,{requestType:u.requestType||"json",data:o({},u.params)}):await i.get(e,{requestType:u.requestType||"json",params:o({},u.params)});u.loading=!1;const l=s.data||{};u.list=u.list.concat(l.rows||[]),u.finished=l.pageNo>=l.totalPage,u.params.page=l.pageNo+1,u.dataShow=u.list.length>0}catch{u.dataShow=!1,u.finished=!0}return n=!1,u},x={\u4E13\u8F91:"klx_album",\u89C6\u9891\u8BFE:"klx_videoClass",\u76F4\u64AD\u8BFE:"klx_liveClass",\u8FBE\u4EBA\u98CE\u91C7:"klx_talentElegant",\u70ED\u95E8\u8D44\u8BAF:"klx_hotInformation",\u5C0F\u9177AI\u529F\u80FD\u57CB\u70B9:"klx_xiaokuAI",\u6211\u7684\u4E50\u8C31:"klx_myMusic",\u8BC4\u6D4B\u8BB0\u5F55:"klx_myEvaluation",\u8BA2\u5355:"klx_myOrder",\u4EA4\u6613\u8BB0\u5F55:"klx_myTrade",\u4F18\u60E0\u5238:"klx_myCoupon",\u5E2E\u52A9\u4E2D\u5FC3:"klx_helpCenter",\u5546\u54C1\u5217\u8868:"klx_goods",\u5546\u54C1\u8BE6\u60C5:"klx_goodDetail",\u8D2D\u4E70\u652F\u4ED8:"klx_payment",\u53D6\u6D88\u652F\u4ED8:"klx_cancelPayment"},b=e=>{k({api:"setEventTracking",content:{type:x[e]}})};export{B as S,_ as a,F as b,b as u};
+>>>>>>>> fine-music-score:dist/assets/hooks.77df122a.js

dist/assets/index-legacy.1f4ea75c.js → dist/assets/index-legacy.0832a982.js

@@ -1 +1 @@
-;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._user-detail_1e2p6_1{display:flex;align-items:center;justify-content:space-between;font-size:.42667rem;line-height:.58667rem;color:#1a1a1a}._user-detail_1e2p6_1 ._user-names_1e2p6_9{display:flex;align-items:center}._user-detail_1e2p6_1 ._user-logo_1e2p6_13{width:1.06667rem;height:1.06667rem;border-radius:50%;overflow:hidden;margin-right:.21333rem}._user-detail_1e2p6_1 ._user-time_1e2p6_20{font-size:.37333rem;color:#999;line-height:.53333rem}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.d9b05f74.js','./index-legacy.f25f109a2.js','./icon_student-legacy.45be2fa9.js'],function(exports){'use strict';var defineComponent,createVNode,Image,iconStudent;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.I;},function(){},function(module){iconStudent=module.i;}],execute:function execute(){var styles={"user-detail":"_user-detail_1e2p6_1","user-names":"_user-names_1e2p6_9","user-logo":"_user-logo_1e2p6_13","user-time":"_user-time_1e2p6_20"};var UserList=exports('U',defineComponent({name:'UserDetail',props:{users:{type:Object,default:{}}},render:function render(){return createVNode("div",{"class":styles['user-detail']},[createVNode("div",{"class":styles['user-names']},[createVNode(Image,{"class":styles['user-logo'],"src":this.users.avatar||iconStudent,"fit":"cover"},null),this.users.studentName||"\u6E38\u5BA2".concat(this.users.studentId||'')]),createVNode("span",{"class":styles['user-time']},[this.users.createTime])]);}}));}};});})();
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._user-detail_1e2p6_1{display:flex;align-items:center;justify-content:space-between;font-size:.42667rem;line-height:.58667rem;color:#1a1a1a}._user-detail_1e2p6_1 ._user-names_1e2p6_9{display:flex;align-items:center}._user-detail_1e2p6_1 ._user-logo_1e2p6_13{width:1.06667rem;height:1.06667rem;border-radius:50%;overflow:hidden;margin-right:.21333rem}._user-detail_1e2p6_1 ._user-time_1e2p6_20{font-size:.37333rem;color:#999;line-height:.53333rem}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.1feeab76.js','./index-legacy.f25f109a2.js','./icon_student-legacy.45be2fa9.js'],function(exports){'use strict';var defineComponent,createVNode,Image,iconStudent;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.I;},function(){},function(module){iconStudent=module.i;}],execute:function execute(){var styles={"user-detail":"_user-detail_1e2p6_1","user-names":"_user-names_1e2p6_9","user-logo":"_user-logo_1e2p6_13","user-time":"_user-time_1e2p6_20"};var UserList=exports('U',defineComponent({name:'UserDetail',props:{users:{type:Object,default:{}}},render:function render(){return createVNode("div",{"class":styles['user-detail']},[createVNode("div",{"class":styles['user-names']},[createVNode(Image,{"class":styles['user-logo'],"src":this.users.avatar||iconStudent,"fit":"cover"},null),this.users.studentName||"\u6E38\u5BA2".concat(this.users.studentId||'')]),createVNode("span",{"class":styles['user-time']},[this.users.createTime])]);}}));}};});})();

dist/assets/index-legacy.7737cf67.js → dist/assets/index-legacy.0e2919c6.js

@@ -1 +1 @@
-;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._title_1amjj_1{font-size:.53333rem;color:red}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.d9b05f74.js'],function(exports){'use strict';var defineComponent,createVNode,Fragment,createTextVNode,Button;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;createTextVNode=module.j;Button=module.B;}],execute:function execute(){var title="_title_1amjj_1";var styles={title:title};var index=exports('default',defineComponent({name:'home',render:function render(){return createVNode(Fragment,null,[createVNode("div",{"class":styles.title},[createTextVNode("\u6807\u9898")]),createVNode(Button,null,{default:function _default(){return[createTextVNode("\u9996\u9875")];}})]);}}));}};});})();
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._title_1amjj_1{font-size:.53333rem;color:red}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.1feeab76.js'],function(exports){'use strict';var defineComponent,createVNode,Fragment,createTextVNode,Button;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;createTextVNode=module.j;Button=module.B;}],execute:function execute(){var title="_title_1amjj_1";var styles={title:title};var index=exports('default',defineComponent({name:'home',render:function render(){return createVNode(Fragment,null,[createVNode("div",{"class":styles.title},[createTextVNode("\u6807\u9898")]),createVNode(Button,null,{default:function _default(){return[createTextVNode("\u9996\u9875")];}})]);}}));}};});})();

dist/assets/index-legacy.1ca5e49d.js

@@ -1,4 +1,12 @@
+<<<<<<< HEAD:dist/assets/index-legacy.c14ef6a8.js
+<<<<<<<< HEAD:dist/assets/index-legacy.71c1a2ad.js
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._colHeader_a7v8p_1{--van-font-weight-bold: 600}._colHeader_a7v8p_1 .van-nav-bar__title,._colHeader_a7v8p_1 .van-icon{color:inherit}._colHeader_a7v8p_1 .van-nav-bar__right>div{line-height:0}._colHeader_a7v8p_1._transparent_a7v8p_11{background-color:transparent}._headerSection_a7v8p_14{position:relative}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.3db8b4dc.js','./vendor-legacy.1feeab76.js','./index-legacy.f25f109a8.js'],function(exports){'use strict';var postMessage,browser,defineComponent,createVNode,Fragment,NavBar;return{setters:[function(module){postMessage=module.p;browser=module.b;},function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;NavBar=module.O;},function(){}],execute:function execute(){var colHeader="_colHeader_a7v8p_1";var transparent="_transparent_a7v8p_11";var headerSection="_headerSection_a7v8p_14";var styles={colHeader:colHeader,transparent:transparent,headerSection:headerSection};var ColHeader=exports('C',defineComponent({name:'col-header',props:{title:String,isBack:{type:Boolean,default:false},backIconColor:{// 返回按钮颜色
+========
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._colHeader_a7v8p_1{--van-font-weight-bold: 600}._colHeader_a7v8p_1 .van-nav-bar__title,._colHeader_a7v8p_1 .van-icon{color:inherit}._colHeader_a7v8p_1 .van-nav-bar__right>div{line-height:0}._colHeader_a7v8p_1._transparent_a7v8p_11{background-color:transparent}._headerSection_a7v8p_14{position:relative}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.1ce5c464.js','./vendor-legacy.d9b05f74.js','./index-legacy.f25f109a8.js'],function(exports){'use strict';var postMessage,browser,defineComponent,createVNode,Fragment,NavBar;return{setters:[function(module){postMessage=module.p;browser=module.b;},function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;NavBar=module.O;},function(){}],execute:function execute(){var colHeader="_colHeader_a7v8p_1";var transparent="_transparent_a7v8p_11";var headerSection="_headerSection_a7v8p_14";var styles={colHeader:colHeader,transparent:transparent,headerSection:headerSection};var ColHeader=exports('C',defineComponent({name:'col-header',props:{title:String,isBack:{type:Boolean,default:false},backIconColor:{// 返回按钮颜色
+>>>>>>>> fine-music-score:dist/assets/index-legacy.c14ef6a8.js
+=======
 ;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._colHeader_a7v8p_1{--van-font-weight-bold: 600}._colHeader_a7v8p_1 .van-nav-bar__title,._colHeader_a7v8p_1 .van-icon{color:inherit}._colHeader_a7v8p_1 .van-nav-bar__right>div{line-height:0}._colHeader_a7v8p_1._transparent_a7v8p_11{background-color:transparent}._headerSection_a7v8p_14{position:relative}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.373f34de.js','./vendor-legacy.d9b05f74.js','./index-legacy.f25f109a8.js'],function(exports){'use strict';var postMessage,browser,defineComponent,createVNode,Fragment,NavBar;return{setters:[function(module){postMessage=module.p;browser=module.b;},function(module){defineComponent=module.d;createVNode=module.a;Fragment=module.F;NavBar=module.O;},function(){}],execute:function execute(){var colHeader="_colHeader_a7v8p_1";var transparent="_transparent_a7v8p_11";var headerSection="_headerSection_a7v8p_14";var styles={colHeader:colHeader,transparent:transparent,headerSection:headerSection};var ColHeader=exports('C',defineComponent({name:'col-header',props:{title:String,isBack:{type:Boolean,default:false},backIconColor:{// 返回按钮颜色
+>>>>>>> fine-music-score:dist/assets/index-legacy.1ca5e49d.js
 type:String,default:'black'},isFixed:{type:Boolean,default:true},styleName:{type:Object,default:function _default(){return{};}},titleClass:String,background:{type:String,default:'white'},color:{type:String,default:'#323233'},rightText:String,onClickRight:{type:Function,default:function _default(){}},border:{type:Boolean,default:true},onHeaderBack:{// 头部高度设置后返回
 type:Function,default:function _default(){}}},watch:{backIconColor:function backIconColor(){// 设置返回按钮颜色
 postMessage({api:'backIconChange',content:{iconStyle:this.backIconColor}});}},data:function data(){return{headerTitle:null,navBarHeight:0,// 顶部导航栏高度

dist/assets/index-legacy.2833a667.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.2833a667.js
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._f404_h02wy_1{min-height:100vh;text-align:center}._f404_h02wy_1 p{font-size:.42667rem;color:#999}._f404_h02wy_1 .van-image{margin-top:2.66667rem;width:70%}._f404_h02wy_1 .van-button{margin-top:.53333rem;background-color:transparent;width:50%}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.1feeab76.js','./index-legacy.f25f109a2.js','./index-legacy.3db8b4dc.js'],function(exports){'use strict';var defineComponent,createVNode,Image,createTextVNode,Button,browser,postMessage;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.I;createTextVNode=module.j;Button=module.B;},function(){},function(module){browser=module.b;postMessage=module.p;}],execute:function execute(){var f404="_f404_h02wy_1";var styles={f404:f404};var img404="./assets/404.91cd33be.png";var index=exports('default',defineComponent({name:'NotFound',render:function render(){var _this=this;return createVNode("div",{"class":styles.f404},[createVNode(Image,{"src":img404},null),createVNode("p",null,[createTextVNode("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),createVNode(Button,{"type":"primary","plain":true,"round":true,"onClick":function onClick(){if(browser().iPhone){postMessage({api:'back'});}else{_this.$router.back();}}},{default:function _default(){return[createTextVNode("\u8FD4\u56DE")];}})]);}}));}};});})();
+========
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._f404_h02wy_1{min-height:100vh;text-align:center}._f404_h02wy_1 p{font-size:.42667rem;color:#999}._f404_h02wy_1 .van-image{margin-top:2.66667rem;width:70%}._f404_h02wy_1 .van-button{margin-top:.53333rem;background-color:transparent;width:50%}\n";document.head.appendChild(__vite_style__);System.register(['./vendor-legacy.d9b05f74.js','./index-legacy.f25f109a2.js','./index-legacy.1ce5c464.js'],function(exports){'use strict';var defineComponent,createVNode,Image,createTextVNode,Button,browser,postMessage;return{setters:[function(module){defineComponent=module.d;createVNode=module.a;Image=module.I;createTextVNode=module.j;Button=module.B;},function(){},function(module){browser=module.b;postMessage=module.p;}],execute:function execute(){var f404="_f404_h02wy_1";var styles={f404:f404};var img404="./assets/404.91cd33be.png";var index=exports('default',defineComponent({name:'NotFound',render:function render(){var _this=this;return createVNode("div",{"class":styles.f404},[createVNode(Image,{"src":img404},null),createVNode("p",null,[createTextVNode("\u9875\u9762\u627E\u4E0D\u5230\u4E86")]),createVNode(Button,{"type":"primary","plain":true,"round":true,"onClick":function onClick(){if(browser().iPhone){postMessage({api:'back'});}else{_this.$router.back();}}},{default:function _default(){return[createTextVNode("\u8FD4\u56DE")];}})]);}}));}};});})();
+>>>>>>>> fine-music-score:dist/assets/index-legacy.407c2ec0.js