Merge branch 'ol_12_30' of http://git.dayaedu.com/yonge/dy-admin-manager into ol_12_30

dist/static/css/chunk-3739c059.0004f97c.css → dist/static/css/chunk-7f68b17a.f19206fd.css

@@ -1 +1 @@
-.btns[data-v-69b2e334]{text-align:right}.files[data-v-69b2e334]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-69b2e334]{position:absolute;right:20px;bottom:10px}.myCascader .el-radio{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input{visibility:hidden}.myCascader .el-cascader-node__postfix{top:10px}[data-v-3b593294] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-3b593294]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-3b593294] .el-dialog__body{padding:0}.iframe_back[data-v-3b593294]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-3b593294]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-3b593294]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}
+.btns[data-v-3543e542]{text-align:right}.files[data-v-3543e542]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-3543e542]{position:absolute;right:20px;bottom:10px}.myCascader .el-radio{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input{visibility:hidden}.myCascader .el-cascader-node__postfix{top:10px}[data-v-3b593294] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-3b593294]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-3b593294] .el-dialog__body{padding:0}.iframe_back[data-v-3b593294]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-3b593294]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-3b593294]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}

src/utils/vueFilter.js

@@ -202,7 +202,14 @@ Vue.filter('organPayState',val=>constant.organPayState[val])
 // 教学伴奏
 Vue.filter('clientType',val=>constant.clientStatus[val])
 // 会员周期
-Vue.filter('memberEnumType',val=>constant.memberEnum[val])
+Vue.filter('memberEnumType',val=> {
+  let template = {
+    "DAY": '天',
+    ...constant.memberEnum
+  }
+  // constant.memberEnum[val]
+  return template[val]
+})
 // 优惠券类型
 Vue.filter('coupontypeDetailType',val=>constant.coupontypeDetail[val])
 

src/views/accompaniment/modals/form.vue

@@ -157,12 +157,6 @@
       <el-form-item
         label="伴奏(不含节拍器)"
         prop="sysMusicScore.url"
-        :rules="[
-          {
-            required: form.sysMusicScore.isOpenMetronome ? form.sysMusicScore.playMode === 'MP3' : false,
-            message: '请上传伴奏',
-          },
-        ]"
       >
         <singe-file-upload
           tips="仅支持上传 mp3/aac 格式音频文件"
@@ -173,12 +167,6 @@
       <el-form-item
         label="伴奏(含节拍器)"
         prop="sysMusicScore.metronomeUrl"
-        :rules="[
-          {
-            required: form.sysMusicScore.isOpenMetronome ? false : form.sysMusicScore.playMode === 'MP3',
-            message: '伴奏(含节拍器)',
-          },
-        ]"
       >
         <singe-file-upload
           tips="仅支持上传 mp3/aac 格式音频文件"
@@ -265,6 +253,12 @@
             <el-form-item
               label="原音(不含节拍器)"
               :prop="`sysMusicScoreAccompaniments.${index}.mp3Url`"
+              :rules="[
+                {
+                  required: form.sysMusicScore.isOpenMetronome ? form.sysMusicScore.playMode === 'MP3' : false,
+                  message: '请上传原音(不含节拍器)',
+                },
+              ]"
             >
               <singe-file-upload
                 tips="仅支持上传 mp3/aac 格式音频文件"
@@ -277,6 +271,12 @@
             <el-form-item
               label="原音(含节拍器)"
               :prop="`sysMusicScoreAccompaniments.${index}.metronomeMp3Url`"
+              :rules="[
+                {
+                  required: form.sysMusicScore.isOpenMetronome ? false : form.sysMusicScore.playMode === 'MP3',
+                  message: '原音(含节拍器)',
+                },
+              ]"
             >
               <singe-file-upload
                 tips="仅支持上传 mp3/aac 格式音频文件"
@@ -337,7 +337,7 @@
         type="info"
         style="width: 100%; margin-bottom: 20px"
         plain
-        >添加伴奏</el-button
+        >添加原音</el-button
       >
       <div class="btns">
         <el-button type="primary" @click="submit">提交</el-button>
@@ -530,7 +530,7 @@ export default {
     },
     async removeSys(index) {
       try {
-        await this.$confirm("是否确认删除此伴奏?", "提示", {
+        await this.$confirm("是否确认删除此原音?", "提示", {
           type: "warning",
         });
         if (this.form.sysMusicScoreAccompaniments[index]) {