1201 18:57

111

dist/static/css/chunk-6e90af62.6e52bece.css → dist/static/css/chunk-3a11e0dd.199ebe8f.css

@@ -1 +1 @@
-.m-core[data-v-9509ed0a]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-9509ed0a]{width:180px}.m-core h4[data-v-9509ed0a]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-9509ed0a],.m-core .right[data-v-9509ed0a],.m-core .vipLeft[data-v-9509ed0a]{width:400px}.planList[data-v-9509ed0a]{padding:0 25px}.planList .planTop[data-v-9509ed0a]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-9509ed0a]{font-size:14px}.planList .planCore .row[data-v-9509ed0a]{width:100%;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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-9509ed0a]{width:87px}.okBtn[data-v-9509ed0a]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-0c267af4]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-0c267af4]{width:180px}.m-core h4[data-v-0c267af4]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-0c267af4],.m-core .right[data-v-0c267af4],.m-core .vipLeft[data-v-0c267af4]{width:400px}.planList[data-v-0c267af4]{padding:0 25px}.planList .planTop[data-v-0c267af4]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-0c267af4]{font-size:14px}.planList .planCore .row[data-v-0c267af4]{width:100%;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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-0c267af4]{width:87px}.okBtn[data-v-0c267af4]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

src/views/buildVip/index.vue

@@ -747,20 +747,24 @@ export default {
       } else if (giveClassType == 'OFFLINE') {
         offline += giveNum;
       }
-      console.log(`线上课数${online}-线下课数${offline}-赠课数${giveNum}`)
+
       // 这里判断是否选择了排课开始时间
       if (online && !this.maskForm.courseStartOnline) {
-        // console.log(this.maskForm.courseStartOnline)
-        alert('选择了线上课 但没有线上课开始时间')
+        this.$message.error('选择了线上课 但没有线上课开始时间')
         return
       }
+
       if (offline && !this.maskForm.courseStartOffline) {
-        alert('选择了线下课 但没有线下课开始时间')
+        this.$message.error('选择了线下课 但没有线下课开始时间')
         return
       }
-
-      let date = new Date(this.maskForm.courseStartOnline.getTime());
-      let date1 = new Date(this.maskForm.courseStartOffline.getTime());
+      let date, date1;
+      if (this.maskForm.courseStartOnline) {
+        date = new Date(this.maskForm.courseStartOnline.getTime());
+      }
+      if (this.maskForm.courseStartOffline) {
+        date1 = new Date(this.maskForm.courseStartOffline.getTime());
+      }
       // let startWeekday = this.maskForm.courseStart.getDay();
       let onlineList = []; // 装线上课的数组
       let offlineList = []; //装线下课的数组

src/views/resetTeaming/components/resetSound.vue

@@ -225,7 +225,7 @@ export default {
                 // 拿辅件
                 if (res.data.musicGroupSubjectGoodsGroups[j].type == 'ACCESSORIES') {
                   if (res.data.musicGroupSubjectGoodsGroups[j].goodsList.length >= 0) {
-                    this.activeSoundList[i].markList = [];
+                    this.activeSoundList[i].markList ? this.activeSoundList[i].markList : this.activeSoundList[i].markList = []
                     let obj = {};
                     obj.goods = res.data.musicGroupSubjectGoodsGroups[j].goodsIdList.split(',');
                     obj.goods = obj.goods.map(item => {
@@ -236,6 +236,7 @@ export default {
                     this.activeSoundList[i].markList.push(obj);
                     // this.activeSoundList[i].markList.goodsList.goods = JSON.parse(res.data.musicGroupSubjectGoodsGroups[j].goodsIdList)
                     this.activeSoundList[i].markChioseList = this.activeSoundList[i].markChioseList.concat(res.data.musicGroupSubjectGoodsGroups[j].goodsList);
+                    console.log(this.activeSoundList[i].markList)
                   }
 
                 }
@@ -249,6 +250,9 @@ export default {
     addMark (row) {
       row.markList.push({ 'name': '', 'goods': [], 'price': '' })
     },
+    removeMartItem (row, index) {
+      row.markList.splice(index, 1);
+    },
     saveInfo () {
       // 只提交第二页的数据
       let obj = {};

src/views/teamBuild/components/teamSoundMoney.vue

@@ -256,17 +256,21 @@
     <div class="btnWrap">
       <div class="PrevBtn"
            @click="goback">上一步</div>
-      <div class="submitBtn" v-permission="{child: 'musicGroup/auditSuccess', parent: '/teamBuild/teamAudit/soundMoney'}"
+      <div class="submitBtn"
+           v-permission="{child: 'musicGroup/auditSuccess', parent: '/teamBuild/teamAudit/soundMoney'}"
            v-if="teamStatus == 'teamAudit'"
            @click="approval">审核通过</div>
 
-      <div class="submitBtn" v-permission="{child: 'musicGroup/auditFailed', parent: '/teamBuild/teamAudit/soundMoney'}"
+      <div class="submitBtn"
+           v-permission="{child: 'musicGroup/auditFailed', parent: '/teamBuild/teamAudit/soundMoney'}"
            v-if="teamStatus == 'teamAudit'"
            @click="refuse">拒绝</div>
-      <div class="submitBtn" v-permission="{child: 'musicGroup/createGroup', parent: '/teamBuild/soundMoney'}"
+      <div class="submitBtn"
+           v-permission="{child: 'musicGroup/createGroup', parent: '/teamBuild/soundMoney'}"
            v-if="teamStatus != 'teamAudit'"
            @click="submitInfo(1)">保存</div>
-      <div class="submitBtn" v-permission="{child: 'musicGroup/createGroup', parent: '/teamBuild/soundMoney'}"
+      <div class="submitBtn"
+           v-permission="{child: 'musicGroup/createGroup', parent: '/teamBuild/soundMoney'}"
            v-if="teamStatus != 'teamAudit'"
            @click="submitInfo(2)">提交</div>
     </div>
@@ -716,7 +720,7 @@ export default {
                     // 拿辅件
                     if (res.data.musicGroupSubjectGoodsGroups[j].type == 'ACCESSORIES') {
                       if (res.data.musicGroupSubjectGoodsGroups[j].goodsList.length >= 0) {
-                        this.activeSoundList[i].markList = [];
+                        this.activeSoundList[i].markList ? this.activeSoundList[i].markList : this.activeSoundList[i].markList = []
                         let obj = {};
                         obj.goods = res.data.musicGroupSubjectGoodsGroups[j].goodsIdList.split(',');
                         obj.goods = obj.goods.map(item => {

vue.config.js

@@ -18,9 +18,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // 
 // let target = 'http://testadm.dayaedu.com/' //勇哥迁库
 // let target = 'http://192.168.3.27:8000' // 箭河
-// let target = 'http://192.168.3.28:8000' //邹璇
+let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
-let target = 'http://47.99.212.176:8000' // 测试服
+// let target = 'http://47.99.212.176:8000' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {