Merge branch '04/16vipactiveRange' into dev

src/layout/components/AppMain.vue

@@ -62,7 +62,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {
-    padding-right: 15px;
+    // padding-right: 15px;
   }
 }
 </style>

src/views/buildVip/index.vue

@@ -1162,10 +1162,11 @@ export default {
           id: Date.now(),
         });
       }
-      // console.log(this.lookList)
+      console.log(this.lookList)
       // let courseType = this.maskForm.type;
       // // let week = ;this.maskForm.week
       // let startTime = this.maskForm.startTime;
+      //  根据时间排序
       this.maskForm.type = "";
       this.maskForm.week = "";
       this.maskForm.startTime = "";
@@ -1350,6 +1351,12 @@ export default {
         }
       }
       // console.log(this.timeTable);
+
+      this.timeTable.sort((a,b)=>{
+        let aStr = dayjs(dayjs(a.classDate).format('YYYY-MM-DD')+' '+a.startClassTimeStr+':00').valueOf()
+        let bStr =  dayjs(dayjs(b.classDate).format('YYYY-MM-DD')+' '+b.startClassTimeStr+':00').valueOf()
+         return aStr-bStr
+      })
       this.dialogFormVisible = false;
     },
     getThinkDate(date, num) {

src/views/teamBuild/signupList.vue

@@ -1041,7 +1041,7 @@ export default {
       let id = this.id;
       this.codeStatus = true;
       if (type == "payment") {
-        this.codeTitle = "学员报名连接";
+        this.codeTitle = "学员报名链接";
         this.qrCodeUrl = vaildStudentUrl() + "/#/login?musicGroupId=" + id;
       } else if (type == "detail") {
         let teamName = this.$route.query.name;

src/views/teamDetail/teamCourseList.vue

@@ -234,7 +234,7 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            width="150px"
+            width="170px"
             prop="musicGroupId"
             label="乐团/课程组编号"
           >

vue.config.js

@@ -66,9 +66,9 @@ module.exports = {
       // let target = 'http://dev.dayaedu.com'
       // 'http://dev.dayaedu.com'
       '/api-auth': {
-        target: target,
-        // target: 'http://47.114.176.40:8000',
-        // target : 'https://test.dayaedu.com',
+        target: 'http://dev.dayaedu.com',
+        // target: 'https://test.dayaedu.com',
+        target : target,
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''