Merge branch 'more_function'

dist/assets/bars-legacy.9085ff9b.js → dist/assets/bars-legacy.72d07b27.js

@@ -1 +1 @@
-;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var bars=exports('b',"./assets/bars.a8677f73.svg");}};});})();
+;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var bars=exports('b',"./assets/bars.57562ef5.svg");}};});})();

dist/assets/bars.4f1962a6.js

@@ -1 +0,0 @@
-var s="./assets/bars.a8677f73.svg";export{s as b};

dist/assets/bars.82474962.js

@@ -0,0 +1 @@
+var s="./assets/bars.57562ef5.svg";export{s as b};

dist/assets/download-legacy.9ece75ce.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/download-legacy.9ece75ce.js
 ;(function(){System.register(['./index.module-legacy.28209fba.js','./wx_bg-legacy.105835c9.js','./index-legacy.8725385c.js','./vendor-legacy.2b215f7f.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.79dc7dc8.js','./vendor-legacy.2b215f7f.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;}// 线上地址
+>>>>>>>> more_function:dist/assets/download-legacy.d4d90f2f.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.d4d90f2f.js

@@ -0,0 +1,30 @@
+<<<<<<<< HEAD:dist/assets/download-legacy.9ece75ce.js
+;(function(){System.register(['./index.module-legacy.28209fba.js','./wx_bg-legacy.105835c9.js','./index-legacy.8725385c.js','./vendor-legacy.2b215f7f.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.79dc7dc8.js','./vendor-legacy.2b215f7f.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;}// 线上地址
+>>>>>>>> more_function:dist/assets/download-legacy.d4d90f2f.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/favorite-legacy.9d79fe4e.js → dist/assets/favorite-legacy.e106b2dc.js

@@ -1 +1 @@
-;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var FavoriteIcon=exports('F',"./assets/favorite.7e06ea16.svg");}};});})();
+;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var FavoriteIcon=exports('F',"./assets/favorite.f00a4b96.svg");}};});})();

dist/assets/favorite.388206b8.js

@@ -0,0 +1 @@
+var a="./assets/favorite.f00a4b96.svg";export{a as F};

dist/assets/favorite.cb69f4f9.js

@@ -1 +0,0 @@
-var a="./assets/favorite.7e06ea16.svg";export{a as F};

dist/assets/footer.074b6efd.js

@@ -0,0 +1 @@
+import{d as c,at as l,a as o,u as e,j as n}from"./vendor.405ecf9c.js";import{F as r}from"./favorite.388206b8.js";var m="./assets/count.0a166dfd.svg";const i="_album_1cld5_1",d="_img_1cld5_8",_="_content_1cld5_31",f="_footer_1cld5_51",v="_icon_1cld5_63";var t={album:i,img:d,content:_,footer:f,icon:v},F=c({name:"AlbumFooter",props:{musicSheetCount:{type:Number,default:0},albumFavoriteCount:{type:Number,default:0}},setup(a){const{musicSheetCount:s,albumFavoriteCount:u}=l(a);return()=>o("footer",{class:t.footer},[o("div",null,[o(e,{class:t.icon,name:m},null),o("span",null,[s.value,n("\u9996")])]),o("div",null,[o(e,{class:t.icon,name:r},null),o("span",null,[u.value,n("\u4EBA\u6536\u85CF")])])])}});export{F,t as s};

