Merge branch 'master' into test

src/views/categroyManager/vipActiveList.vue

@@ -82,62 +82,64 @@
               <copy-text>{{ scope.row.id }}</copy-text>
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            prop="type"
+            :formatter="fommatterType"
+            label="活动类型"
+          ></el-table-column>
           <el-table-column align="center" prop="name" label="活动名称">
             <template slot-scope="scope">
               <copy-text>{{ scope.row.name }}</copy-text>
             </template>
           </el-table-column>
+
           <el-table-column
             align="center"
             prop="vipGroupCategoryNames"
             label="适用课程形式"
           ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="type"
-            :formatter="fommatterType"
-            label="活动类型"
-          ></el-table-column>
+
           <el-table-column
             align="center"
             label="适用课时类型"
             :formatter="fommatterCourseType"
           ></el-table-column>
-          <el-table-column align="center" label="结算标准">
+          <el-table-column label="结算标准">
             <template slot-scope="scope">
               <div>
-                <p>{{ scope.row.salarySettlementJson | onlinePip }}</p>
-                <p>{{ scope.row.salarySettlementJson | unonlinePip }}</p>
+                <p>{{ scope.row.salarySettlementJson | onlineDesc }}</p>
+                <p>{{ scope.row.salarySettlementJson | unonlineDesc }}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="结算说明">
+          <!-- <el-table-column align="center" label="结算说明">
             <template slot-scope="scope">
               <div>
                 <p>{{ scope.row.salarySettlementJson | onlineDesc }}</p>
                 <p>{{ scope.row.salarySettlementJson | unonlineDesc }}</p>
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             label="启用状态"
             prop="enable"
             :formatter="fommatterEnable"
           ></el-table-column>
-          <el-table-column align="center" width="130px" label="活动持续时间">
+          <el-table-column align="center" width="150px" label="活动持续时间">
             <template slot-scope="scope">
               <div>
-                <p>{{ scope.row.startTime | formatTimer }}</p>
-                <p>{{ scope.row.endTime | formatTimer }}</p>
+                <p>{{ scope.row.startTime }}</p>
+                <p>{{ scope.row.endTime }}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="130px" label="课程安排时间">
+          <el-table-column align="center" width="150px" label="课程安排时间">
             <template slot-scope="scope">
               <div>
-                <p>{{ scope.row.coursesStartTime | formatTimer }}</p>
-                <p>{{ scope.row.coursesEndTime | formatTimer }}</p>
+                <p>{{ scope.row.coursesStartTime }}</p>
+                <p>{{ scope.row.coursesEndTime }}</p>
               </div>
             </template>
           </el-table-column>
@@ -203,10 +205,7 @@
           class="vipform"
         >
           <el-form-item label="活动名称" label-width="120px" prop="name">
-            <el-input
-
-              v-model.trim="resetForm.name"
-            ></el-input>
+            <el-input v-model.trim="resetForm.name"></el-input>
           </el-form-item>
           <el-form-item label="适用分部" label-width="120px" prop="organ">
             <select-all
@@ -245,7 +244,6 @@
             <el-input
               type="textarea"
               v-model.trim="resetForm.desc"
-
               :rows="5"
               placeholder="请输入活动说明"
             ></el-input>
@@ -398,10 +396,16 @@
             <div>
               <div
                 class="head"
-                @click="()=>{this.$refs['form'].resetFields();activeType = 'BASE_ACTIVITY'; courseNumForm = {
-                    minCourseNum: null,
-                    maxCourseNum: null,
-                  };}"
+                @click="
+                  () => {
+                    this.$refs['form'].resetFields();
+                    activeType = 'BASE_ACTIVITY';
+                    courseNumForm = {
+                      minCourseNum: null,
+                      maxCourseNum: null,
+                    };
+                  }
+                "
                 :class="activeType == 'BASE_ACTIVITY' ? 'active' : ''"
               >
                 基础活动
@@ -428,7 +432,7 @@
                 :model="courseNumForm"
                 :inline="true"
                 ref="form"
