Merge branch '03/03GRADE' into test

src/views/categroyManager/modals/baseInfo.vue

@@ -187,6 +187,25 @@
             ></i>
           </el-tooltip>
         </el-form-item>
+        <el-form-item label="营销活动售价" prop="marketPrice">
+          <el-input
+            style="width: 400px"
+            type="number"
+            v-model.trim="baseForm.marketPrice"
+            :disabled="isDisabled || status != 'DRAFT'"
+          >
+            <template slot="append">元</template>
+          </el-input>
+          <el-tooltip placement="top" popper-class="mTooltip">
+            <div slot="content">
+              该字段仅用于关联的营销活动中本方案的销售价格，后台、老师端为学员创建课程不受此价格影响
+            </div>
+            <i
+              class="el-icon-question micon el-tooltip"
+              style="font-size: 18px; color: #f56c6c"
+            ></i>
+          </el-tooltip>
+        </el-form-item>
       </el-form>
     </div>
   </div>
@@ -241,7 +260,9 @@ export default {
         stauts: [
           { required: true, message: "请选择活动形式", trigger: "blur" },
         ],
-        applyToStudentType: [{ required: false, message: "请选择是否新生专享" }],
+        applyToStudentType: [
+          { required: false, message: "请选择是否新生专享" },
+        ],
         isPayToBalance: [{ required: true, message: "请选择是否支付到余额" }],
         allowOnlineToOffline: [
           { required: true, message: "请选择课程调整方式" },

src/views/categroyManager/vipActiveList.vue

@@ -237,11 +237,10 @@
                   style="margin-left: 0px"
                   type="text"
                   v-permission="'vipGroupActivity/update'"
-                  v-if="!scope.row.enable || scope.row.status == 'DRAFT'"
                   @click="reset(scope.row)"
                   >修改</el-button
                 >
-                <el-button
+                <!-- <el-button
                   style="margin-left: 0px"
                   v-if="!scope.row.enable && scope.row.status == 'PROGRESS'"
                   type="text"
@@ -256,7 +255,7 @@
                   v-permission="'vipGroupActivity/enable'"
                   @click="resetStatus(scope.row)"
                   >停用</el-button
-                >
+                > -->
                 <!-- <el-button type='text'
                 @click="remove(scope.row)">删除</el-button>-->
                 <el-popover
@@ -264,7 +263,7 @@
                   width="160"
                   v-permission="'vipGroupActivity/delete'"
                   :ref="scope.$index"
-                  v-if="scope.row.status != 'PROGRESS' && !scope.row.enable"
+                  v-if="scope.row.status != 'PROGRESS'"
                 >
                   <p>确定删除?</p>
                   <div style="text-align: right; margin: 0">

src/views/categroyManager/vipNewActive.vue

@@ -165,6 +165,7 @@ export default {
         applyToStudentType: [],
         studentMaxUsedTimes: "",
         isPayToBalance: "",
+        marketPrice:""
       },
       title: "新建课程活动方案",
       payForm: {
@@ -400,6 +401,7 @@ export default {
         description: data.description,
         activeTime,
         courseTime,
+        marketPrice:data.marketPrice,
         organ: data.organId.split(",").map((organ) => {
           return Number(organ);
         }),