dist/assets/help-center-detail.2d736b8f.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/help-center-detail.88d2db53.js
+import{r as d}from"./index.03da02d6.js";import{d as u,g as c,ak as p,a as t,N as h,j as g}from"./vendor.405ecf9c.js";/* empty css               *//* empty css               *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.bdc7eed4.js";var v=u({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 d.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:l,createTime:o,content:i,catalogId:r}=s.data;this.detail={title:a,createTime:r==2?c(l).format("YYYY-MM-DD HH:mm:ss"):c(o).format("YYYY-MM-DD HH:mm:ss"),content:i};const m=r==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const l=document.querySelectorAll(".msgWrap img");let o=Array.from(l).map((i,r)=>(e.srcElement==i&&(a=r),i.src));p({images:o,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(h,{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"],onClick:this.onShowImg,innerHTML:this.detail.content},null)])}});export{v as default};
+========
+import{r as d}from"./index.7b41d51c.js";import{d as u,g as c,ak as p,a as t,N as h,j as g}from"./vendor.405ecf9c.js";/* empty css               *//* empty css               *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.bdc7eed4.js";var v=u({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 d.get("/api-cms/helpCenterContent/get/"+e.id);let{title:i,releaseTime:l,createTime:o,content:a,catalogId:r}=s.data;this.detail={title:i,createTime:r==2?c(l).format("YYYY-MM-DD HH:mm:ss"):c(o).format("YYYY-MM-DD HH:mm:ss"),content:a};const m=r==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let i=0;const l=document.querySelectorAll(".msgWrap img");let o=Array.from(l).map((a,r)=>(e.srcElement==a&&(i=r),a.src));p({images:o,startPosition:i,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(h,{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"],onClick:this.onShowImg,innerHTML:this.detail.content},null)])}});export{v as default};
+>>>>>>>> more_function:dist/assets/help-center-detail.2d736b8f.js

dist/assets/help-center-detail.88d2db53.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/help-center-detail.88d2db53.js
 import{r as d}from"./index.03da02d6.js";import{d as u,g as c,ak as p,a as t,N as h,j as g}from"./vendor.405ecf9c.js";/* empty css               *//* empty css               *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.bdc7eed4.js";var v=u({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 d.get("/api-cms/helpCenterContent/get/"+e.id);let{title:a,releaseTime:l,createTime:o,content:i,catalogId:r}=s.data;this.detail={title:a,createTime:r==2?c(l).format("YYYY-MM-DD HH:mm:ss"):c(o).format("YYYY-MM-DD HH:mm:ss"),content:i};const m=r==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let a=0;const l=document.querySelectorAll(".msgWrap img");let o=Array.from(l).map((i,r)=>(e.srcElement==i&&(a=r),i.src));p({images:o,startPosition:a,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(h,{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"],onClick:this.onShowImg,innerHTML:this.detail.content},null)])}});export{v as default};
+========
+import{r as d}from"./index.7b41d51c.js";import{d as u,g as c,ak as p,a as t,N as h,j as g}from"./vendor.405ecf9c.js";/* empty css               *//* empty css               *//* empty css                *//* empty css               */import{s as n}from"./help-center-detail.module.bdc7eed4.js";var v=u({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 d.get("/api-cms/helpCenterContent/get/"+e.id);let{title:i,releaseTime:l,createTime:o,content:a,catalogId:r}=s.data;this.detail={title:i,createTime:r==2?c(l).format("YYYY-MM-DD HH:mm:ss"):c(o).format("YYYY-MM-DD HH:mm:ss"),content:a};const m=r==2?"\u516C\u544A\u8BE6\u60C5":"\u5E2E\u52A9\u4E2D\u5FC3\u8BE6\u60C5";document.title=m}catch{}},methods:{onShowImg(e){const{localName:s}=e.srcElement;if(s!=="img")return;let i=0;const l=document.querySelectorAll(".msgWrap img");let o=Array.from(l).map((a,r)=>(e.srcElement==a&&(i=r),a.src));p({images:o,startPosition:i,closeable:!0})}},render(){return t("div",{class:n["help-center-detail"]},[this.catalogType==="ANALYSIS"&&t(h,{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"],onClick:this.onShowImg,innerHTML:this.detail.content},null)])}});export{v as default};
+>>>>>>>> more_function:dist/assets/help-center-detail.2d736b8f.js

dist/assets/index-legacy.085e39a8.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.085e39a8.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.8725385c.js','./vendor-legacy.2b215f7f.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.N;},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.79dc7dc8.js','./vendor-legacy.2b215f7f.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.N;},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:{// 返回按钮颜色
+>>>>>>>> more_function:dist/assets/index-legacy.f6cd83e9.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(){}}},data:function data(){return{headerTitle:null,navBarHeight:0,// 顶部导航栏高度
 titleHeight:44// 顶部导航高度（默认44px）

dist/assets/index-legacy.3dc2b131.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.3dc2b131.js
 ;(function(){function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value;}catch(error){reject(error);return;}if(info.done){resolve(value);}else{Promise.resolve(value).then(_next,_throw);}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise(function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value);}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err);}_next(undefined);});};}var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._cashProtocol_ifi2b_1{position:relative}._cashProtocol_ifi2b_1 ._submit_ifi2b_4{width:90%;margin-left:5%;margin-bottom:.4rem;position:absolute;bottom:0;z-index:99}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.8725385c.js','./vendor-legacy.2b215f7f.js','./index-legacy.67f743b1.js','./index-legacy.7ed8a384.js','./index-legacy.637f3556.js','./index-legacy.085e39a8.js','./index-legacy.f25f109a8.js','./index-legacy.f25f109a.js','./index-legacy.f25f109a3.js'],function(exports){'use strict';var state,request,postMessage,defineComponent,Toast,createVNode,Fragment,Button,createTextVNode,UserAuth;return{setters:[function(module){state=module.s;request=module.r;postMessage=module.p;},function(module){defineComponent=module.d;Toast=module.T;createVNode=module.a;Fragment=module.F;Button=module.B;createTextVNode=module.j;},function(module){UserAuth=module.U;},function(){},function(){},function(){},function(){},function(){},function(){}],execute:function execute(){var cashProtocol="_cashProtocol_ifi2b_1";var submit="_submit_ifi2b_4";var styles={cashProtocol:cashProtocol,submit:submit};var index=exports('default',defineComponent({name:'cash-protocol',data:function data(){return{realStatus:true,// 是否已经实名认证
