Merge remote-tracking branch 'origin/master'

src/api/course/userCoursePeriod.js

@@ -43,7 +43,7 @@ export function addPeriod(data) {
   })
 }
 
-// 新增会员营期
+// 添加课程
 export function addCourse(data) {
   return request({
     url: '/course/period/addCourse',
@@ -52,7 +52,7 @@ export function addCourse(data) {
   })
 }
 
-// 新增会员营期
+// 修改看课时间
 export function updateCourseTime(data) {
   return request({
     url: '/course/period/updateCourseTime',

src/api/course/userCoursePublic.js

@@ -0,0 +1,82 @@
+import request from '@/utils/request'
+
+// 查询课程列表
+export function listUserCourse(query) {
+  return request({
+    url: '/course/userCourse/publicList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询课程详细
+export function getUserCourse(courseId) {
+  return request({
+    url: '/course/userCourse/public/' + courseId,
+    method: 'get'
+  })
+}
+
+// 新增课程
+export function addUserCourse(data) {
+  return request({
+    url: '/course/userCourse/public',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改课程
+export function updateUserCourse(data) {
+  return request({
+    url: '/course/userCourse/public',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除课程
+export function delUserCourse(courseId) {
+  return request({
+    url: '/course/userCourse/public/' + courseId,
+    method: 'delete'
+  })
+}
+
+// 导出课程
+export function exportUserCourse(query) {
+  return request({
+    url: '/course/userCourse/publicExport',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getAllCourse() {
+  return request({
+    url: '/course/userCourse/getAllList',
+    method: 'get'
+  })
+}
+
+
+export function updateIsShow(data) {
+  return request({
+    url: '/course/userCourse/publicUpdateIsShow',
+    method: 'post',
+    data: data
+  })
+}
+
+export function putOn(courseIds) {
+  return request({
+    url: '/course/userCourse/publicPutOn/' + courseIds,
+    method: 'post'
+  })
+}
+export function pullOff(courseIds) {
+  return request({
+    url: '/course/userCourse/publicPullOff/' + courseIds,
+    method: 'post'
+  })
+}

src/views/components/course/userCourseCatalogDetails.vue

@@ -26,6 +26,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-hasPermi="['course:userCourseVideo:add']"
         >新增目录</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -35,6 +36,7 @@
           :disabled="!ids || ids.length <= 0"
           size="mini"
           @click="openUpdates"
+          v-hasPermi="['course:userCourseVideo:updateTime']"
         >修改时间</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -43,6 +45,7 @@
           plain
           size="mini"
           @click="openAdds"
+          v-hasPermi="['course:userCourseVideo:batchAdd']"
         >批量添加</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -52,6 +55,7 @@
           size="mini"
           v-if="isPrivate === 1"
           @click="updateRedPageckeOpen"
+          v-hasPermi="['course:userCourseVideo:updateRed']"
         >修改红包</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -62,6 +66,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-hasPermi="['course:userCourseVideo:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -106,12 +111,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['course:userCourseVideo:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-hasPermi="['course:userCourseVideo:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

src/views/course/userCourse/index.vue

@@ -124,6 +124,7 @@
             size="mini"
             type="text"
             @click="handleCatalog(scope.row)"
+            v-hasPermi="['course:userCourse:cateManage']"
           >目录管理
           </el-button>
           <el-button

src/views/course/userCourse/public.vue

@@ -55,7 +55,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['course:userCourse:add']"
+          v-hasPermi="['course:userCourse:publicAdd']"
         >新增
         </el-button>
       </el-col>
@@ -67,7 +67,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['course:userCourse:edit']"
+          v-hasPermi="['course:userCourse:publicEdit']"
         >修改
         </el-button>
       </el-col>
@@ -79,7 +79,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['course:userCourse:remove']"
+          v-hasPermi="['course:userCourse:publicRemove']"
         >删除
         </el-button>
       </el-col>
@@ -91,7 +91,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['course:userCourse:export']"
+          v-hasPermi="['course:userCourse:publicExport']"
         >导出
         </el-button>
       </el-col>
@@ -104,7 +104,7 @@
           size="mini"
           :disabled="multiple"
           @click="putOn"
-          v-hasPermi="['course:userCourse:putOn']"
+          v-hasPermi="['course:userCourse:publicPutOn']"
         >上架
         </el-button>
       </el-col>
@@ -117,7 +117,7 @@
           size="mini"
           :disabled="multiple"
           @click="pullOff"
-          v-hasPermi="['course:userCourse:pullOff']"
+          v-hasPermi="['course:userCourse:publicPutOff']"
         >下架
         </el-button>
       </el-col>
@@ -169,6 +169,7 @@
             size="mini"
             type="text"
             @click="handleCatalog(scope.row)"
+            v-hasPermi="['course:userCourse:publicCateManage']"
           >目录管理
           </el-button>
           <el-button
@@ -176,7 +177,7 @@
             type="text"
             :icon="scope.row.isShow === 1 ? 'el-icon-close' : 'el-icon-open'"
             @click="handleShow(scope.row)"
-            v-hasPermi="['course:userCourse:editShow']"
+            v-hasPermi="['course:userCourse:publicUpdateIsShow']"
           >
             {{ scope.row.isShow === 1 ? '下架' : '上架' }}
           </el-button>
@@ -185,7 +186,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['course:userCourse:edit']"
+            v-hasPermi="['course:userCourse:publicEdit']"
           >修改
           </el-button>
           <el-button
@@ -193,7 +194,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['course:userCourse:remove']"
+            v-hasPermi="['course:userCourse:publicRemove']"
           >删除
           </el-button>
         </template>
@@ -452,7 +453,7 @@ import {
   updateIsShow,
   putOn,
   pullOff
-} from "@/api/course/userCourse";
+} from "@/api/course/userCoursePublic";
 
 import {getSelectableRange} from "@/api/qw/sopTemp";
 import Treeselect from "@riophae/vue-treeselect";

src/views/course/userCoursePeriod/index.vue

@@ -6,8 +6,8 @@
         <!-- 顶部区域 -->
         <div class="left-header">
           <div class="left-header-top">
-            <el-button type="primary" class="search-btn" @click="handleLeftQuery">搜索</el-button>
-            <el-button type="primary" style="width: 50%" icon="el-icon-plus" @click="handleAddTrainingCamp">新建训练营</el-button>
+            <el-button type="primary" class="search-btn" @click="handleLeftQuery" v-hasPermi="['course:trainingCamp:list']">搜索</el-button>
+            <el-button type="primary" style="width: 50%" icon="el-icon-plus" @click="handleAddTrainingCamp" v-hasPermi="['course:trainingCamp:add']">新建训练营</el-button>
           </div>
           <div class="search-input-wrapper">
             <el-input
@@ -63,9 +63,9 @@
               </div>
             </div>
             <div class="camp-actions">
-              <el-button type="text" class="action-btn delete-btn" @click.stop="handleDeleteCamp(item)">删除</el-button>
-              <el-button type="text" class="action-btn copy-btn" @click.stop="handleCopyCamp(item)">复制</el-button>
-              <el-button type="text" class="action-btn copy-btn" @click.stop="handleEditCamp(item)">编辑</el-button>
+              <el-button type="text" class="action-btn delete-btn" @click.stop="handleDeleteCamp(item)" v-hasPermi="['course:trainingCamp:remove']">删除</el-button>
+<!--              <el-button type="text" class="action-btn copy-btn" @click.stop="handleCopyCamp(item)" v-hasPermi="['course:trainingCamp:copy']">复制</el-button>-->
+              <el-button type="text" class="action-btn copy-btn" @click.stop="handleEditCamp(item)" v-hasPermi="['course:trainingCamp:edit']">编辑</el-button>
             </div>
           </div>
           <!-- 底部加载更多提示 -->
@@ -120,7 +120,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery" v-hasPermi="['course:period:list']">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
@@ -153,7 +153,7 @@
               icon="el-icon-edit"
               size="mini"
               @click="handleBatchSetRedPacket"
-              v-hasPermi="['course:period:export']"
+              v-hasPermi="['course:period:setRedPacket']"
               :disabled="batchSetRedPacketDisabled"
             >批量设置红包</el-button>
           </el-col>
@@ -175,7 +175,7 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['course:period:edit']"
+                v-hasPermi="['course:period:query']"
               >修改</el-button>
     <!--              <el-button-->
     <!--                size="mini"-->
@@ -201,6 +201,7 @@
                 type="text"
                 icon="el-icon-circle-close"
                 @click="handleClosePeriod(scope.row)"
+                v-hasPermi="['course:period:close']"
               >结束营期</el-button>
               <el-button
                 size="mini"
@@ -463,7 +464,7 @@
                 icon="el-icon-plus"
                 size="mini"
                 @click="handleAddCourse"
-                v-hasPermi="['course:period:add']"
+                v-hasPermi="['course:period:addCourse']"
               >添加课程</el-button>
             </el-col>
             <el-col :span="1.5">
@@ -472,7 +473,7 @@
                 size="mini"
                 :disabled="updateCourse.ids.length <= 0"
                 @click="handleUpdateCourse"
-                v-hasPermi="['course:period:add']"
+                v-hasPermi="['course:period:updateCourseTime']"
               >修改看课时间</el-button>
             </el-col>
           </el-row>
@@ -504,12 +505,14 @@
                   type="text"
                   icon="el-icon-top"
                   @click="handleTop(scope.row)"
+                  v-hasPermi="['course:period:courseMove']"
                 >上移</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-bottom"
                 @click="handleBottom(scope.row)"
+                v-hasPermi="['course:period:courseMove']"
               >下移</el-button>
 <!--              <el-button-->
 <!--                size="mini"-->

src/views/course/userCoursePeriod/redPacket.vue

@@ -11,6 +11,7 @@
               size="mini"
               type="text"
               @click="handleInputAmount(scope.row)"
+              v-hasPermi="['course:period:setCourseRedPacket']"
             >设置红包</el-button>
           </template>
         </el-table-column>

src/views/course/videoResource/index.vue

@@ -63,7 +63,7 @@
           size="mini"
           @click="handleBatchAdd"
           :disabled="hasMinimizableDialog"
-          v-hasPermi="['course:videoResource:add']"
+          v-hasPermi="['course:videoResource:batchAdd']"
         >批量新增</el-button>
       </el-col>
       <el-col :span="1.5">

src/views/store/user/index.vue

@@ -85,6 +85,7 @@
         size="mini"
         @click="handleChangeCompanyUser"
         :disabled="multiple"
+        v-hasPermi="['company:companyUser:change']"
       >更换会员归属</el-button>
       </el-col>
       <el-col :span="1.5">

src/views/system/keyword/index.vue

@@ -31,7 +31,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"  v-hasPermi="['system:keyword:list']">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -69,17 +69,17 @@
           v-hasPermi="['system:keyword:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:keyword:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['system:keyword:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>