1

1

dist/static/css/chunk-0538936c.5a49e87c.css

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

dist/static/css/chunk-43565f57.57fd3ab3.css

@@ -1 +0,0 @@
-.right-code .title[data-v-5a9766b6]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-5a9766b6]{display:inline-block}.el-input[data-v-5a9766b6]{width:180px!important}

dist/static/css/chunk-6d15323a.f5b82ca9.css

@@ -0,0 +1 @@
+.right-code .title[data-v-5081e6f4]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-5081e6f4]{display:inline-block}.el-input[data-v-5081e6f4]{width:180px!important}

dist/static/css/chunk-e8cf9a0e.41b95c51.css

@@ -0,0 +1 @@
+.statistic .statistic-content>span[data-v-9b1df636]{font-size:22px!important}.statistic .statistic-content>span[data-v-9b1df636]:first-child{font-size:14px!important}.btnList[data-v-9b1df636]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap}.btnList .el-button+.el-button[data-v-9b1df636]{margin-left:0}.btnList>.el-button[data-v-9b1df636]{margin-right:15px;margin-top:10px}

src/views/categroyManager/specialSetup/modals/chargesForm.vue

@@ -94,7 +94,7 @@
                                v-model="item.courseTotalMinuties"
                                :controls="false"
                                :precision="0"
-                               :min="1"
+                               :min="0"
                                @change="() => courseItemChange(item, index)"
                                placeholder="课程总时长" />
             </el-form-item>
