1202 13:40

111

src/views/categroyManager/vipActiveList.vue

@@ -1,6 +1,7 @@
 <template >
   <div class="m-container">
-    <h2><div class="squrt"></div>vip活动方案 
+    <h2>
+      <div class="squrt"></div>vip活动方案
     </h2>
 
     <div class="m-core">
@@ -74,7 +75,7 @@
                            :formatter="fommatterEnable">
           </el-table-column>
           <el-table-column align='center'
-                           width="180px"
+                           width="130px"
                            label="活动持续时间">
             <template slot-scope="scope">
               <div>
@@ -84,7 +85,7 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                           width="180px"
+                           width="130px"
                            label="课程安排时间">
             <template slot-scope="scope">
               <div>
@@ -129,6 +130,7 @@
       </div>
     </div>
     <el-dialog title='提示'
+               width="60%"
                :visible.sync="dialogVisible">
       <div>
         <el-form :label-position="labelPosition"
@@ -238,7 +240,7 @@
         </div>
         <div class="activeType">
           <div class="left">
-            <p>活动类型</p>
+            <p style='width:60px;'>活动类型</p>
           </div>
           <div class="right">
             <div>
@@ -501,16 +503,24 @@ export default {
     },
     // 点击列表修改同步状态
     reset (row) {
+      console.log(row);
       this.activeId = row.id;
       this.dialogVisible = true;
       this.resetForm.name = row.name;
       this.resetForm.desc = row.description;
-      this.resetForm.stauts = row.vipGroupCategoryIdList.split(',').map(res => {
-        return parseInt(res);
-      });
+      if (row.vipGroupCategoryIdList) {
+        this.resetForm.stauts = row.vipGroupCategoryIdList.split(',').map(res => {
+          return parseInt(res);
+        });
+      }
+
       // 同步活动时间
-      this.resetForm.activeTime = [row.startTime, row.endTime];
-      this.resetForm.courseTime = [row.coursesStartTime, row.coursesEndTime];
+      if (row.startTime && row.endTime) {
+        this.resetForm.activeTime = [row.startTime, row.endTime];
+      }
+      if (row.coursesStartTime && row.coursesEndTime) {
+        this.resetForm.courseTime = [row.coursesStartTime, row.coursesEndTime];
+      }
       // 同步适用范围
       let obj = JSON.parse(row.salarySettlementJson);
       // 同步线上课状态
@@ -553,7 +563,9 @@ export default {
           let endTime = this.resetForm.activeTime[1];
           let organId = this.resetForm.organ.join(',');
           let type = this.activeType;
-          let vipGroupCategoryIdList = this.resetForm.stauts.join(',')
+          if (vipGroupCategoryIdList) {
+            let vipGroupCategoryIdList = this.resetForm.stauts.join(',')
+          }
           let onlineSalarySettlement;
           let offlineSalarySettlement;
           if (this.online) {
@@ -703,10 +715,12 @@ export default {
     }
   }
 }
-.el-select {
-  width: 400px !important;
-  .el-input__inner {
-    width: 400px;
+.vipform {
+  .el-select {
+    width: 400px !important;
+    .el-input__inner {
+      width: 400px;
+    }
   }
 }
 </style>

src/views/teamDetail/components/resetClass.vue

@@ -107,7 +107,7 @@
         </el-table>
         <div class="floor">
           <div class="add"
-               @click="temporary">临时调整</div>
+               @click="temporary">新建临时班</div>
           <div class='add'
                @click="addNewClass('NORMAL')">新建单技班</div>
           <div class='add'

vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000 
 // 
 // let target = 'http://testadm.dayaedu.com/' //勇哥迁库
-// let target = 'http://192.168.3.27:8000' // 箭河
+let target = 'http://192.168.3.27: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 = {