Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

src/api/course/userCoursePeriod.js

@@ -174,3 +174,10 @@ export function closePeriod(query) {
     params: query
   })
 }
+// 删除会员营期课程
+export function delPeriodDay(periodId) {
+  return request({
+    url: '/course/period/day/' + periodId,
+    method: 'delete'
+  })
+}

src/views/course/userCoursePeriod/index.vue

@@ -496,6 +496,17 @@
                 v-hasPermi="['course:period:updateCourseTime']"
               >修改看课时间</el-button>
             </el-col>
+
+            <el-col :span="1.5">
+              <el-button
+                type="warning"
+                size="mini"
+                icon="el-icon-delete"
+                :disabled="updateCourse.ids.length <= 0"
+                @click="handleDeleteCourse"
+                v-hasPermi="['course:period:dayRemove']"
+              >删除课程</el-button>
+            </el-col>
           </el-row>
           <el-table ref="courseTable" v-loading="course.loading" :data="course.list" @selection-change="handleSelectionCourseChange" border>
             <el-table-column type="selection" width="55" align="center" />
@@ -540,6 +551,13 @@
                 icon="el-icon-edit"
                 @click="handleUpdateDate(scope.row)"
               >修改营期时间</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDeleteCourse(scope.row)"
+                  v-hasPermi="['course:period:dayRemove']"
+                >删除课程</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -580,7 +598,7 @@
 </template>
 
 <script>
-import {addPeriod, delPeriod, exportPeriod, getPeriod, pagePeriod, updatePeriod, getDays, addCourse, updateCourseTime, updateCourseDate, updateListCourseData, periodCourseMove, closePeriod} from "@/api/course/userCoursePeriod";
+import {addPeriod, delPeriod, exportPeriod, getPeriod, pagePeriod, updatePeriod, getDays, addCourse,delPeriodDay,  updateCourseTime, updateCourseDate, updateListCourseData, periodCourseMove, closePeriod} from "@/api/course/userCoursePeriod";
 import {getCompanyList} from "@/api/company/company";
 import { listCamp, addCamp, editCamp, delCamp, copyCamp } from "@/api/course/userCourseCamp";
 import { courseList,videoList } from '@/api/course/courseRedPacketLog'
@@ -820,6 +838,28 @@ export default {
 
   },
   methods: {
+    /** 删除按钮操作 */
+    async handleDeleteCourse(row) {
+      const periodDayIds = row.id || this.updateCourse.ids;
+      try {
+        await this.$confirm('是否确认删除该课程？', "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        });
+
+        const res = await delPeriodDay(periodDayIds);
+
+        if (res && res.code === 200) {
+          this.getCourseList();// 刷新列表
+          this.$message.success('删除成功');
+        } else {
+          this.$message.error(res.msg);
+        }
+      } catch (error) {
+
+      }
+    },
     /** 查询会员营期列表 */
     getList() {
       this.loading = true;
@@ -1093,7 +1133,7 @@ export default {
           }
           this.leftLoading = false;
         }).catch(error => {
-          this.$message.error('删除失败: ' + error.message);
+          // this.$message.error('删除失败: ' + error.message);
           this.leftLoading = false;
         });
       }).catch(() => {

src/views/system/config/config.vue

@@ -953,6 +953,11 @@
                <el-radio label="1">线路二</el-radio>
              </el-radio-group>
            </el-form-item>
+           <el-form-item label="一级域名">
+             <el-tooltip class="item" effect="dark" content="顶级域名" placement="top-end">
+               <el-input  v-model="form18.courseDomainName"     ></el-input>
+             </el-tooltip>
+           </el-form-item>
            <el-form-item label="通用看课域名">
              <el-tooltip class="item" effect="dark" content="真链域名" placement="top-end">
                <el-input  v-model="form18.realLinkDomainName"     ></el-input>