@@ -266,7 +266,7 @@ export default {
       if (item.courseType) {
         const active = this.courseTypesByType[item.courseType] || {}
         const _list = this.form.details
-        const price = Math.round(numeral((active.unitPrice || 1)).multiply((item.courseTotalMinuties || 1)).value())
+        const price = Math.round(numeral((active.unitPrice || 1)).multiply((item.courseTotalMinuties || 0)).value())
         _list[index] = {
           ...item,
           courseCurrentPrice: price,

src/views/categroyManager/vipActiveList.vue

@@ -1001,6 +1001,16 @@ export default {
       this.isReset = true;
       this.activeId = row.id;
       this.dialogVisible = true;
+      this.resetForm = {
+        name: "",
+        desc: "",
+        activeTime: [],
+        courseTime: [],
+        stauts: [],
+        applyToStudentType: null,
+        allowOnlineToOffline: null,
+        organ: [],
+      }
       this.resetForm.name = row.name;
       this.resetForm.applyToStudentType = row.applyToStudentType;
       this.resetForm.allowOnlineToOffline = row.allowOnlineToOffline + "";

src/views/childrensDay/index.vue

@@ -82,6 +82,12 @@
         <el-button type="primary" @click="onCreateQRCode('theory')"
           >乐理考级链接</el-button
         >
+        <el-button type="primary" @click="onCreateQRCode('musicOut')" style="background-color: #f97215; border: 1px solid #f97215"
+          >对外器乐考级报名链接</el-button
+        >
+        <el-button type="primary" @click="onCreateQRCode('theoryOut')" style="background-color: #f97215; border: 1px solid #f97215"
+          >对外乐理考级链接</el-button
+        >
         <el-button
           type="primary"
           @click="sendMsg"
@@ -400,6 +406,14 @@ export default {
         this.codeTitle = "VIP课程链接";
         this.qrCodeUrl = vaildStudentUrl() + "/#/childrenPayment";
       }
+      if (status == "musicOut") {
+        this.codeTitle = "对外器乐考级报名链接";
+        this.qrCodeUrl = vaildStudentUrl() + "/#/childrenOut";
+      }
+      if (status == "theoryOut") {
+        this.codeTitle = "对外乐理考级链接";
+        this.qrCodeUrl = vaildStudentUrl() + "/#/childrenOut?dHlwZT0y";
+      }
       this.codeStatus = true;
     },
     changeOrgan(val) {
@@ -492,4 +506,18 @@ export default {
     }
   }
 }
+    .btnList {
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
+      align-items: center;
+      flex-wrap: wrap;
+      .el-button+.el-button {
+    margin-left: 0px;
+}
+      & > .el-button {
+        margin-right: 15px;
+        margin-top: 10px;
+      }
+    }
 </style>

src/views/contentManager/model/systemNotifyModel.vue

@@ -419,7 +419,6 @@ export default {
                         content,
                         organIdList: organIdList ? organIdList.join(',') : null
                     }
-
                     if (this.pageType == "create") {
                         if (form.id) {
                             // 判断有没有Id，如果有则删除
@@ -472,12 +471,11 @@ export default {
             }
         },
         onReSet (formName) {
-            const query = this.$route.query
             this.form = {
                 title: null,
                 order: null,
                 linkUrl: null,
-                type: query.type,
+                type: this.type,
                 status: 1,
                 content: null,
                 organIdList: []

src/views/resetTeaming/index.vue

@@ -386,7 +386,7 @@ export default {
   position: absolute;
   right: 40px;
   top: -55px;
-  z-index: 1000;
+  z-index: 990;
   img {
     width: 36px;
     height: 36px;

src/views/sporadicManager/sporadicList.vue

@@ -222,7 +222,7 @@
         ref="maskForm"
       >
         <el-form-item label="标题" prop="title">
-          <el-input v-model.trim="maskForm.title" :disabled="!isNew"></el-input>
+          <el-input v-model.trim="maskForm.title" maxlength="50" :disabled="!isNew"></el-input>
         </el-form-item>
         <el-form-item label="收费类型" prop="type">
           <el-select
@@ -335,6 +335,7 @@
             :disabled="!isNew"
             v-model.trim="maskForm.desc"
             style="width: 490px"
+            maxlength="300"
             :autosize="{ minRows: 5 }"
           ></el-input>
         </el-form-item>
@@ -367,6 +368,7 @@
         <el-form-item label="标题" prop="title">
           <el-input
             v-model.trim="maskForm1.title"
+            maxlength="50"
             :disabled="!isNew1"
           ></el-input>
         </el-form-item>
@@ -442,6 +444,7 @@
             :disabled="!isNew1"
             v-model.trim="maskForm1.desc"
             style="width: 490px"
+            maxlength="300"
             :autosize="{ minRows: 5 }"
           ></el-input>
         </el-form-item>
@@ -529,6 +532,7 @@ export default {
         { label: "账户充值", value: 9 },
         { label: "乐保服务", value: 10 },
         { label: "网基课活动", value: 13 },
+        { label: "云教练系统", value: 15 },
         { label: "其它", value: 11 },
       ],
       orderType1: [
@@ -540,7 +544,8 @@ export default {
         { label: "上门费", value: 7 },
         { label: "账户充值", value: 9 },
         { label: "乐保服务", value: 10 },
-        { label: "网基课活动", value: 13 }
+        { label: "网基课活动", value: 13 },
+        { label: "云教练系统", value: 15 },
       ],
       maskForm: {
         organId: "",
@@ -997,7 +1002,8 @@ export default {
         10: "乐保服务",
         11: "其它",
         12: "双十一活动",
-        13: '网基课活动'
+        13: '网基课活动',
+        15: '云教练系统',
       };
       return template[val];
     },

src/views/teamBuild/signupList.vue

@@ -197,10 +197,10 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="预约中" prop="checkNum" align="center">
+                <el-table-column label="审核中" prop="checkNum" align="center">
                   <template slot="header">
                     <p>
-                      预约中
+                      审核中
                       <el-tooltip placement="top" popper-class="mTooltip">
                         <div slot="content">
                           不购买云教练系统学员数量，不包含已缴费学员
@@ -388,7 +388,7 @@
             placeholder="订单状态"
           >
             <el-option label="缴费中" :value="1"></el-option>
-            <el-option label="预约中" :value="2"></el-option>
+            <el-option label="审核中" :value="2"></el-option>
           </el-select>
         </el-form-item>
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
@@ -607,7 +607,7 @@
               </auth>
               <!--  -->
               <auth
-                v-show="scope.row.payingStatus == 2"
+                v-show="scope.row.payingStatus == 2 && scope.row.noneNeedCloudTeacher == 0"
                 :auths="'studentRegistration/setNoneCloudTeacher'"
               >
                 <el-button type="text" @click="relieve(scope.row)"
@@ -1146,7 +1146,7 @@ export default {
       let obj = {
         0: "--",
         1: "缴费中",
-        2: "预约中",
+        2: "审核中",
       };
       return obj[val];
     },

src/views/teamDetail/componentCourse/message-box.vue

@@ -32,6 +32,9 @@ export default {
 <style lang="less" scoped>
   .box{
     display: flex;
+    height: auto;
+    line-height: 1.2;
+    align-items: normal;
 
     &.teacher{
       flex-direction: row-reverse;
@@ -60,7 +63,7 @@ export default {
       }
     }
     >.name{
-      margin: 27px 10px;
+      margin: 32px 10px 0;
       margin-left: 0;
     }
     .container{

src/views/teamDetail/components/studentList.vue

@@ -1107,6 +1107,7 @@ export default {
     async init() {
       this.teamid = this.$route.query.id;
       this.team_status = this.$route.query.team_status;
+      this.organId = this.$route.query.organId;
       // 获取乐团是否能补招
       // try {
       //   const ruselt = await checkCanReg({ musicGroupId: this.teamid });
@@ -1514,6 +1515,7 @@ export default {
       getGoods({
         subjectId: subjectId,
         type: type,
+        organId: this.organId
       }).then((res) => {
         let result = res.data;
         if (res.code == 200) {

src/views/teamDetail/teamList.vue

@@ -276,7 +276,7 @@
                       scope.row.status == 'AUDIT' ||
                       scope.row.status == 'FEE_AUDIT' ||
                       scope.row.status == 'APPLY' ||
-                      scope.row.status == 'PAY') &&
+                      scope.row.status == 'PAY'|| scope.row.status == 'PRE_APPLY'||scope.row.status =='PRE_BUILD_FEE') &&
                     permission('musicGroup/cancelMusicGroup')
                   "
                   @click="stopTeam(scope.row)"

vue.config.js

@@ -19,8 +19,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -54,7 +54,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    https: false,
+    https: true,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy