Browse Source

合并master

lex-xin 4 years ago
parent
commit
dafc8b8f9f

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/chunk-41c0f7b4.8422f03e.css

@@ -0,0 +1 @@
+.statistic .statistic-content>span[data-v-be006b80]{font-size:22px!important}.statistic .statistic-content>span[data-v-be006b80]:first-child{font-size:14px!important}

+ 0 - 0
dist/static/css/chunk-7c778be5.528f89ad.css → dist/static/css/chunk-7c778be5.d9008095.css


+ 0 - 0
dist/static/css/chunk-a8c754c0.ca1a71eb.css → dist/static/css/chunk-a8c754c0.2b1d7a80.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.9d11d579.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-41c0f7b4.db0d6b0a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-697b3032.86a01963.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7c778be5.a27ccd2e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7c778be5.c703d053.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-a265025c.2e51517c.js


+ 0 - 0
dist/static/js/chunk-a8c754c0.44f4d68f.js → dist/static/js/chunk-a8c754c0.4bef72ce.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-libs.8b032e07.js


+ 2 - 2
src/views/childrensDay/index.vue

@@ -74,7 +74,7 @@
           >预报名链接</el-button
           >预报名链接</el-button
         >
         >
         <el-button type="primary" @click="onCreateQRCode('music')"
         <el-button type="primary" @click="onCreateQRCode('music')"
-          >器乐考级链接</el-button
+          >器乐考级报名链接</el-button
         >
         >
         <el-button type="primary" @click="onCreateQRCode('vip')"
         <el-button type="primary" @click="onCreateQRCode('vip')"
           >VIP课程链接</el-button
           >VIP课程链接</el-button
@@ -367,7 +367,7 @@ export default {
       }
       }
 
 
       if (status == "music") {
       if (status == "music") {
-        this.codeTitle = "器乐考级链接";
+        this.codeTitle = "器乐考级报名链接";
         this.qrCodeUrl = vaildStudentUrl() + "/#/childrenPayment?dHlwZT0x";
         this.qrCodeUrl = vaildStudentUrl() + "/#/childrenPayment?dHlwZT0x";
       }
       }
       if (status == "vip") {
       if (status == "vip") {

Some files were not shown because too many files changed in this diff