提交dev

1

dist/static/css/chunk-22a6ff98.e3654ad7.css → dist/static/css/chunk-167ec06e.3c15dce7.css

@@ -1 +1 @@
-.btnList[data-v-005e3ff4]{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}.code-url[data-v-005e3ff4]{margin-top:10px}
+.btnList[data-v-6a03bb8f]{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}.code-url[data-v-6a03bb8f]{margin-top:10px}

dist/static/css/chunk-91193b0c.5fb18d04.css

@@ -0,0 +1 @@
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-3d34d1da]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-3d34d1da],[data-v-3d34d1da] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-3d34d1da] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-3d34d1da] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d34d1da] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-3d34d1da] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-3d34d1da] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-734e893a]{line-height:44px}.fixedBox[data-v-734e893a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-734e893a]{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}.fixedBox .boxWrap i[data-v-734e893a]{font-size:18px;cursor:pointer}[data-v-734e893a] .el-divider--horizontal{margin:0!important}.topWrap[data-v-734e893a]{margin:10px 0;padding:0 20px 0 0}.minus[data-v-734e893a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

src/components/filter-search/index.vue

@@ -84,7 +84,6 @@ export default {
   },
   mounted() {
     this.initSearch = this.$route.query
-    // console.log(this.activeItems)
   },
   watch: {
     $route() {

src/views/main/teamSchedule/compontent/taskInfo.vue

@@ -90,13 +90,14 @@ export default {
         endTimer:'',
         startTimer: '',
         musicGroupId: "",
+        userId:''
       },
       timerStr:''
     };
   },
   mounted() {
     this.checkTimes()
-
+        this.userId = this.$route.query.teacher;
     if (this.taskInfo) {
       this.taskForm.date = this.taskInfo.planStart;
       this.taskForm.startTimer = dayjs(this.taskInfo.planStart).format('HH:mm:ss')
@@ -151,6 +152,7 @@ export default {
                 planEnd,
                 itemId: this.itemId,
                 id: this.taskInfo.id,
+                userId:this.userId
               });
                 this.$message.success("提交成功");
               this.$emit("refreshList", this.taskForm.date);
@@ -166,6 +168,7 @@ export default {
                 planStart,
                 planEnd,
                 itemId: this.itemId,
+                userId:this.userId
               });
               this.$message.success("提交成功");
               this.$emit("refreshList", this.taskForm.date);

src/views/main/teamSchedule/compontent/taskList.vue

@@ -82,6 +82,7 @@ export default {
     this.rangeStart = this.$route.query.startTime;
     this.rangeEnd = this.$route.query.endTime;
     this.userId = this.$route.query.teacher;
+     this.itemId = this.$route.query.itemId;
     this.getList();
   },
   methods: {
@@ -93,6 +94,7 @@ export default {
           userId: this.userId,
           page: this.rules.page,
           rows: this.rules.limit,
+          itemId:this.itemId
         });
         this.tableList = result.data.rows;
         this.rules.total = result.data.total;

src/views/main/teamSchedule/scheduleDetail.vue

@@ -124,11 +124,10 @@ export default {
     };
   },
   async mounted() {
-    console.log('加载页面')
     this.init();
     // 获取乐团
     try {
-      const ruselt = await getMusicGroup({ organId: this.organId });
+      const ruselt = await getMusicGroup({ organId: this.organId,userId:this.userId });
       this.MusicGroupList = ruselt.data;
     } catch (e) {}
   },
@@ -164,6 +163,7 @@ export default {
           startTime: this.startTime,
           endTime: this.endTime,
           userId: this.userId,
+          itemId: this.itemId,
           page: 1,
           rows: 9999,
         });
@@ -230,7 +230,6 @@ export default {
     },
 
     drop(e) {
-      console.log(e)
       this.isNew = true;
       this.activeTask = null;
       this.taskStatus = true;
@@ -239,7 +238,6 @@ export default {
       event.preventDefault();
     },
     dragstart(e){
-      console.log(e)
     },
     submitInfo(val) {
       // 新增修改提交

src/views/operateManager/serverIndexList.vue

@@ -56,7 +56,7 @@
 
         <el-form-item>
           <el-button
-            type="primary"
+             :type="isSearch ? 'primary' : 'info'"
             icon="el-icon-circle-plus-outline"
             @click="showMove = true"
             >更多选项</el-button
@@ -762,6 +762,18 @@ export default {
       }
     },
   },