-                :rules="activeType == 'DISCOUNT'?courseNumrules:{}"
+                :rules="activeType == 'DISCOUNT' ? courseNumrules : {}"
                 v-show="activeType == 'DISCOUNT'"
               >
                 <el-form-item prop="minCourseNum">
@@ -444,7 +448,6 @@
                 <el-form-item prop="maxCourseNum">
                   <el-input
                     @change="handleMaxChange"
-
                     v-model.number="courseNumForm.maxCourseNum"
                     type="number"
                     style="margin-left: 10px; width: 120px !important"
@@ -457,10 +460,16 @@
             <div>
               <div
                 class="head"
-                @click="()=>{this.$refs['form'].resetFields();activeType = 'GIVE_CLASS'; courseNumForm = {
-                    minCourseNum: null,
-                    maxCourseNum: null,
-                  };}"
+                @click="
+                  () => {
+                    this.$refs['form'].resetFields();
+                    activeType = 'GIVE_CLASS';
+                    courseNumForm = {
+                      minCourseNum: null,
+                      maxCourseNum: null,
+                    };
+                  }
+                "
                 :class="activeType == 'GIVE_CLASS' ? 'active' : ''"
               >
                 赠送课时
@@ -665,21 +674,21 @@ export default {
         switch (obj.onlineSalarySettlement.salarySettlementType) {
           case "RATIO_DISCOUNT": {
             if (obj.onlineSalarySettlement.settlementValue) {
-              return `线上:${obj.onlineSalarySettlement.settlementValue}%`;
+              return `线上:比例结算${obj.onlineSalarySettlement.settlementValue}%`;
             } else {
-              return "-";
+              return "线上:比例结算";
             }
             break;
           }
           case "TEACHER_DEFAULT": {
-            return "线上:默认";
+            return "线上:默认课酬";
             break;
           }
           case "FIXED_SALARY": {
             if (obj.onlineSalarySettlement.settlementValue) {
-              return `线上:${obj.onlineSalarySettlement.settlementValue}/次`;
+              return `线上:固定课酬${obj.onlineSalarySettlement.settlementValue}/次`;
             } else {
-              return "-";
+              return "线上:固定课酬";
             }
 
             break;
@@ -697,21 +706,21 @@ export default {
         switch (obj.offlineSalarySettlement.salarySettlementType) {
           case "RATIO_DISCOUNT": {
             if (obj.offlineSalarySettlement.settlementValue) {
-              return `线下:${obj.offlineSalarySettlement.settlementValue}%`;
+              return `线下:比例结算${obj.offlineSalarySettlement.settlementValue}%`;
             } else {
-              return "-";
+              return "线下:比例结算";
             }
             break;
           }
           case "TEACHER_DEFAULT": {
-            return "线下:默认";
+            return "线下:默认课酬";
             break;
           }
           case "FIXED_SALARY": {
             if (obj.offlineSalarySettlement.settlementValue) {
-              return `线下:${obj.offlineSalarySettlement.settlementValue}/次`;
+              return `线下:固定课酬${obj.offlineSalarySettlement.settlementValue}/次`;
             } else {
-              return "-";
+              return "线下:固定课酬";
             }
             break;
           }
@@ -955,6 +964,11 @@ export default {
                 this.$message.error("请选择活动类型");
                 return;
               }
+              // 判断适用范围
+              if (!this.online && !this.unonline) {
+                this.$message.error("请选择活动适用范围");
+                return;
+              }
               if (type == "DISCOUNT") {
                 if (!this.attribute1 || this.attribute1 < 0) {
                   this.$message.error("折扣必须大于等于0");

src/views/categroyManager/vipNewActive.vue

@@ -535,6 +535,10 @@ export default {
                 this.$message.error("请选择活动类型");
                 return;
               }
+                if (!this.online && !this.unonline) {
+                this.$message.error("请选择活动适用范围");
+                return;
+              }
               if (type == "DISCOUNT") {
                 if (!this.attribute1 || this.attribute1 < 0) {
                   this.$message.error("折扣必须大于等于0");