+========
+;(function(){function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value;}catch(error){reject(error);return;}if(info.done){resolve(value);}else{Promise.resolve(value).then(_next,_throw);}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise(function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value);}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err);}_next(undefined);});};}var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._cashProtocol_ifi2b_1{position:relative}._cashProtocol_ifi2b_1 ._submit_ifi2b_4{width:90%;margin-left:5%;margin-bottom:.4rem;position:absolute;bottom:0;z-index:99}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.79dc7dc8.js','./vendor-legacy.2b215f7f.js','./index-legacy.8a9af657.js','./index-legacy.7ed8a384.js','./index-legacy.637f3556.js','./index-legacy.f6cd83e9.js','./index-legacy.f25f109a8.js','./index-legacy.f25f109a.js','./index-legacy.f25f109a3.js'],function(exports){'use strict';var state,request,postMessage,defineComponent,Toast,createVNode,Fragment,Button,createTextVNode,UserAuth;return{setters:[function(module){state=module.s;request=module.r;postMessage=module.p;},function(module){defineComponent=module.d;Toast=module.T;createVNode=module.a;Fragment=module.F;Button=module.B;createTextVNode=module.j;},function(module){UserAuth=module.U;},function(){},function(){},function(){},function(){},function(){},function(){}],execute:function execute(){var cashProtocol="_cashProtocol_ifi2b_1";var submit="_submit_ifi2b_4";var styles={cashProtocol:cashProtocol,submit:submit};var index=exports('default',defineComponent({name:'cash-protocol',data:function data(){return{realStatus:true,// 是否已经实名认证
+>>>>>>>> more_function:dist/assets/index-legacy.8588c964.js
 url:''};},mounted:function mounted(){var _this=this;return _asyncToGenerator(/*#__PURE__*/regeneratorRuntime.mark(function _callee(){var user;return regeneratorRuntime.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:try{// 先实名认证
 console.log(state.user);user=state.user.data;if(!user.realName||!user.idCardNo){_this.realStatus=false;}else{_this.getDetail();}}catch(_unused){}case 1:case"end":return _context.stop();}}},_callee);}))();},methods:{getDetail:function getDetail(){var _this2=this;return _asyncToGenerator(/*#__PURE__*/regeneratorRuntime.mark(function _callee2(){var res;return regeneratorRuntime.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:_context2.prev=0;_context2.next=3;return request.get('/api-teacher/sysUserContractRecord/queryLatestContractTemplate',{params:{contractType:'WITHDRAW'}});case 3:res=_context2.sent;_this2.url=window.location.origin+window.location.pathname+'/pdf/web/viewer.html?file='+// encodeURIComponent(
 //   'http://daya.ks3-cn-beijing.ksyun.com/202207/TAxRhc6.pdf'

dist/assets/index-legacy.6098b02f.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.b9c4d6a4.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.2b215f7f.js','./index-legacy.f25f109a4.js','./index-legacy.8725385c.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.2b215f7f.js','./index-legacy.f25f109a4.js','./index-legacy.79dc7dc8.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")];}})]);}}));}};});})();
+>>>>>>>> more_function:dist/assets/index-legacy.6098b02f.js