Merge branch '0609getMusicFee' into test

src/views/auditList/index.vue

@@ -147,7 +147,7 @@
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.courseOriginalPrice | moneyFormat }}
+                {{ (scope.row.courseOriginalPrice+scope.row.originalMemberPaymentAmount) | moneyFormat }}
               </div>
             </template>
           </el-table-column>
@@ -158,7 +158,7 @@
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.courseCurrentPrice | moneyFormat }}
+                {{ (scope.row.courseCurrentPrice+scope.row.memberPaymentAmount) | moneyFormat }}
               </div>
             </template>
           </el-table-column>

src/views/categroyManager/productSystem/memberSet.vue

@@ -106,22 +106,27 @@
           label="会员名称"
           prop="name"
           :label-width="formLabelWidth"
-          :rules="[{ required: true, message: '请输入会员名称' }]"
+          :rules="[{ required: true, message: '请输入会员名称' },]"
         >
           <el-input
             :disabled="addDisabled"
             v-model.trim="form.name"
             autocomplete="off"
             style="width: 620px"
+            maxlength="10"
+            show-word-limit
           ></el-input>
         </el-form-item>
         <el-form-item
           label="会员介绍"
+
           prop="intro"
           :label-width="formLabelWidth"
           :rules="[{ required: true, message: '请输入会员介绍' }]"
         >
           <el-input
+          maxlength="50"
+           show-word-limit
             :disabled="addDisabled"
             v-model.trim="form.intro"
             autocomplete="off"
@@ -144,6 +149,7 @@
             :imageHeightM="200"
           ></upload>
           <img v-else :src="form.icon" alt="" width="120px" height="120px" />
+          <p style="color:red" v-if="!addDisabled">请上传200*200像素，大小2M以内，格式为jpg、png、gif图片</p>
         </el-form-item>
         <!-- <br />
         <el-form-item