+  computed:{
+    isSearch(){
+      return  this.searchForm.organIdList ||
+        this.searchForm.actualExercisesNumIsAchieve ||
+        this.searchForm.exercisesReplyNumIsAchieve ||
+        this.searchForm.exercisesMessageNumIsAchieve ||
+        this.searchForm.exercisesMessageTimelyNumIsAchieve ||
+        this.searchForm.existVipCourse||
+        this.searchForm.existPracticeCourse||
+        this.searchForm.workTimer?.length>0
+    }
+  }
 };
 </script>
 <style lang='scss' scoped>

src/views/reaplceMusicPlayer/index.vue

@@ -124,7 +124,7 @@
               <div>{{ scope.row.openPay ? "是" : "否" }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="studentId" label="操作">
+          <el-table-column align="center" width="180px" label="操作">
             <template slot-scope="scope">
               <div>
                 <el-button type="text" @click="lookDetail(scope.row)" v-if="permission('replacementInstrumentActivity/queryPage')"
@@ -149,6 +149,10 @@
                   "
                   >开启缴费</el-button
                 >
+                <el-button
+                  type="text"
+                  @click="onCreateQRCode(scope.row, '缴费连接')"
+                  v-if="scope.row.openPay">缴费连接</el-button>
               </div>
             </template>
           </el-table-column>
@@ -347,6 +351,8 @@ export default {
           str =
             vaildTeachingUrl() +
             `/#/questionStatistics?o=${row.organId}&c=${row.cooperationOrganId}`;
+        } else if(name == '缴费连接') {
+          str = vaildStudentUrl() + `/#/questionGoodsSale?` + encodeURIComponent(encode(`cid=${row.cooperationOrganId}`));
         }
         // vaildTeachingUrl
         // this.qrcode.makeCode(

src/views/resetTeaming/modals/subject-preview.vue

@@ -594,9 +594,9 @@ export default {
                     tempCourse.forEach(item => {
                         m += parseFloat(item.courseCurrentPrice)
                         // 不可选的课程才会减免课程费用
-                        if (!item.isStudentOptional) {
-                            tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
-                        }
+                        // if (!item.isStudentOptional) {
+                        //     tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
+                        // }
                     });
                     marketPrice += parseFloat(m)
                     buyList.unshift({

src/views/studentManager/components/studentVip.vue

@@ -110,12 +110,11 @@
       />
 
       <el-dialog :title="dialogTitle" :visible.sync="dialogTableVisible">
-        <el-table :data="gridData">
+        <el-table :data="gridData" :header-cell-style="{ background: '#EDEEF0', color: '#444' }">
           <el-table-column
             prop="courseDate"
             label="时间"
             align="center"
-            width="150"
           >
             <template slot-scope="scope">{{
               scope.row.courseDate | dateForMinFormat
@@ -125,7 +124,6 @@
             prop="classGroupName"
             label="课程名称"
             align="center"
-            width="200"
           ></el-table-column>
           <el-table-column label="课程类型" align="center">
             <template slot-scope="scope">{{

src/views/studentManager/components/teamAndcourse.vue

@@ -258,7 +258,6 @@ export default {
       let params = this.searchForm;
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
-      console.log(params)
       findStudentAttendance(params).then(res => {
         if (res.code == 200) {
           this.coursesInfo = res.data.rows;

src/views/teamBuild/signupList.vue

@@ -3,13 +3,20 @@
     <div class="topWrap">
       <div>
         <div style="display: flex; justify-content: space-between">
-          <div style="display:flex;margin-bottom: 15px; font-size: 18px; font-weight: 400">
-            <p style="margin-right:10px" v-if="applyExpireDate">
+          <div
+            style="
+              display: flex;
+              margin-bottom: 15px;
+              font-size: 18px;
+              font-weight: 400;
+            "
+          >
+            <p style="margin-right: 10px" v-if="applyExpireDate">
               报名截止时间:{{ applyExpireDate | formatTimer }}
             </p>
-            <p v-if="paymentExpireDate">缴费截止时间:{{
-                paymentExpireDate | formatTimer
-              }}</p>
+            <p v-if="paymentExpireDate">
+              缴费截止时间:{{ paymentExpireDate | formatTimer }}
+            </p>
           </div>
         </div>
 
@@ -57,12 +64,19 @@
           >
             延长报名
           </div>
-          <div class="newBand" @click="onCreateQRCode('payment')"   v-show="
+          <div
+            class="newBand"
+            @click="onCreateQRCode('payment')"
+            v-show="
               (status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')&&ischeckCanReg
-            ">报名链接</div>
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
+            "
+          >
+            报名链接
+          </div>
           <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
           <div
             class="newBand"
@@ -86,11 +100,12 @@
             class="newBand"
             v-permission="'musicGroup/addMusicGroupRegs'"
             @click="mergeVisible = true"
-             v-show="
+            v-show="
               (status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')&&ischeckCanReg
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
             "
           >
             合并学员
@@ -99,11 +114,12 @@
             class="newBand"
             style="background-color: #f97215; border: 1px solid #f97215"
             @click="onCreateQRCode('rePayment')"
-             v-show="
+            v-show="
               (status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')&&ischeckCanReg
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
             "
           >
             报名链接（无乐器）
@@ -192,6 +208,29 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchFrom.paymentStatus"
+            clearable
+            filterable
+            placeholder="报名缴费"
+          >
+            <el-option label="未开启缴费" value="0"></el-option>
+            <el-option label="开启缴费" value="1"></el-option>
+            <el-option label="已缴费" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchFrom.visited"
+            clearable
+            filterable
+            placeholder="是否回访"
+          >
+            <el-option label="否" value="false"></el-option>
+            <el-option label="是" value="true"></el-option>
+          </el-select>
+        </el-form-item>
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
         <el-form-item>
           <el-button type="danger" native-type="search">搜索</el-button>
@@ -234,12 +273,17 @@
           v-permission="'musicGroup/updateExpectedStudentNum'"
           style="margin-right: 20px; margin-top: 20px"
         >
-          <el-button v-show="!isEdit&&(
-              status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')
-            " @click="isEdit = true">编辑</el-button>
+          <el-button
+            v-show="
+              !isEdit &&
+              (status == 'PAY' ||
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE')
+            "
+            @click="isEdit = true"
+            >编辑</el-button
+          >
           <el-button v-show="isEdit" @click="saveIsEdit">保存</el-button>
         </div>
       </div>
@@ -298,6 +342,15 @@
           </el-table-column>
           <el-table-column label="联系电话" prop="parentsPhone" align="center">
           </el-table-column>
+
+          <el-table-column label="是否回访" prop="paymentStatus" align="center">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.visitNum ? "是" : "否" }}
+              </div>
+            </template>
+          </el-table-column>
+          <!-- visited -->
           <!-- v-show='status == "PAY"' -->
           <el-table-column
             label="报名缴费状态"
@@ -311,23 +364,24 @@
               </div>
             </template>
           </el-table-column>
+
           <el-table-column
             label="操作"
             fixed="right"
             width="240"
             align="center"
-             v-if="
+            v-if="
               status == 'PAY' ||
               status == 'APPLY' ||
               status == 'PROGRESS' ||
               status == 'PREPARE'
             "
           >
-          <!--  v-show="
+            <!--  v-show="
               status == 'PAY' || status == 'PROGRESS' || status == 'PREPARE' || status=='APPLY'
             " -->
             <template slot-scope="scope">
-              <div  >
+              <div>
                 <auth :auths="'studentRegistration/batchUpdateSubject'">
                   <el-button
                     type="text"
@@ -374,7 +428,7 @@
                     >退团</el-button
                   >
                 </auth>
-                <auth :auths="'visit/add/teamSignupList'">
+                <auth :auths="'visit/add/teamSignupList'" v-if=" scope.row.visitNum<=0">
                   <el-button type="text" @click="addVisit(scope.row)"
                     >新增回访</el-button
                   >
@@ -703,7 +757,7 @@ import {
   studentApplyDetailExport,
   StudentQuit,
   getMusicGroupGradeList,
-  checkCanReg
+  checkCanReg,
 } from "@/api/buildTeam";
 import mergeMusic from "./components/merge-music";
 import forecastList from "./components/forecast-list";
@@ -748,6 +802,8 @@ export default {
         subject: "", // 专业
         isAllowAdjust: "", // 是否允许调剂
         currentGrade: null, // 入学年级
+        paymentStatus: "",
+        visited: "",
       },
       quitForm: {
         // 退团信息确认
@@ -856,7 +912,7 @@ export default {
       applyDates: this.applyDate(),
       detail: null,
       gradeList: [],
-      ischeckCanReg:false
+      ischeckCanReg: false,
     };
   },
   created() {},
@@ -871,7 +927,7 @@ export default {
     permission(str) {
       return permission(str);
     },
-   async init() {
+    async init() {
       this.status = this.$route.query.team_status;
       // 通过乐团id 获取乐团招生状态
       this.id = this.$route.query.id;
@@ -879,14 +935,15 @@ export default {
       // 判断是否带缓存参数
       this.pickerOptions = this.beginDate(new Date());
       // checkCanReg
-      try{
-       this.ischeckCanReg = await (await checkCanReg({musicGroupId:this.id})).data
-       console.log(this.ischeckCanReg)
-      }catch(e){
-        console.log(e)
+      try {
+        this.ischeckCanReg = await (
+          await checkCanReg({ musicGroupId: this.id })
+        ).data;
+        console.log(this.ischeckCanReg);
+      } catch (e) {
+        console.log(e);
       }
 
-
       getMusicGroupGradeList({ musicGroupId: this.id }).then((res) => {
         let result = res.data;
         if (res.code == 200 && result) {
@@ -928,6 +985,8 @@ export default {
         subject: null, // 专业
         isAllowAdjust: null, // 是否允许调剂
         currentGrade: null,
+        paymentStatus: null,
+        visited: null,
       };
       this.getList();
     },
@@ -951,6 +1010,8 @@ export default {
         isAllowAdjust: this.searchFrom.isAllowAdjust || null,
         name: this.searchFrom.name || null,
         currentGrade: this.searchFrom.currentGrade || null,
+        paymentStatus: this.searchFrom.paymentStatus || null,
+        visited: this.searchFrom.visited || null,
         page: this.rules.page,
         rows: this.rules.limit,
       };
@@ -1215,9 +1276,9 @@ export default {
     },
     // 修改专业
     resetSubject(row) {
-      console.log(row)
+      console.log(row);
       this.activeId = row.studentId;
-      this.maskForm.subject = row.actualSubjectId
+      this.maskForm.subject = row.actualSubjectId;
       this.subjectVisible = true;
       //   resetStudentSubject().then(res=>{]})
     },
@@ -1424,10 +1485,9 @@ export default {
       this.getList().then((res) => {
         for (const item of res.data.rows) {
           if (item.id === row.id) {
-            this.rowDetail = { ...item,userId:item.studentId };
+            this.rowDetail = { ...item, userId: item.studentId };
             // console.log(this.rowDetail)
             this.changeVoiceVisible = true;
-
           }
         }
       });
@@ -1480,7 +1540,7 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-         return time.getTime()+ 86400000 < new Date().getTime();
+          return time.getTime() + 86400000 < new Date().getTime();
         },
       };
     },
@@ -1489,7 +1549,7 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-          return time.getTime()+ 86400000 < new Date().getTime();
+          return time.getTime() + 86400000 < new Date().getTime();
         },
       };
     },

src/views/teamDetail/componentCourse/teacherList.vue

@@ -332,6 +332,7 @@ export default {
             if (res.code == 200) {
               this.$message.success("补卡成功");
               this.getList();
+              this.$emit('syncTeacherAttend')
             } else {
               this.$message.error(res.msg);
             }

src/views/teamDetail/teamCourseList.vue

@@ -195,25 +195,24 @@
         </el-form-item> -->
 
         <el-form-item>
-             <el-button
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="showMove = true"
-          >更多选项</el-button
-        >
+          <el-button
+            :type="isSearch ? 'primary' : 'info'"
+            icon="el-icon-circle-plus-outline"
+            @click="showMove = true"
+            >更多选项</el-button
+          >
         </el-form-item>
         <el-form-item>
-               <el-button native-type="submit" type="primary">搜索</el-button>
-        <el-button native-type="reset" type="danger">重置</el-button>
+          <el-button native-type="submit" type="primary">搜索</el-button>
+          <el-button native-type="reset" type="danger">重置</el-button>
 
-        <el-button
-          v-permission="'export/superFindCourseSchedules'"
-          @click="onCourseExport"
-          type="primary"
-          >导出课表</el-button
-        >
+          <el-button
+            v-permission="'export/superFindCourseSchedules'"
+            @click="onCourseExport"
+            type="primary"
+            >导出课表</el-button
+          >
         </el-form-item>
-
       </save-form>
       <!-- 列表 -->
       <div class="tableWrap">
@@ -588,6 +587,7 @@
               :courseScheduleId="maskForm.id"
               :teachMode="maskForm.teachMode"
               :courseStatus="maskForm.status"
+              @syncTeacherAttend="syncTeacherAttend"
             ></teacherList>
           </div>
         </el-tab-pane>
@@ -656,7 +656,7 @@
       >
         <el-form-item label="课程组编号/名称" prop="search">
           <el-input
-          style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.search"
             clearable
             placeholder="课程组编号/课程名称"
@@ -664,7 +664,7 @@
         </el-form-item>
         <el-form-item label="教学点" prop="schoolId">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.schoolId"
             clearable
             filterable
@@ -680,7 +680,7 @@
         </el-form-item>
         <el-form-item label="分部" prop="organIdList">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             class="multiple"
             v-model.trim="searchForm.organIdList"
             filterable
@@ -697,7 +697,7 @@
         </el-form-item>
         <el-form-item label="课程组类型" prop="groupType">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.groupType"
             clearable
             filterable
@@ -713,7 +713,7 @@
         </el-form-item>
         <el-form-item label="教学模式" prop="teachMode">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.teachMode"
             clearable
             filterable
@@ -738,7 +738,7 @@
         </el-form-item> -->
         <el-form-item label="合并课类型" prop="mergeCourseType">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.mergeCourseType"
             clearable
             filterable
@@ -754,7 +754,7 @@
         </el-form-item>
         <el-form-item label="老师类型" prop="teachType">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.teachType"
             clearable
             filterable
@@ -770,7 +770,7 @@
         </el-form-item>
         <el-form-item label="是否点名" prop="isCallNames">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.isCallNames"
             clearable
             filterable
@@ -919,6 +919,19 @@ export default {
     mergeCourseTypeOptions() {
       return objectToOptions(mergeCourseType);
     },
+    isSearch() {
+      return (
+        this.searchForm.search ||
+        this.searchForm.schoolId ||
+        this.searchForm.organIdList ||
+        this.searchForm.groupType ||
+        this.searchForm.teachMode ||
+        this.searchForm.mergeCourseType||
+        this.searchForm.teachType||
+        this.searchForm.isCallNames||
+        this.searchForm.creatTimer?.length>0
+      );
+    },
   },
   mounted() {
     const { query } = this.$route;
@@ -1172,6 +1185,19 @@ export default {
         }
       );
     },
+    syncTeacherAttend() {
+      if (this.maskForm.id) {
+        getTeacherPersonalAttendanceDetail({
+          courseScheduleId: this.maskForm.id,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.maskForm = { ...this.maskForm, ...res.data };
+            this.isMainGo = this.$refs.filterSearch?.show;
+          }
+        });
+      }
+    },
+
     handleClick(tab, event) {
       // console.log(tab, event);
     },
@@ -1201,13 +1227,13 @@ export default {
         })
         .catch(() => {});
     },
-    cancleMore(){
+    cancleMore() {
       // this.$refs.searchForm2.resetFields()
-      this.showMove = false
+      this.showMove = false;
     },
-    okMore(){
-      this.getList()
-      this.showMove = false
+    okMore() {
+      this.getList();
+      this.showMove = false;
     },
     // addCompound(row) {
     //   this.compoundList.push(row);

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38: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 = {
@@ -55,7 +55,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
@@ -63,10 +63,9 @@ module.exports = {
       // http://192.168.3.28:8000
       // http://192.168.3.134
       // http://47.114.176.40:8000
-      // let target = 'http://dev.dayaedu.com'
+      let target = 'http://dev.dayaedu.com'
       // 'http://dev.dayaedu.com'
       '/api-auth': {
-        target: 'http://dev.dayaedu.com',
         // target: 'https://test.dayaedu.com',
         target : target,
         changeOrigin: true,