mo %!s(int64=4) %!d(string=hai) anos
pai
achega
b9f5bfc785

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/index.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/static/css/chunk-3d958dd6.0488a7be.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/chunk-5154db7c.129ca6c5.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/chunk-619a8e6a.7577ab28.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/chunk-6ef06c44.a7c01c8e.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/chunk-767d9c38.5828b4b3.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/static/css/chunk-c5936436.79bf498f.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/chunk-ef5e86cc.8be077f0.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.f4f36f6d.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-3d958dd6.08ccddbf.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-5f9d8f73.114e1fb0.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-767d9c38.267bc009.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-787a507d.4caeab99.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-c5936436.8f6982c2.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-e15537fe.9501dfd1.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-e3c60ff0.b2d33e84.js


+ 5 - 5
src/api/vipSeting.js

@@ -220,7 +220,7 @@ export function getVipGroupCostCount (data) {
   return request({
     url: api + '/vipGroupManage/getVipGroupCostCount',
     method: 'POST',
-    params: data
+    data: data
   })
 }
 
@@ -310,8 +310,8 @@ export function getHaveCourseBalanceStudents (data) {
 export function addVipGroupStudents (data) {
   return request({
     url: api + '/vipGroupManage/addVipGroupStudents',
-    method: 'get',
-    params: data
+    method: 'post',
+    data
   })
 }
 // /courseSchedule/batchAppendVipGroupCourses
@@ -324,7 +324,7 @@ export function batchAppendVipGroupCourses (data) {
   })
 }
 
-// vip休学 
+// vip休学
 export function vipPauseForStudent (data) {
   return request({
     url: api + '/vipGroupManage/pauseForStudent',
@@ -384,4 +384,4 @@ export function vipGroupManageUpdate (data) {
     method: 'post',
     data: qs.stringify(data)
   })
-}
+}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 550 - 376
src/views/buildVip/index.vue


+ 40 - 5
src/views/categroyManager/generalSettings/vipCourseType.vue

@@ -12,10 +12,18 @@
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
       <el-table-column label="课程形式" prop="name"> </el-table-column>
+      <el-table-column label="课程类型" prop="singleClassMinutes">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.musicTheory ? "乐理课" : "VIP课" }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="班级人数(人)" prop="studentNum">
       </el-table-column>
       <el-table-column label="课程课时(分钟)" prop="singleClassMinutes">
       </el-table-column>
+
       <el-table-column label="操作">
         <template slot-scope="scope">
           <div>
@@ -75,10 +83,29 @@
           ></el-input>
         </el-form-item>
         <el-form-item
+          label="课程类型"
+          :rules="[
+            { required: true, message: '请输入课程形式', trigger: 'blur' },
+          ]"
+          :label-width="formLabelWidth"
+          prop="musicTheory"
+        >
+        <el-select v-model="vipStatusFrom.musicTheory" style="width:100%!important">
+          <el-option label="VIP" :value="false"></el-option>
+          <el-option label="乐理课" :value="true"></el-option>
+        </el-select>
+        </el-form-item>
+        <el-form-item
           label="班级人数"
           prop="num"
           :rules="[
             { required: true, message: '请输入班级人数', trigger: 'blur' },
+            {
+              required: true,
+              message: '班级人数最大6人',
+              trigger: 'blur',
+              pattern: /^[0-6]$/,
+            }, //辜经理要求vip人数最大6人
           ]"
           :label-width="formLabelWidth"
         >
@@ -147,20 +174,25 @@
   </div>
 </template>
 <script>