@@ -299,17 +305,6 @@ export default {
   async mounted() {
     this.getList();
   },
-  watch: {
-    async branchStatus(val) {
-      if (val) {
-        try {
-          const res = await getMemberPrivilegesItem();
-          this.silderList = res.data;
-          this.treeData = this.setTableData(res.data);
-        } catch (e) {}
-      }
-    },
-  },
   methods: {
     onFormClose(ruleForm) {
       (this.form = {
@@ -427,25 +422,15 @@ export default {
       return list;
     },
     async resetMember(row, type) {
-      if (type) {
-        this.title = "修改会员等级";
-        this.pageType = "update";
-        this.addDisabled = false;
-        this.treeData = this.setTableData(this.silderList, this.addDisabled);
-      } else {
-        this.addDisabled = true;
-        this.title = "查看会员等级";
-        this.pageType = "";
-        this.treeData = this.setTableData(this.silderList, this.addDisabled);
-      }
-
       try {
+        const resTree = await getMemberPrivilegesItem();
+        this.silderList = resTree.data;
+        this.treeData = this.setTableData(resTree.data);
         const res = await getmemberRankDetail({ memberRankSettingId: row.id });
         this.form = { ...res.data };
         this.checkAll =
           res.data.memberPrivilegesItemIdList.length >= this.slideCount;
         // 反写树的值
-
         this.isIndeterminate =
           res.data.memberPrivilegesItemIdList.length > 0 &&
           res.data.memberPrivilegesItemIdList.length < this.slideCount;
@@ -459,6 +444,17 @@ export default {
       } catch (e) {
         console.log(e);
       }
+      if (type) {
+        this.title = "修改会员等级";
+        this.pageType = "update";
+        this.addDisabled = false;
+        this.treeData = this.setTableData(this.silderList, this.addDisabled);
+      } else {
+        this.addDisabled = true;
+        this.title = "查看会员等级";
+        this.pageType = "";
+        this.treeData = this.setTableData(this.silderList, this.addDisabled);
+      }
 
       this.branchStatus = true;
     },

src/views/resetTeaming/modals/review-detail.vue

@@ -186,7 +186,7 @@
       :column="2"
     >
       <descriptions-item label="缴费金额：">{{
-        numeral(item.paymentAmount).format("0,0")
+        numeral(item.paymentAmount+item.memberPaymentAmount).format("0,0")
       }}</descriptions-item>
       <descriptions-item label="缴费方式：">{{
         item.paymentPattern | paymentPatternTypeFormat

src/views/teamDetail/components/memberClassList.vue

@@ -154,7 +154,7 @@
             <div>{{ scope.row.preTotalClassTimes }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="剩余可拍课时长(分钟)">
+        <el-table-column align="center" label="剩余可排课时长(分钟)">
           <template slot-scope="scope">
             <div>{{ scope.row.preSubMinutes }}</div>
           </template>

src/views/teamDetail/components/modals/classroom-setting-item.vue

@@ -283,7 +283,8 @@ import dayjs from "dayjs";
 
 const classTimeListByType = {};
 for (const item of classTimeList) {
-  classTimeListByType[item.value] = item.label;
+   classTimeListByType[item.value] = item.label;
+
 }
 
 export default {
@@ -536,22 +537,27 @@ export default {
       this.updateUseTime();
     },
     getPickerOptions() {
-      let that = this
+      let that = this;
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-            console.log()
-            if(that.startCourseDate){
-              // 对比时间
-            let startTime =  dayjs(that.startCourseDate).valueOf()
-            let nowDate = new Date().getTime()
-            let lastTime
-             startTime -nowDate>0?lastTime = startTime:lastTime = nowDate
-             return time.getTime() + 86400000 <= lastTime;
-            }else{
-               return time.getTime() + 86400000 <= new Date().getTime();
-            }
+          if (that.startCourseDate) {
+            // 对比时间
+            let startTime = dayjs(that.startCourseDate).valueOf();
+            let nowDate = new Date().getTime();
+            let minTime;
+            startTime - nowDate > 0
+              ? (minTime = startTime)
+              : (minTime = nowDate);
 
+            let maxTime = dayjs(that.endSchoolTerm).valueOf();
+            return (
+              time.getTime() + 86400000 <= minTime ||
+              maxTime <= time.getTime() - 86400000
+            );
+          } else {
+            return time.getTime() + 86400000 <= new Date().getTime();
+          }
         },
       };
     },

src/views/teamDetail/components/modals/member-class-setting.vue

@@ -186,7 +186,6 @@ export default {
             subjectNames: item.subjectName,
           };
         });
-        console.log(this.studentList);
       }
     });
     this.setCourseTypeListByName(); // 获取课程名称和枚举的键值对
@@ -205,9 +204,13 @@ export default {
     setCourseTypeListByName() {
       const courseTypeListByName = {};
       for (const item of this.courseTypeList) {
-        courseTypeListByName[item.value] = item.label;
+        if (item.value == "HIGH" || item.value == "HIGH_ONLINE") {
+        } else {
+          courseTypeListByName[item.value] = item.label;
+        }
       }
       this.courseTypeListByName = courseTypeListByName;
+      console.log(this.courseTypeListByName);
     },
     async formatClasss() {
       this.coreid = "";
@@ -235,23 +238,26 @@ export default {
       const classs = {};
       for (const item of this.courseTypeList) {
         const key = item.value;
-        this.courseTimeList[key] = 0;
-        classs[key] = {
-          courseTotalMinuties: this.musicCourseSettings,
-          cycle: [
-            {
-              time: 0,
-              coreTeacher: this.coreid,
-              assistant: this.assistant,
-            },
-          ],
-        };
+        if (item.value == "HIGH" || item.value == "HIGH_ONLINE") {
+        } else {
+          this.courseTimeList[key] = 0;
+          classs[key] = {
+            courseTotalMinuties: this.musicCourseSettings,
+            cycle: [
+              {
+                time: this.selectPrices ? this.selectPrices[key] : undefined,
+                coreTeacher: this.coreid,
+                assistant: this.assistant,
+              },
+            ],
+          };
+        }
       }
       // console.log(classs,this.courseTypeList[0].value)
       let key = this.courseTypeList[0].value;
       this.allClasss = { ...classs };
+      console.log("allClasss", this.allClasss);
       let onlyClass = { [key]: classs[this.courseTypeList[0].value] };
-      console.log(onlyClass);
       this.$set(this.form, "classs", onlyClass);
     },
     collapseChange(val) {
@@ -303,7 +309,6 @@ export default {
               };
               list.push(data);
             }
-            console.log(list);
           }
           try {
             const res = await preCourseSchedule(list);
@@ -348,7 +353,6 @@ export default {
       } else {
         clas[key] = this.allClasss[key];
       }
-      console.log(clas);
       this.$set(this.form, "classs", clas);
     },
     formatTeacher(row) {
@@ -370,7 +374,6 @@ export default {
   watch: {
     watch: {
       courseTypeList() {
-        console.log("改变");
         this.setCourseTypeListByName();
       },
       detail() {

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 = {