Merge branch 'dev' into online2

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.7855816a.js

@@ -0,0 +1,30 @@
+<<<<<<<< HEAD:dist/assets/download-legacy.9d3e9704.js
+;(function(){System.register(['./index.module-legacy.28209fba.js','./wx_bg-legacy.105835c9.js','./index-legacy.0976cb2c.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.d5381797.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;}// 线上地址
+>>>>>>>> dev:dist/assets/download-legacy.7855816a.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/download-legacy.9d3e9704.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/download-legacy.9d3e9704.js
 ;(function(){System.register(['./index.module-legacy.28209fba.js','./wx_bg-legacy.105835c9.js','./index-legacy.0976cb2c.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.d5381797.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;}// 线上地址
+>>>>>>>> dev:dist/assets/download-legacy.7855816a.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/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.7e27bbbf.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/help-center-detail.ceaf71e3.js
+import{r as d}from"./index.9bc1e23a.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.ddd93c6c.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};
+>>>>>>>> dev:dist/assets/help-center-detail.7e27bbbf.js

dist/assets/help-center-detail.ceaf71e3.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/help-center-detail.ceaf71e3.js
 import{r as d}from"./index.9bc1e23a.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.ddd93c6c.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};
+>>>>>>>> dev:dist/assets/help-center-detail.7e27bbbf.js

dist/assets/index-legacy.002cbe6a.js

@@ -0,0 +1,14 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.49b4c983.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.0976cb2c.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.d5381797.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:{// 返回按钮颜色
+>>>>>>>> dev:dist/assets/index-legacy.002cbe6a.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）
+};},mounted:function mounted(){var _this=this;this.headerTitle=this.title||this.$route.meta.title;this.navBarInit(function(){_this.onHeaderBack&&_this.onHeaderBack();});},unmounted:function unmounted(){// 设置是否显示导航栏 0 显示 1 不显示
+postMessage({api:'setBarStatus',content:{status:1}});// 设置返回按钮颜色
+postMessage({api:'backIconChange',content:{iconStyle:'black'}});},methods:{navBarInit:function navBarInit(callBack){var _this2=this;// 设置是否显示导航栏 0 显示 1 不显示
+postMessage({api:'setBarStatus',content:{status:0}});// 设置返回按钮颜色
+postMessage({api:'backIconChange',content:{iconStyle:this.backIconColor||'black'}});var sNavHeight=sessionStorage.getItem('navHeight');var sTitleHeight=sessionStorage.getItem('titleHeight');if(sNavHeight&&sTitleHeight){this.navBarHeight=Number(sNavHeight);callBack&&callBack();}else{postMessage({api:'getNavHeight'},function(res){var content=res.content;var dpi=content.dpi||2;if(content.navHeight){var navHeight=content.navHeight/dpi;sessionStorage.setItem('navHeight',String(navHeight));_this2.navBarHeight=navHeight;}if(content.titleHeight){// 导航栏的高度
+var titleHeight=content.titleHeight/dpi;sessionStorage.setItem('titleHeight',String(titleHeight));_this2.titleHeight=titleHeight;}callBack&&callBack();});}!browser().isApp&&callBack&&callBack();},onClickLeft:function onClickLeft(){this.$router.back();},clickRight:function clickRight(){this.onClickRight&&this.onClickRight();}},render:function render(){var _this3=this;return createVNode("div",null,[this.$slots.content?createVNode("div",{"style":{paddingTop:"".concat(this.navBarHeight,"px")},"class":styles.headerSection},[this.$slots.content(this.navBarHeight)]):createVNode(Fragment,null,[createVNode("div",{"style":{minHeight:"calc(var(--van-nav-bar-height) + ".concat(this.navBarHeight,"px)")},"class":styles.headerSection},[createVNode(NavBar,{"title":this.headerTitle,"class":[styles.colHeader],"style":{background:this.background,color:this.color,paddingTop:"".concat(this.navBarHeight,"px"),zIndex:99},"left-arrow":this.isBack,"rightText":this.rightText,"fixed":this.isFixed,"border":this.border,"onClick-right":this.clickRight,"onClick-left":this.onClickLeft},{right:function right(){return _this3.$slots.right&&_this3.$slots.right()||_this3.rightText;}})]),this.$slots.default?this.$slots.default():null])]);}}));}};});})();

dist/assets/index-legacy.49b4c983.js

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.49b4c983.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.0976cb2c.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.d5381797.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:{// 返回按钮颜色
+>>>>>>>> dev:dist/assets/index-legacy.002cbe6a.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.4d4b056f.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.4d4b056f.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.0976cb2c.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.d5381797.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")];}})]);}}));}};});})();
+>>>>>>>> dev:dist/assets/index-legacy.8da49d41.js