-import { removeVipGroupCategory, vipGroupCategory, addVipGroupCategory,
-  resetVipGroupCategory, } from "@/api/vipSeting";
+import {
+  removeVipGroupCategory,
+  vipGroupCategory,
+  addVipGroupCategory,
+  resetVipGroupCategory,
+} from "@/api/vipSeting";
 export default {
   data() {
     return {
       leftList: [],
       vipStatus: false, // 课程形态弹窗状态
       formLabelWidth: "120px",
-      inputValue:'',
+      inputValue: "",
       vipStatusFrom: {
         name: "",
         num: "",
         dynamicTags: [],
         isAdd: true,
+        musicTheory:false,
         id: "",
       }, // 弹窗内容
       inputVisible: false,
@@ -181,6 +213,7 @@ export default {
         vipStatusFrom.num = row.studentNum;
         vipStatusFrom.id = row.id;
         vipStatusFrom.isAdd = false;
+        vipStatusFrom.musicTheory = row.musicTheory
       });
     },
     async removeGroupCategory(scope) {
@@ -188,7 +221,7 @@ export default {
         id: scope.row.id,
       }).then((res) => {
         if (res.code == 200) {
-            scope._self.$refs[scope.row.id].doClose()
+          scope._self.$refs[scope.row.id].doClose();
           this.$message.success("删除成功");
           this.getVipGroupCategoryList();
         }
@@ -230,6 +263,7 @@ export default {
               name: vipStatusFrom.name,
               singleClassMinutes: vipStatusFrom.dynamicTags.join(","),
               studentNum: vipStatusFrom.num,
+              musicTheory:vipStatusFrom.musicTheory
             }).then((res) => {
               if (res.code == 200) {
                 this.$message.success("添加成功");
@@ -243,6 +277,7 @@ export default {
               singleClassMinutes: vipStatusFrom.dynamicTags.join(","),
               studentNum: vipStatusFrom.num,
               id: vipStatusFrom.id,
+               musicTheory:vipStatusFrom.musicTheory
             }).then((res) => {
               this.$message.success("修改成功");
               this.getVipGroupCategoryList();
@@ -270,4 +305,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-</style>
+</style>

+ 1 - 2
src/views/categroyManager/vipActiveList.vue

@@ -13,11 +13,10 @@
         @click="gotoNewActive"
         >新建</el-button
       >
-      <!-- v-permission="'export/vipGroupActivity'" -->
       <el-button
         type="primary"
         style="margin-bottom: 20px"
-        
+        v-permission="'export/vipGroupActivity'"
         @click="onExport"
         >VIP活动导出</el-button
       >

+ 2 - 2
src/views/stuRecodeManager/index.vue

@@ -117,12 +117,12 @@
         <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
-          <el-button
+          <!-- <el-button
             @click="onExport"
             type="primary"
             v-permission="'export/queryTeacherAttendances'"
             style="background-color: #14928a; border: 1px solid #14928a"
-            >导出</el-button>
+            >导出</el-button> -->
         </el-form-item>
       </save-form>
       <div class="tableWrap">

+ 2 - 1
src/views/teamDetail/components/studentList.vue

@@ -224,7 +224,8 @@
         <el-table-column align="center" label="欠费金额(元)">
           <template slot-scope="scope">
             <div :class="[scope.row.noPaymentAmount > 0 ? 'error' : null]">{{ scope.row.noPaymentAmount | moneyFormat }}
-              <auth auths="musicGroupPaymentCalenderDetail/queryPage" :router="['/business/teamDetails']">
+              <!-- musicGroupPaymentCalenderDetail/queryPage/studentList -->
+              <auth auths="musicGroupPaymentCalenderDetail/queryPage/studentList" :router="['/business/teamDetails']">
                 <i style="color: #14928A; font-size: 17px;" title="缴费记录" class="el-icon-view" @click="onPaymentDetail(scope.row)"></i>
               </auth>
             </div>

+ 92 - 99
src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -1,86 +1,76 @@
 <template>
   <div class="vip-base">
     <div class="left">
-      <el-form label-position="right"
-               label-width="120px"
-               :model="topForm">
+      <el-form label-position="right" label-width="120px" :model="topForm">
         <el-form-item label="指导老师">
-          <el-input v-model.trim="topForm.teacherCount"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.teacherCount" disabled></el-input>
         </el-form-item>
         <el-form-item label="乐团主管">
-          <el-input v-model.trim="topForm.educationalTeacherName"
-                    disabled></el-input>
+          <el-input
+            v-model.trim="topForm.educationalTeacherName"
+            disabled
+          ></el-input>
         </el-form-item>
         <el-form-item label="科目名称">
-          <el-input v-model.trim="topForm.subject"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.subject" disabled></el-input>
         </el-form-item>
         <el-form-item label="活动方案">
-          <el-input v-model.trim="topForm.active"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.active" disabled></el-input>
         </el-form-item>
         <el-form-item label="课程形式">
-          <el-input v-model.trim="topForm.status"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.status" disabled></el-input>
         </el-form-item>
         <el-form-item label="每班人数">
-          <el-input v-model.trim="topForm.classNum"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.classNum" disabled></el-input>
         </el-form-item>
         <el-form-item label="每课时长">
-          <el-input v-model.trim="topForm.classTime"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.classTime" disabled></el-input>
         </el-form-item>
         <el-form-item label="教学点名称">
-          <el-input v-model.trim="topForm.address"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.address" disabled></el-input>
         </el-form-item>
         <el-form-item label="线上课数">
-          <el-input v-model.trim="topForm.onlineClass"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.onlineClass" disabled></el-input>
         </el-form-item>
         <el-form-item label="线下课数">
-          <el-input v-model.trim="topForm.offlineClass"
-                    disabled></el-input>
+          <el-input v-model.trim="topForm.offlineClass" disabled></el-input>
         </el-form-item>
         <el-form-item label="报名开始时间">
-          <div class="disBox">{{topForm.startTime | dateForMinFormat}}</div>
+          <div class="disBox">{{ topForm.startTime | dateForMinFormat }}</div>
           <!-- <el-input v-model.trim="topForm.startTime" disabled></el-input> -->
         </el-form-item>
         <el-form-item label="报名结束时间">
-          <div class="disBox">{{topForm.endTime | dateForMinFormat}}</div>
+          <div class="disBox">{{ topForm.endTime | dateForMinFormat }}</div>
           <!-- <el-input v-model.trim="topForm.endTime" disabled></el-input> -->
         </el-form-item>
       </el-form>
     </div>
     <div class="right">
-      <el-form label-position="right"
-               label-width="120px"
-               :model="rightForm">
+      <el-form label-position="right" label-width="120px" :model="rightForm">
         <el-form-item label="总课时数">
-          <el-input v-model.trim="rightForm.allClass"
-                    disabled></el-input>
+          <el-input v-model.trim="rightForm.allClass" disabled></el-input>
         </el-form-item>
         <el-form-item label="课程单价(线上)">
-          <el-input v-model.trim="rightForm.onlineClass"
-                    type="number"
-                    @mousewheel.native.prevent
-                    :disabled="!isreset"></el-input>
+          <el-input
+            v-model.trim="rightForm.onlineClass"
+            type="number"
+            @mousewheel.native.prevent
+            :disabled="!isreset"
+          ></el-input>
         </el-form-item>
         <el-form-item label="课程单价(线下)">
-          <el-input v-model.trim="rightForm.offlineClass"
-                    type="number"
-                    @mousewheel.native.prevent
-                    :disabled="!isreset"></el-input>
+          <el-input
+            v-model.trim="rightForm.offlineClass"
+            type="number"
+            @mousewheel.native.prevent
+            :disabled="!isreset"
+          ></el-input>
         </el-form-item>
         <el-form-item label="课程总价">
-          <el-input v-model.trim="rightForm.allPrice"
-                    disabled></el-input>
+          <el-input v-model.trim="rightForm.allPrice" disabled></el-input>
         </el-form-item>
         <el-form-item label="当前课程进度">
-          <el-input v-model.trim="rightForm.progress"
-                    disabled></el-input>
+          <el-input v-model.trim="rightForm.progress" disabled></el-input>
         </el-form-item>
       </el-form>
       <!-- <el-button v-if="!isreset"
@@ -101,10 +91,11 @@ import {
   getVipGroupDetail,
   findVipGroupStudents,
   leaveSchool,
-  updateVipBaseInfo
+  updateVipBaseInfo,
 } from "@/api/vipSeting";
 export default {
-  data () {
+  props: ["vipDetail"],
+  data() {
     return {
       topForm: {
         teacherCount: "",
@@ -117,38 +108,37 @@ export default {
         onlineClass: "", //线上课数
         offlineClass: "", //线下课数
         startTime: "", // 报名开始时间
-        endTime: ""
+        endTime: "",
       },
       rightForm: {
         allClass: "",
         onlineClass: "",
         offlineClass: "",
         allPrice: "",
-        progress: ""
+        progress: "",
       },
       tableList: [],
-      isreset: false
+      isreset: false,
     };
   },
-  mounted () {
-    this.__init();
-  },
-  activated () {
+  mounted() {
     this.__init();
   },
   methods: {
-    __init () {
-      let id = this.$route.query.id;
-      this.id = id;
+    __init() {
+      // let id = this.$route.query.id;
+      // this.id = id;
       // 根据id 获取vip详情
-      this.getVipGroupDetail(id);
+
       // 根据id 获取vip学员
       this.getStudents();
+      this.getVipGroupDetail()
     },
-    getVipGroupDetail (id) {
-      getVipGroupDetail({ vipGroupId: id }).then(res => {
-        if (res.code == 200) {
-          /**
+    getVipGroupDetail() {
+      let id = this.$route.query.id;
+        getVipGroupDetail({ vipGroupId: id }).then((res) => {
+          if (res.code == 200) {
+            /**
            *  teacherCount: '',
           subject: '', // 科目名称
           active: '', // 活动名称
@@ -161,49 +151,44 @@ export default {
           startTime: '', // 报名开始时间
            *
            */
-          this.topForm.teacherCount = res.data.userName;
-          this.topForm.educationalTeacherName = res.data.educationalTeacherName
-          this.topForm.subject = res.data.subjectName; //科目名称
-          this.topForm.active = res.data.vipGroupActivityName;
-          this.topForm.status = res.data.categoryName;
-          this.topForm.classNum = res.data.studentNum;
+            this.topForm.teacherCount = res.data.userName;
+            this.topForm.educationalTeacherName =
+              res.data.educationalTeacherName;
+            this.topForm.subject = res.data.subjectName; //科目名称
+            this.topForm.active = res.data.vipGroupActivityName;
+            this.topForm.status = res.data.categoryName;
+            this.topForm.classNum = res.data.studentNum;
 
-          // totalClassTimes; 总课时数
-          this.topForm.classTime = res.data.singleClassMinutes;
-          //  教学点
-          this.topForm.address = res.data.teacherSchoolName;
-          this.topForm.onlineClass = res.data.onlineClassesNum;
-          this.topForm.offlineClass = res.data.offlineClassesNum;
-          // endTime
-          this.topForm.startTime = res.data.registrationStartTime;
-          this.topForm.endTime = res.data.paymentExpireDate;
-          this.rightForm.allClass = res.data.totalClassTimes;
-          this.rightForm.onlineClass = res.data.onlineClassesUnitPrice;
-          this.rightForm.offlineClass = res.data.offlineClassesUnitPrice;
-          this.rightForm.allPrice = res.data.totalPrice;
-          this.rightForm.progress =
-            res.data.currentClassTimes + "/" + res.data.totalClassTimes;
-          /**
-           * allClass: '',
-          onlineClass: '',
-          offlineClass: '',
-          allPrice: '',
-          progress: ''
-           */
-        }
-      });
+            // totalClassTimes; 总课时数
+            this.topForm.classTime = res.data.singleClassMinutes;
+            //  教学点
+            this.topForm.address = res.data.teacherSchoolName;
+            this.topForm.onlineClass = res.data.onlineClassesNum;
+            this.topForm.offlineClass = res.data.offlineClassesNum;
+            // endTime
+            this.topForm.startTime = res.data.registrationStartTime;
+            this.topForm.endTime = res.data.paymentExpireDate;
+            this.rightForm.allClass = res.data.totalClassTimes;
+            this.rightForm.onlineClass = res.data.onlineClassesUnitPrice;
+            this.rightForm.offlineClass = res.data.offlineClassesUnitPrice;
+            this.rightForm.allPrice = res.data.totalPrice;
+            this.rightForm.progress =
+              res.data.currentClassTimes + "/" + res.data.totalClassTimes;
+
+          }
+        });
     },
-    getStudents () {
-      findVipGroupStudents({ vipGroupId: this.id }).then(res => {
+    getStudents() {
+      findVipGroupStudents({ vipGroupId: this.id }).then((res) => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
         }
       });
     },
-    leaveSchool (scope) {
+    leaveSchool(scope) {
       let studentId = scope.row.id;
       let vipGroupId = this.id;
-      leaveSchool({ studentId, vipGroupId }).then(res => {
+      leaveSchool({ studentId, vipGroupId }).then((res) => {
         if (res.code == 200) {
           this.$message.success("退学成功");
           scope._self.$refs[scope.$index].doClose();
@@ -211,10 +196,10 @@ export default {
         }
       });
     },
-    resetPrice () {
+    resetPrice() {
       this.isreset = true;
     },
-    submitBtn () {
+    submitBtn() {
       // 提交
       /**
        * this.rightForm.onlineClass = res.data.onlineClassesUnitPrice;
@@ -225,15 +210,23 @@ export default {
       updateVipBaseInfo({
         id: this.id,
         onlineClassesUnitPrice,
-        offlineClassesUnitPrice
-      }).then(res => {
+        offlineClassesUnitPrice,
+      }).then((res) => {
         if (res.code == 200) {
           this.$message.success("修改成功");
           this.isreset = false;
-          this.getVipGroupDetail(this.id);
+          this.$emit('getVipGroupDetail')
+          // this.getVipGroupDetail(this.id);
         }
       });
-    }
+    },
+  },
+  watch:{
+    // vipDetail(val){
+    //   if(val){
+    //     this.getVipGroupDetail();
+    //   }
+    // }
   }
 };
 </script>

+ 74 - 4
src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -8,7 +8,11 @@
       >
         新增学员
       </el-button>
-      <el-button v-permission="'vipGroupManage/update'" @click="expireVisible = true"  type="primary">
+      <el-button
+        v-permission="'vipGroupManage/update'"
+        @click="expireVisible = true"
+        type="primary"
+      >
         有效期调整
       </el-button>
     </div>
@@ -126,7 +130,49 @@
           label="手机号"
           width="200"
         ></el-table-column>
-        <el-table-column prop="courseSalary" label="课程余额"></el-table-column>
+        <el-table-column prop="courseSalary" label="课程余额" width="150">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.courseSalary | moneyFormat }}
+            </div>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="balance" label="账户余额">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.balance | moneyFormat }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="studentId" label="线上课单价">
+          <template slot-scope="scope">
+            <el-input-number
+              v-if="activeStudent == scope.row.id"
+              size="mini"
+              style="width: 90% !important"
+              class="number-input"
+              v-model="scope.row.onlineClassesUnitPrice"
+              :controls="false"
+              :min="0"
+              placeholder="线上课单价"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="studentId" label="线下课单价">
+          <template slot-scope="scope">
+            <el-input-number
+              v-if="activeStudent == scope.row.id"
+              size="mini"
+              style="width: 90% !important"
+              class="number-input"
+              v-model="scope.row.offlineClassesUnitPrice"
+              :controls="false"
+              :min="0"
+              placeholder="线下课单价"
+            />
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         save-key="vipDetail-vipStudentList"
@@ -306,6 +352,7 @@ import {
   recoverForStudent,
   findTeacherWithVipGroupOrganAndSubject,
   vipGroupManageUpdate,
+  getVipGroupDetail
 } from "@/api/vipSeting";
 import { permission } from "@/utils/directivePage";
 export default {
@@ -381,6 +428,7 @@ export default {
         },
       },
       teacherList: [],
+      vipDetail:{}
     };
   },
   mounted() {
@@ -406,6 +454,11 @@ export default {
           }
         }
       );
+        getVipGroupDetail({ vipGroupId: id }).then((res) => {
+          if (res.code == 200) {
+            this.vipDetail = res.data
+          }
+        })
     },
     search() {
       this.rules.page = 1;
@@ -511,6 +564,10 @@ export default {
         if (res.code == 200) {
           this.rules.total = res.data.total;
           this.maskStudentList = res.data.rows;
+          this.maskStudentList.forEach(stu=>{
+            stu.offlineClassesUnitPrice = this.vipDetail?.offlineClassesUnitPrice
+            stu.onlineClassesUnitPrice =this.vipDetail?.onlineClassesUnitPrice
+          })
           this.maskVisible = true;
         }
       });
@@ -523,10 +580,23 @@ export default {
         this.$message.error("请选择一名学生");
         return;
       }
-      addVipGroupStudents({
+      let offlineClassesUnitPrice,onlineClassesUnitPrice;
+      this.maskStudentList.forEach(stu=>{
+        if(stu.id == this.activeStudent){
+          offlineClassesUnitPrice = stu.offlineClassesUnitPrice
+          onlineClassesUnitPrice = stu.onlineClassesUnitPrice
+        }
+      })
+      if(!offlineClassesUnitPrice || !onlineClassesUnitPrice){
+          this.$message.error("请填写线上课单价或线下课单价");
+        return
+      }
+      addVipGroupStudents([{
         vipGroupId: this.id,
         studentIds: this.activeStudent,
-      }).then((res) => {
+        onlineClassesUnitPrice,
+        offlineClassesUnitPrice
+      }]).then((res) => {
         if (res.code == 200) {
           this.$message.success("添加成功");
           this.getStudents();

+ 12 - 5
src/views/vipClass/vipDetail/index.vue

@@ -14,7 +14,7 @@
         lazy
                      v-if="permissionList.vipBase"
                      name="1">
-          <vipBase v-if="activeName == 1" />
+          <vipBase  />
         </el-tab-pane>
         <el-tab-pane label="教学记录"
                      v-if="permissionList.teacherRecord"
@@ -32,7 +32,7 @@
                      v-if="permissionList.vipStudentList"
                      lazy
                      name="4">
-          <vipStudentList v-if="activeName == 4" />
+          <vipStudentList v-if="activeName == 4"  :vipDetail='vipDetail'/>
         </el-tab-pane>
       </tab-router>
     </div>
@@ -44,6 +44,9 @@ import teacherRecord from '@/views/vipClass/vipDetail/components/teacherRecord'
 import fnanceInfo from '@/views/vipClass/vipDetail/components/fnanceInfo'
 import vipStudentList from '@/views/vipClass/vipDetail/components/vipStudentList'
 import { permission } from '@/utils/directivePage' // 权限
+import {
+  getVipGroupDetail,
+} from "@/api/vipSeting";
 export default {
   components: { teacherRecord, vipBase, fnanceInfo, vipStudentList },
   name: 'vipDetail',
@@ -53,6 +56,7 @@ export default {
       className: '',
       rules: null,
       searchForm: null,
+      vipDetail:null,
       permissionList: {
         vipBase: permission('/vipDetail/vipBase'),
         teacherRecord: permission('/vipDetail/teacherRecord'),
@@ -64,9 +68,6 @@ export default {
   mounted () {
     this.__init()
   },
-  activated () {
-    this.__init()
-  },
   methods: {
     __init () {
       let querys = this.$route.query
@@ -77,9 +78,15 @@ export default {
         this.searchForm = querys.searchForm
       }
       this.className = querys.name
+      // 获取vip基本信息
+        let id = this.$route.query.id;
+      // 根据id 获取vip详情
+
     },
+
     handleClick (val, event) {
       this.activeName = val.name;
+
     },
     onCancel () {
       this.$router.push({ path: '/business/vipList', query: { rules: this.rules, searchForm: this.searchForm } })

+ 2 - 2
src/views/vipClass/vipList.vue

@@ -186,13 +186,13 @@
             prop="studentNum"
             label="班级人数"
           ></el-table-column>
-          <el-table-column align="center" label="课程单价">
+          <!-- <el-table-column align="center" label="课程单价">
             <template slot-scope="scope">
               <div>
                 <p>{{ scope.row.courseUnitPrice | moneyFormat }} 元</p>
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             prop="vipGroupActivityName"

+ 1 - 1
vue.config.js

@@ -22,7 +22,7 @@ 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 = 'http://192.168.3.196' // 乔
+// let target = 'http://192.168.3.196:80' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio